qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [1/3] qpid-proton git commit: PROTON-865: Fix compile error, constructor name clashes with virtual function.
Date Tue, 14 Jul 2015 22:26:57 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/cjansen-cpp-client 1d312501b -> 52c905977


PROTON-865: Fix compile error, constructor name clashes with virtual function.

Removed unused endpoint::connection() function, clashes with connection constructor.


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/1e451884
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/1e451884
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/1e451884

Branch: refs/heads/cjansen-cpp-client
Commit: 1e451884c56ec9a762c469736ef10a30689071f6
Parents: 1d31250
Author: Alan Conway <aconway@redhat.com>
Authored: Mon Jul 13 16:08:07 2015 -0400
Committer: Alan Conway <aconway@redhat.com>
Committed: Mon Jul 13 16:24:51 2015 -0400

----------------------------------------------------------------------
 examples/cpp/CMakeLists.txt                       | 10 ++++------
 proton-c/bindings/cpp/include/proton/endpoint.hpp |  3 ---
 proton-c/bindings/cpp/src/endpoint.cpp            |  8 --------
 3 files changed, 4 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1e451884/examples/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index 7ee1509..7dba5c5 100644
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -35,14 +35,12 @@ foreach(example
 endforeach()
 
 set(env_py "${CMAKE_SOURCE_DIR}/proton-c/env.py")
-set(test_bin_dir "$<TARGET_FILE_DIR:broker>")
 if (WIN32)
+  set(test_bin_dir "$<TARGET_FILE_DIR:broker>")
   set(test_path "${test_bin_dir}" "$<TARGET_FILE_DIR:qpid-proton>" "$<TARGET_FILE_DIR:qpid-proton-cpp>")
 else(WIN32)
-  set(test_path "${test_bin_dir}")
+  set(test_path "${CMAKE_CURRENT_BINARY_DIR}")
 endif(WIN32)
 
-add_test(
-  NAME cpp_example_test
-  COMMAND ${PYTHON_EXECUTABLE} ${env_py} -- "PATH=${test_path}"
-    ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example_test.py -v)
+add_test(cpp_example_test
+    ${PYTHON_EXECUTABLE} ${env_py} -- "PATH=${test_path}" ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example_test.py
-v)

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1e451884/proton-c/bindings/cpp/include/proton/endpoint.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/endpoint.hpp b/proton-c/bindings/cpp/include/proton/endpoint.hpp
index 195a010..89904ba 100644
--- a/proton-c/bindings/cpp/include/proton/endpoint.hpp
+++ b/proton-c/bindings/cpp/include/proton/endpoint.hpp
@@ -43,9 +43,6 @@ class endpoint
     };
     typedef int State;
 
-     PN_CPP_EXTERN virtual class connection &connection();
-     PN_CPP_EXTERN virtual class transport &transport();
-
     // TODO: condition, remote_condition, update_condition, get/handler
 protected:
     PN_CPP_EXTERN endpoint();

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1e451884/proton-c/bindings/cpp/src/endpoint.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/endpoint.cpp b/proton-c/bindings/cpp/src/endpoint.cpp
index 2e656c9..98e912a 100644
--- a/proton-c/bindings/cpp/src/endpoint.cpp
+++ b/proton-c/bindings/cpp/src/endpoint.cpp
@@ -29,12 +29,4 @@ endpoint::endpoint() {}
 
 endpoint::~endpoint() {}
 
-class connection &endpoint::connection() {
-    return dynamic_cast<class connection&>(*this);
-}
-
-class transport &endpoint::transport() {
-    return connection().transport();
-}
-
 }


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


Mime
View raw message