diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/qpid/agent/ManagementAgent.h | 6 | ||||
| -rw-r--r-- | cpp/src/qpid/agent/ManagementAgentImpl.cpp | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/cpp/include/qpid/agent/ManagementAgent.h b/cpp/include/qpid/agent/ManagementAgent.h index 41b6423624..b6ec82862c 100644 --- a/cpp/include/qpid/agent/ManagementAgent.h +++ b/cpp/include/qpid/agent/ManagementAgent.h @@ -24,7 +24,6 @@ #include "qpid/management/ManagementObject.h" #include "qpid/management/ManagementEvent.h" #include "qpid/management/Manageable.h" -#include "qpid/sys/Mutex.h" #include "qpid/client/ConnectionSettings.h" namespace qpid { @@ -45,11 +44,6 @@ class ManagementAgent QMF_AGENT_EXTERN Singleton(bool disableManagement = false); QMF_AGENT_EXTERN ~Singleton(); QMF_AGENT_EXTERN static ManagementAgent* getInstance(); - private: - static sys::Mutex lock; - static bool disabled; - static int refCount; - static ManagementAgent* agent; }; typedef enum { diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.cpp b/cpp/src/qpid/agent/ManagementAgentImpl.cpp index 71899561a9..77372f839a 100644 --- a/cpp/src/qpid/agent/ManagementAgentImpl.cpp +++ b/cpp/src/qpid/agent/ManagementAgentImpl.cpp @@ -22,6 +22,7 @@ #include "qpid/management/ManagementObject.h" #include "qpid/log/Statement.h" #include "qpid/agent/ManagementAgentImpl.h" +#include "qpid/sys/Mutex.h" #include <list> #include <string.h> #include <stdlib.h> @@ -42,10 +43,12 @@ using std::string; using std::cout; using std::endl; -Mutex ManagementAgent::Singleton::lock; -bool ManagementAgent::Singleton::disabled = false; -ManagementAgent* ManagementAgent::Singleton::agent = 0; -int ManagementAgent::Singleton::refCount = 0; +namespace { + Mutex lock; + bool disabled = false; + ManagementAgent* agent = 0; + int refCount = 0; +} ManagementAgent::Singleton::Singleton(bool disableManagement) { |