You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2016/01/28 18:39:41 UTC
qpid-proton git commit: NO-JIRA: c++: fix C++11 compile errors.
Repository: qpid-proton
Updated Branches:
refs/heads/master 9c03b28b0 -> 05502ad56
NO-JIRA: c++: 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/05502ad5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/05502ad5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/05502ad5
Branch: refs/heads/master
Commit: 05502ad56f5a3860d5d19ab7c808ad43bd39274e
Parents: 9c03b28
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Jan 28 12:31:24 2016 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu Jan 28 12:31:24 2016 -0500
----------------------------------------------------------------------
proton-c/bindings/cpp/include/proton/endpoint.hpp | 12 +++++++++---
proton-c/bindings/cpp/src/endpoint.cpp | 2 ++
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/05502ad5/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..d5e10fb 100644
--- a/proton-c/bindings/cpp/include/proton/endpoint.hpp
+++ b/proton-c/bindings/cpp/include/proton/endpoint.hpp
@@ -30,6 +30,8 @@ namespace proton {
/// The base class for session, connection, and link.
class endpoint {
public:
+ virtual ~endpoint();
+
/// A bit mask of state bit values.
///
/// A state mask is matched against an endpoint as follows: If the
@@ -57,12 +59,16 @@ class endpoint {
/// Get the error condition of the remote endpoint.
virtual condition remote_condition() const = 0;
- virtual ~endpoint() {}
+ protected:
+ // C++11 compilers don't like implicits if a destructor has been declared.
+ endpoint() {}
+ endpoint(const endpoint&) {}
+ endpoint& operator=(const endpoint&) { return *this; }
};
/// @cond INTERNAL
/// XXX important to expose?
-
+
template <class T> class iter_base : public comparable<iter_base<T> > {
public:
typedef T value_type;
@@ -91,7 +97,7 @@ template<class I> class range {
private:
I begin_, end_;
};
-
+
/// @endcond
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/05502ad5/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