Repository: qpid-proton
Updated Branches:
refs/heads/master 05502ad56 -> 7fbecf25f
NO-JIRA: Better fix for previous C++11 compilation problem
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/7fbecf25
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/7fbecf25
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/7fbecf25
Branch: refs/heads/master
Commit: 7fbecf25ff46ced536693e4b232277a1c6b38516
Parents: 05502ad
Author: Andrew Stitcher <astitcher@apache.org>
Authored: Thu Jan 28 15:45:27 2016 -0500
Committer: Andrew Stitcher <astitcher@apache.org>
Committed: Thu Jan 28 15:45:27 2016 -0500
----------------------------------------------------------------------
.../bindings/cpp/include/proton/connection.hpp | 2 ++
proton-c/bindings/cpp/include/proton/endpoint.hpp | 17 +++++++++++------
proton-c/bindings/cpp/include/proton/link.hpp | 2 ++
proton-c/bindings/cpp/include/proton/session.hpp | 2 ++
4 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7fbecf25/proton-c/bindings/cpp/include/proton/connection.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/connection.hpp b/proton-c/bindings/cpp/include/proton/connection.hpp
index 75c7338..e127573 100644
--- a/proton-c/bindings/cpp/include/proton/connection.hpp
+++ b/proton-c/bindings/cpp/include/proton/connection.hpp
@@ -42,6 +42,8 @@ class connection : public object<pn_connection_t>, public endpoint
{
public:
/// @cond INTERNAL
connection(pn_connection_t* c=0) : object<pn_connection_t>(c) {}
+ //connection(const connection& c) : object<pn_connection_t>(c.pn_object())
{}
+ //connection& operator=(const connection& c) = default;
/// @endcond
/// Get the state of this connection.
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7fbecf25/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 d5e10fb..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,7 +31,7 @@ namespace proton {
/// The base class for session, connection, and link.
class endpoint {
public:
- virtual ~endpoint();
+ PN_CPP_EXTERN virtual ~endpoint();
/// A bit mask of state bit values.
///
@@ -59,11 +60,15 @@ class endpoint {
/// Get the error condition of the remote endpoint.
virtual condition remote_condition() const = 0;
- protected:
- // C++11 compilers don't like implicits if a destructor has been declared.
- endpoint() {}
- endpoint(const endpoint&) {}
- endpoint& operator=(const endpoint&) { return *this; }
+#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
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7fbecf25/proton-c/bindings/cpp/include/proton/link.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/link.hpp b/proton-c/bindings/cpp/include/proton/link.hpp
index 1852c61..1301ecb 100644
--- a/proton-c/bindings/cpp/include/proton/link.hpp
+++ b/proton-c/bindings/cpp/include/proton/link.hpp
@@ -44,6 +44,8 @@ class link : public object<pn_link_t> , public endpoint {
public:
/// @cond INTERNAL
link(pn_link_t* l=0) : object<pn_link_t>(l) {}
+ //link(const link& l) : object<pn_link_t>(l.pn_object()) {}
+ //link& operator=(const link& l) = default;
/// @endcond
// Endpoint behaviours
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7fbecf25/proton-c/bindings/cpp/include/proton/session.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/session.hpp b/proton-c/bindings/cpp/include/proton/session.hpp
index a16fbe3..c51acc1 100644
--- a/proton-c/bindings/cpp/include/proton/session.hpp
+++ b/proton-c/bindings/cpp/include/proton/session.hpp
@@ -44,6 +44,8 @@ class session : public object<pn_session_t>, public endpoint
public:
/// @cond INTERNAL
session(pn_session_t* s=0) : object<pn_session_t>(s) {}
+ //session(const session& s) : object<pn_session_t>(s.pn_object()) {}
+ //session& operator=(const session& s) = default;
/// @endcond
// Endpoint behaviours
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
|