QPID-2489 - Added wrapped version of Mutex to isolate QMF-generated source from boost.

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

3 files changed, 11 insertions, 11 deletions

diff --git a/qpid/cpp/managementgen/qmfgen/schema.py b/qpid/cpp/managementgen/qmfgen/schema.py
index 1206b0082d..ec0ccc3462 100755
--- a/qpid/cpp/managementgen/qmfgen/schema.py
+++ b/qpid/cpp/managementgen/qmfgen/schema.py
@@ -148,7 +148,7 @@ class SchemaType:
     if self.accessor == "direct":
       stream.write ("    inline void set_" + varName + " (" + self.asArg + " val) {\n");
       if not self.perThread:
-        stream.write ("        ::qpid::sys::Mutex::ScopedLock mutex(accessLock);\n")
+        stream.write ("        ::qpid::management::Mutex::ScopedLock mutex(accessLock);\n")
       if self.style != "mma":
         stream.write ("        " + prefix + varName + " = val;\n")
         if optional:
@@ -171,7 +171,7 @@ class SchemaType:
       if self.style != "mma":
         stream.write ("    inline " + self.asArg + " get_" + varName + "() {\n");
         if not self.perThread:
-          stream.write ("        ::qpid::sys::Mutex::ScopedLock mutex(accessLock);\n")
+          stream.write ("        ::qpid::management::Mutex::ScopedLock mutex(accessLock);\n")
         stream.write ("        return " + prefix + varName + ";\n")
         stream.write ("    }\n")
       if optional:
@@ -186,7 +186,7 @@ class SchemaType:
     elif self.accessor == "counter":
       stream.write ("    inline void inc_" + varName + " (" + self.asArg + " by = 1) {\n");
       if not self.perThread:
-        stream.write ("        ::qpid::sys::Mutex::ScopedLock mutex(accessLock);\n")
+        stream.write ("        ::qpid::management::Mutex::ScopedLock mutex(accessLock);\n")
       stream.write ("        " + prefix + varName + " += by;\n")
       if self.style == "wm":
         stream.write ("        if (" + varName + "High < " + varName + ")\n")
@@ -196,7 +196,7 @@ class SchemaType:
       stream.write ("    }\n");
       stream.write ("    inline void dec_" + varName + " (" + self.asArg + " by = 1) {\n");
       if not self.perThread:
-        stream.write ("        ::qpid::sys::Mutex::ScopedLock mutex(accessLock);\n")
+        stream.write ("        ::qpid::management::Mutex::ScopedLock mutex(accessLock);\n")
       stream.write ("        " + prefix + varName + " -= by;\n")
       if self.style == "wm":
         stream.write ("        if (" + varName + "Low > " + varName + ")\n")
diff --git a/qpid/cpp/managementgen/qmfgen/templates/Class.cpp b/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
index 9a9af07b28..cfc142e18c 100644
--- a/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
@@ -20,7 +20,6 @@
 
 /*MGEN:Root.Disclaimer*/
 
-#include "qpid/log/Statement.h"
 #include "qpid/management/Manageable.h"
 #include "qpid/management/Buffer.h"
 #include "qpid/types/Variant.h"
@@ -35,6 +34,7 @@ using           qpid::management::ManagementAgent;
 using           qpid::management::Manageable;
 using           qpid::management::ManagementObject;
 using           qpid::management::Args;
+using           qpid::management::Mutex;
 using           std::string;
 
 string  /*MGEN:Class.NameCap*/::packageName  = string ("/*MGEN:Class.NamePackageLower*/");
@@ -149,7 +149,7 @@ void /*MGEN:Class.NameCap*/::readProperties (const std::string& _sBuf)
     char *_tmpBuf = new char[_sBuf.length()];
     memcpy(_tmpBuf, _sBuf.data(), _sBuf.length());
     ::qpid::management::Buffer buf(_tmpBuf, _sBuf.length());
-    ::qpid::sys::Mutex::ScopedLock mutex(accessLock);
+    Mutex::ScopedLock mutex(accessLock);
 
     {
         std::string _tbuf;
@@ -172,7 +172,7 @@ void /*MGEN:Class.NameCap*/::writeProperties (std::string& _sBuf) const
     char _msgChars[_bufSize];
     ::qpid::management::Buffer buf(_msgChars, _bufSize);
 
-    ::qpid::sys::Mutex::ScopedLock mutex(accessLock);
+    Mutex::ScopedLock mutex(accessLock);
     configChanged = false;
 
     {
@@ -200,7 +200,7 @@ void /*MGEN:Class.NameCap*/::writeStatistics (std::string& _sBuf, bool skipHeade
     char _msgChars[_bufSize];
     ::qpid::management::Buffer buf(_msgChars, _bufSize);
 
-    ::qpid::sys::Mutex::ScopedLock mutex(accessLock);
+    Mutex::ScopedLock mutex(accessLock);
     instChanged = false;
 /*MGEN:IF(Class.ExistPerThreadAssign)*/
     for (int idx = 0; idx < maxThreads; idx++) {
@@ -279,7 +279,7 @@ void /*MGEN:Class.NameCap*/::mapEncodeValues (::qpid::types::Variant::Map& _map,
                                               bool includeStatistics)
 {
     using namespace ::qpid::types;
-    ::qpid::sys::Mutex::ScopedLock mutex(accessLock);
+    Mutex::ScopedLock mutex(accessLock);
 
     if (includeProperties) {
         configChanged = false;
@@ -320,7 +320,7 @@ void /*MGEN:Class.NameCap*/::mapEncodeValues (::qpid::types::Variant::Map& _map,
 void /*MGEN:Class.NameCap*/::mapDecodeValues (const ::qpid::types::Variant::Map& _map)
 {
     ::qpid::types::Variant::Map::const_iterator _i;
-    ::qpid::sys::Mutex::ScopedLock mutex(accessLock);
+    Mutex::ScopedLock mutex(accessLock);
 /*MGEN:IF(Class.ExistOptionals)*/
     bool _found;
 /*MGEN:ENDIF*/
diff --git a/qpid/cpp/managementgen/qmfgen/templates/Event.cpp b/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
index 94de331611..a8fdd0bd92 100644
--- a/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
@@ -20,7 +20,6 @@
 
 /*MGEN:Root.Disclaimer*/
 
-#include "qpid/log/Statement.h"
 #include "qpid/management/Manageable.h" 
 #include "qpid/management/Buffer.h"
 #include "qpid/types/Variant.h"
@@ -33,6 +32,7 @@ using           qpid::management::ManagementAgent;
 using           qpid::management::Manageable;
 using           qpid::management::ManagementObject;
 using           qpid::management::Args;
+using           qpid::management::Mutex;
 using           std::string;
 
 string  Event/*MGEN:Event.NameCap*/::packageName  = string ("/*MGEN:Event.NamePackageLower*/");