Merge branch 'visibility-hidden' into qpid-3163qpid-3163

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3163@1151956 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 3 deletions

diff --git a/qpid/cpp/src/qpid/cluster/Cpg.cpp b/qpid/cpp/src/qpid/cluster/Cpg.cpp
index 0856bcd824..d54d007de9 100644
--- a/qpid/cpp/src/qpid/cluster/Cpg.cpp
+++ b/qpid/cpp/src/qpid/cluster/Cpg.cpp
@@ -32,7 +32,7 @@
 // This is a macro instead of a function because we don't want to
 // evaluate the MSG argument unless there is an error.
 #define CPG_CHECK(RESULT, MSG) \
-    if ((RESULT) != CPG_OK) throw Exception(errorStr((RESULT), (MSG)))
+    if ((RESULT) != CPG_OK) throw qpid::Exception(errorStr((RESULT), (MSG)))
 
 namespace qpid {
 namespace cluster {
@@ -44,7 +44,7 @@ using namespace std;
 Cpg* Cpg::cpgFromHandle(cpg_handle_t handle) {
     void* cpg=0;
     CPG_CHECK(cpg_context_get(handle, &cpg), "Cannot get CPG instance.");
-    if (!cpg) throw Exception("Cannot get CPG instance.");
+    if (!cpg) throw qpid::Exception("Cannot get CPG instance.");
     return reinterpret_cast<Cpg*>(cpg);
 }
 
@@ -154,7 +154,7 @@ void Cpg::join(const std::string& name) {
     group = name;
     callCpg ( cpgJoinOp );
 }
-    
+
 void Cpg::leave() {
     callCpg ( cpgLeaveOp );
 }