PROTON-1935: [cpp] fix minor c++03 compatibility issues.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/32b9708c Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/32b9708c Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/32b9708c Branch: refs/heads/go1 Commit: 32b9708c6a1a59e5fce2c64930fdc16f02aa9cd4 Parents: 23a4b4f Author: Alan Conway <acon...@redhat.com> Authored: Tue Sep 18 15:48:48 2018 -0400 Committer: Alan Conway <acon...@redhat.com> Committed: Tue Sep 18 15:59:18 2018 -0400 ---------------------------------------------------------------------- cpp/src/connect_config.cpp | 2 +- cpp/src/value_test.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/32b9708c/cpp/src/connect_config.cpp ---------------------------------------------------------------------- diff --git a/cpp/src/connect_config.cpp b/cpp/src/connect_config.cpp index 0dc577a..3ec16fb 100644 --- a/cpp/src/connect_config.cpp +++ b/cpp/src/connect_config.cpp @@ -202,7 +202,7 @@ string parse_default(connection_options& opts) { std::ifstream f; try { f.exceptions(~std::ifstream::goodbit); - f.open(name); + f.open(name.c_str()); } catch (const std::exception& e) { raise(msg() << "error opening '" << name << "': " << e.what()); } http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/32b9708c/cpp/src/value_test.cpp ---------------------------------------------------------------------- diff --git a/cpp/src/value_test.cpp b/cpp/src/value_test.cpp index 64a1d72..2d991c4 100644 --- a/cpp/src/value_test.cpp +++ b/cpp/src/value_test.cpp @@ -161,12 +161,12 @@ int main(int, char**) { many<pair<annotation_key, message_id> > restricted_pairs(si_pairs); RUN_TEST(failed, (map_test<map<annotation_key, message_id> >( restricted_pairs, "{:a=0, :b=1, :c=2}"))); + RUN_TEST(failed, null_test()); #if PN_CPP_HAS_CPP11 RUN_TEST(failed, sequence_test<forward_list<binary> >( ARRAY, many<binary>() + binary("xx") + binary("yy"), "@PN_BINARY[b\"xx\", b\"yy\"]")); RUN_TEST(failed, (map_test<unordered_map<string, uint64_t> >(si_pairs, ""))); - RUN_TEST(failed, null_test()); #endif return failed; } catch (const std::exception& e) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org