qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject qpid-cpp git commit: QPID-7306: apparently visual studio compiler cannot convert the queue pointer to a bool
Date Wed, 03 Aug 2016 09:21:03 GMT
Repository: qpid-cpp
Updated Branches:
  refs/heads/master b92ee09cf -> 1c510d06f


QPID-7306: apparently visual studio compiler cannot convert the queue pointer to a bool


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

Branch: refs/heads/master
Commit: 1c510d06f326614f5912a269daff5132912c01e1
Parents: b92ee09
Author: Gordon Sim <gsim@redhat.com>
Authored: Wed Aug 3 10:02:19 2016 +0100
Committer: Gordon Sim <gsim@redhat.com>
Committed: Wed Aug 3 10:02:19 2016 +0100

----------------------------------------------------------------------
 src/qpid/broker/QueueRegistry.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/1c510d06/src/qpid/broker/QueueRegistry.cpp
----------------------------------------------------------------------
diff --git a/src/qpid/broker/QueueRegistry.cpp b/src/qpid/broker/QueueRegistry.cpp
index 987832c..7310076 100644
--- a/src/qpid/broker/QueueRegistry.cpp
+++ b/src/qpid/broker/QueueRegistry.cpp
@@ -144,9 +144,12 @@ bool QueueRegistry::destroyIfUntouched(const string& name, long version,
     //
     // Outside the lock (avoid deadlock) but guaranteed to be called exactly once,
     // since q will only be set on the first call to destroy above.
-    if (q)
+    if (q) {
         q->destroyed();
-    return q;
+        return true;
+    } else {
+        return false;
+    }
 }
 
 Queue::shared_ptr QueueRegistry::find(const string& name){


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


Mime
View raw message