diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2015-03-17 21:29:40 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-03-17 21:29:40 +0100 |
commit | 5d6e4c971857b5e05d7c277e7eafcb9d64dbc6a7 (patch) | |
tree | f6ff4bf95a3a81b9a98ca09bc4d980147346fe3a /apps/sm-serial-read.cpp | |
parent | 2a7ffd694cfa3493ef1b83a69878322b8ca97670 (diff) | |
download | ble-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/sm-serial-read.cpp')
-rw-r--r-- | apps/sm-serial-read.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/sm-serial-read.cpp b/apps/sm-serial-read.cpp index c7fb695..c52e7f9 100644 --- a/apps/sm-serial-read.cpp +++ b/apps/sm-serial-read.cpp @@ -126,17 +126,17 @@ public: unique_ptr<ostream> outputStream = unique_ptr<ostream>(&cout); if (format == Format::JSON) { - output = make_shared<JsonSampleOutputStream>(dict, std::move(outputStream)); + output = make_shared<JsonSampleOutputStream>(std::move(outputStream), dict); } else if (format == Format::SQL) { - output = make_shared<SqlSampleOutputStream>(dict, std::move(outputStream), "raw"); + output = make_shared<SqlSampleOutputStream>(std::move(outputStream), dict, "raw"); } else if (format == Format::PLAIN) { - output = make_shared<CsvSampleOutputStream>(dict, std::move(outputStream)); + output = make_shared<CsvSampleOutputStream>(std::move(outputStream), dict); } else { cerr << "Unsupported format: " << boost::lexical_cast<string>(format) << endl; return EXIT_FAILURE; } - shared_ptr<CsvSampleParser> input = make_shared<CsvSampleParser>(dict, output); + shared_ptr<CsvSampleParser> input = make_shared<CsvSampleParser>(output, dict); port_handler(port_name, port, input).run(); |