Get rid of Trinity Singleton and Threading patterns and replace them with ACE_Singletons and ACE_GUARD_x macro´s with ACE_Thread_Mutex´es respectively.
Also get rid of unused CountedReference class that used Trinity threading pattern. --HG-- branch : trunk
This commit is contained in:
1 parent
a6b9e716a6
commit
0f7657b68c
109 files changed
+349
-1221
No files matched your search
@@ -19,9 +19,6 @@
|
||||
*/
|
||||
|
||||
#include "ConfigEnv.h"
|
||||
#include "Policies/SingletonImp.h"
|
||||
|
||||
INSTANTIATE_SINGLETON_1(Config);
|
||||
|
||||
Config::Config() : mIgnoreCase(true), mConf(NULL)
|
||||
{
|
||||
|
||||
@@ -21,15 +21,16 @@
|
||||
#ifndef CONFIG_H
|
||||
#define CONFIG_H
|
||||
|
||||
#include <Policies/Singleton.h>
|
||||
#include <ace/Singleton.h>
|
||||
#include "Define.h"
|
||||
|
||||
class DOTCONFDocument;
|
||||
|
||||
class Config
|
||||
{
|
||||
friend class ACE_Singleton<Config, ACE_Null_Mutex>;
|
||||
Config();
|
||||
public:
|
||||
Config();
|
||||
~Config();
|
||||
|
||||
bool SetSource(const char *file, bool ignorecase = true);
|
||||
@@ -47,7 +48,7 @@ class Config
|
||||
DOTCONFDocument *mConf;
|
||||
};
|
||||
|
||||
#define sConfig Trinity::Singleton<Config>::Instance()
|
||||
#define sConfig (*ACE_Singleton<Config, ACE_Null_Mutex>::instance())
|
||||
|
||||
#endif
|
||||
|
||||
Reference in new issue
Block a user