aboutsummaryrefslogtreecommitdiff
path: root/apps/sample-convert.cpp
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2015-03-17 21:29:40 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2015-03-17 21:29:40 +0100
commit5d6e4c971857b5e05d7c277e7eafcb9d64dbc6a7 (patch)
treef6ff4bf95a3a81b9a98ca09bc4d980147346fe3a /apps/sample-convert.cpp
parent2a7ffd694cfa3493ef1b83a69878322b8ca97670 (diff)
downloadble-toys-5d6e4c971857b5e05d7c277e7eafcb9d64dbc6a7.tar.gz
ble-toys-5d6e4c971857b5e05d7c277e7eafcb9d64dbc6a7.tar.bz2
ble-toys-5d6e4c971857b5e05d7c277e7eafcb9d64dbc6a7.tar.xz
ble-toys-5d6e4c971857b5e05d7c277e7eafcb9d64dbc6a7.zip
o An improved KeyDictionary.
Diffstat (limited to 'apps/sample-convert.cpp')
-rw-r--r--apps/sample-convert.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/sample-convert.cpp b/apps/sample-convert.cpp
index b3e5c02..5e87a15 100644
--- a/apps/sample-convert.cpp
+++ b/apps/sample-convert.cpp
@@ -61,22 +61,22 @@ public:
}
if (output_format == "plain") {
- output = make_shared<CsvSampleOutputStream>(dict, move(outputStream));
+ output = make_shared<CsvSampleOutputStream>(move(outputStream), dict);
} else if (output_format == "json") {
- output = make_shared<JsonSampleOutputStream>(dict, move(outputStream));
+ output = make_shared<JsonSampleOutputStream>(move(outputStream), dict);
} else if (output_format == "sql") {
if (table_name.size() == 0) {
cerr << "Missing option: table-name" << endl;
return EXIT_FAILURE;
}
- output = make_shared<SqlSampleOutputStream>(dict, move(outputStream), table_name);
+ output = make_shared<SqlSampleOutputStream>(move(outputStream), dict, table_name);
} else {
cerr << "Unsupported output format: " << output_format << endl;
return EXIT_FAILURE;
}
- auto input = make_shared<CsvSampleParser>(dict, output);
+ auto input = make_shared<CsvSampleParser>(output, dict);
char data[100];
while (!inputStream->eof()) {