aboutsummaryrefslogtreecommitdiff
path: root/src/server/authserver/Realms
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/authserver/Realms')
-rwxr-xr-xsrc/server/authserver/Realms/RealmList.cpp4
-rwxr-xr-xsrc/server/authserver/Realms/RealmList.h5
2 files changed, 3 insertions, 6 deletions
diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp
index 66abaf17aa8..608657c844e 100755
--- a/src/server/authserver/Realms/RealmList.cpp
+++ b/src/server/authserver/Realms/RealmList.cpp
@@ -74,7 +74,7 @@ void RealmList::UpdateIfNeed()
void RealmList::UpdateRealms(bool init)
{
- sLog.outDetail("Updating Realm List...");
+ sLog->outDetail("Updating Realm List...");
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_GET_REALMLIST);
PreparedQueryResult result = LoginDatabase.Query(stmt);
@@ -99,7 +99,7 @@ void RealmList::UpdateRealms(bool init)
UpdateRealm(realmId, name, address, port, icon, color, timezone, (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR), pop, build);
if (init)
- sLog.outString("Added realm \"%s\".", fields[1].GetCString());
+ sLog->outString("Added realm \"%s\".", fields[1].GetCString());
}
while (result->NextRow());
}
diff --git a/src/server/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h
index aa9e47e4877..c5877aa9d61 100755
--- a/src/server/authserver/Realms/RealmList.h
+++ b/src/server/authserver/Realms/RealmList.h
@@ -45,9 +45,6 @@ struct Realm
class RealmList
{
public:
- // Null_Mutex is safe because the singleton initialized before the acceptor initialized(another place where the singleton called)
- static RealmList* instance() { return ACE_Singleton<RealmList, ACE_Null_Mutex>::instance(); }
-
typedef std::map<std::string, Realm> RealmMap;
RealmList();
@@ -71,7 +68,7 @@ class RealmList
time_t m_NextUpdateTime;
};
-#define sRealmList RealmList::instance()
+#define sRealmList ACE_Singleton<RealmList, ACE_Null_Mutex>::instance()
#endif
/// @}