You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2016/07/27 19:07:39 UTC

qpid-proton git commit: PROTON-1238: [C++ binding] Add fallback operator<< for wrapped proton-c objects

Repository: qpid-proton
Updated Branches:
  refs/heads/master fd550fe0a -> e2f5039b4


PROTON-1238: [C++ binding] Add fallback operator<< for wrapped proton-c objects


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

Branch: refs/heads/master
Commit: e2f5039b47dec3b3174cef00d70d34e34523271d
Parents: fd550fe
Author: Andrew Stitcher <as...@apache.org>
Authored: Wed Jul 27 14:59:34 2016 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Wed Jul 27 14:59:34 2016 -0400

----------------------------------------------------------------------
 proton-c/bindings/cpp/include/proton/internal/object.hpp | 5 +++++
 proton-c/bindings/cpp/src/object.cpp                     | 6 ++++++
 2 files changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e2f5039b/proton-c/bindings/cpp/include/proton/internal/object.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/internal/object.hpp b/proton-c/bindings/cpp/include/proton/internal/object.hpp
index 330ebbe..78a990c 100644
--- a/proton-c/bindings/cpp/include/proton/internal/object.hpp
+++ b/proton-c/bindings/cpp/include/proton/internal/object.hpp
@@ -27,6 +27,7 @@
 #include "./comparable.hpp"
 
 #include <memory>
+#include <string>
 
 namespace proton {
 
@@ -38,6 +39,7 @@ class pn_ptr_base {
   protected:
     PN_CPP_EXTERN static void incref(void* p);
     PN_CPP_EXTERN static void decref(void* p);
+    PN_CPP_EXTERN static std::string inspect(void* p);
 };
 
 template <class T> class pn_ptr : private pn_ptr_base, private comparable<pn_ptr<T> > {
@@ -63,6 +65,8 @@ template <class T> class pn_ptr : private pn_ptr_base, private comparable<pn_ptr
     explicit operator bool() const { return !!ptr_; }
 #endif
 
+    std::string inspect() const { return pn_ptr_base::inspect(ptr_); }
+
     static pn_ptr take_ownership(T* p) { return pn_ptr<T>(p, true); }
 
   private:
@@ -96,6 +100,7 @@ template <class T> class object : private comparable<object<T> > {
 
     friend bool operator==(const object& a, const object& b) { return a.object_ == b.object_; }
     friend bool operator<(const object& a, const object& b) { return a.object_ < b.object_; }
+    friend std::ostream& operator<<(std::ostream& o, const object& a) { o << a.object_.inspect(); return o; }
   template <class U> friend class proton::thread_safe;
 };
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e2f5039b/proton-c/bindings/cpp/src/object.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/object.cpp b/proton-c/bindings/cpp/src/object.cpp
index f881c63..2f3a348 100644
--- a/proton-c/bindings/cpp/src/object.cpp
+++ b/proton-c/bindings/cpp/src/object.cpp
@@ -31,4 +31,10 @@ void pn_ptr_base::decref(void *p) {
     if (p) ::pn_decref(const_cast<void*>(p));
 }
 
+std::string pn_ptr_base::inspect(void* p) {
+    if (!p) return std::string();
+    ::pn_string_t* s = ::pn_string(NULL);
+    (void) ::pn_inspect(p, s);
+    return std::string(pn_string_get(s));
+}
 }}


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