[qpid-proton] branch master updated: PROTON-2092: Don't forget the No JsonCpp version too

[as...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

astitcher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git


The following commit(s) were added to refs/heads/master by this push:
     new 20d2ff2  PROTON-2092: Don't forget the No JsonCpp version too
20d2ff2 is described below

commit 20d2ff24689708a8a072acfd03ede392a000c84f
Author: Andrew Stitcher <as...@apache.org>
AuthorDate: Tue Aug 27 14:36:49 2019 -0400

    PROTON-2092: Don't forget the No JsonCpp version too
---
 cpp/src/connect_config.cpp       |  1 +
 cpp/src/connect_config_dummy.cpp | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/cpp/src/connect_config.cpp b/cpp/src/connect_config.cpp
index 712796c..4fd5e59 100644
--- a/cpp/src/connect_config.cpp
+++ b/cpp/src/connect_config.cpp
@@ -18,6 +18,7 @@
  */
 
 #include <proton/connect_config.hpp>
+#include "connect_config.hpp"
 
 #include "msg.hpp"
 
diff --git a/cpp/src/connect_config_dummy.cpp b/cpp/src/connect_config_dummy.cpp
index 4d46726..e7490e7 100644
--- a/cpp/src/connect_config_dummy.cpp
+++ b/cpp/src/connect_config_dummy.cpp
@@ -18,12 +18,20 @@
  */
 
 #include <proton/connect_config.hpp>
+#include "connect_config.hpp"
+
 #include <proton/error.hpp>
 
 namespace proton {
-namespace connect_config {
-namespace { const error nope("connection configuration is not supported"); }
+namespace {
+const error nope("connection configuration is not supported");
+}
+
+class connection_options;
 
+std::string apply_config(connection_options&) { throw nope; }
+
+namespace connect_config {
 std::string default_file() { throw nope; }
 std::string parse(std::istream& is, connection_options& opts)  { throw nope; }
 std::string parse_default(proton::connection_options&)  { throw nope; }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org