qpid-proton git commit: NO-JIRA: [C++ binding] Fix C++11 compile errors.

[as...@apache.org]

Repository: qpid-proton
Updated Branches:
  refs/heads/astitcher/0.12.x/potential-fix [created] ce8ad921b


NO-JIRA: [C++ binding] Fix C++11 compile errors.


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

Branch: refs/heads/astitcher/0.12.x/potential-fix
Commit: ce8ad921b2350923921ed4e31cc79a0797d8e12f
Parents: 9e852c5
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Jan 28 12:31:24 2016 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Jan 28 16:51:58 2016 -0500

----------------------------------------------------------------------
 proton-c/bindings/cpp/include/proton/endpoint.hpp | 17 ++++++++++++++---
 proton-c/bindings/cpp/src/endpoint.cpp            |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ce8ad921/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 fd698b0..94814f1 100644
--- a/proton-c/bindings/cpp/include/proton/endpoint.hpp
+++ b/proton-c/bindings/cpp/include/proton/endpoint.hpp
@@ -21,6 +21,7 @@
  * under the License.
  *
  */
+#include "proton/config.hpp"
 #include "proton/export.hpp"
 #include "proton/condition.hpp"
 #include "proton/comparable.hpp"
@@ -30,6 +31,8 @@ namespace proton {
 /// The base class for session, connection, and link.
 class endpoint {
   public:
+    PN_CPP_EXTERN virtual ~endpoint();
+
     /// A bit mask of state bit values.
     ///
     /// A state mask is matched against an endpoint as follows: If the
@@ -57,12 +60,20 @@ class endpoint {
     /// Get the error condition of the remote endpoint.
     virtual condition remote_condition() const = 0;
 
-    virtual ~endpoint() {}
+#if PN_HAS_CPP11
+    // Make everything explicit for C++11 compilers
+    endpoint() = default;
+    endpoint& operator=(const endpoint&) = default;
+    endpoint& operator=(endpoint&&) = default;
+
+    endpoint(const endpoint&) = default;
+    endpoint(endpoint&&) = default;
+#endif
 };
 
 /// @cond INTERNAL
 /// XXX important to expose?
-    
+
 template <class T> class iter_base  : public comparable<iter_base<T> > {
   public:
     typedef T value_type;
@@ -91,7 +102,7 @@ template<class I> class range {
   private:
     I begin_, end_;
 };
-    
+
 /// @endcond
 
 }

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ce8ad921/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 5647c33..c1a589d 100644
--- a/proton-c/bindings/cpp/src/endpoint.cpp
+++ b/proton-c/bindings/cpp/src/endpoint.cpp
@@ -41,6 +41,8 @@ const int endpoint::REMOTE_CLOSED = PN_REMOTE_CLOSED;
 const int endpoint::LOCAL_MASK = PN_LOCAL_MASK;
 const int endpoint::REMOTE_MASK = PN_REMOTE_MASK;
 
+endpoint::~endpoint() {}
+
 session_iterator session_iterator::operator++() {
     ptr_ = ptr_.next(state_);
     return *this;


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