A great purge of obsolete macros.

--HG--
branch : trunk
This commit is contained in:
Xanadu
2010-02-05 00:31:28 +01:00
parent b0b261585f
commit a5d1bc77ab
552 changed files with 1147 additions and 1223 deletions

View File

@@ -26,7 +26,7 @@
class DOTCONFDocument;
class TRINITY_DLL_SPEC Config
class Config
{
public:
Config();

View File

@@ -34,7 +34,7 @@ typedef UNORDERED_MAP<ACE_Based::Thread* , SqlResultQueue*> QueryQueues;
#define MAX_QUERY_LEN 32*1024
class TRINITY_DLL_SPEC Database
class Database
{
protected:
Database() : m_threadBody(NULL), m_delayThread(NULL) {};

View File

@@ -200,7 +200,7 @@ bool DatabaseMysql::_Query(const char *sql, MYSQL_RES **pResult, MYSQL_FIELD **p
{
// guarded block for thread-safe mySQL request
ACE_Guard<ACE_Thread_Mutex> query_connection_guard(mMutex);
#ifdef MANGOS_DEBUG
#ifdef TRINITY_DEBUG
uint32 _s = getMSTime();
#endif
if(mysql_query(mMysql, sql))
@@ -305,7 +305,7 @@ bool DatabaseMysql::DirectExecute(const char* sql)
// guarded block for thread-safe mySQL request
ACE_Guard<ACE_Thread_Mutex> query_connection_guard(mMutex);
#ifdef MANGOS_DEBUG
#ifdef TRINITY_DEBUG
uint32 _s = getMSTime();
#endif
if(mysql_query(mMysql, sql))

View File

@@ -36,7 +36,7 @@
#include <mysql.h>
#endif
class TRINITY_DLL_SPEC DatabaseMysql : public Database
class DatabaseMysql : public Database
{
friend class Trinity::OperatorNew<DatabaseMysql>;

View File

@@ -26,7 +26,7 @@
#include "Field.h"
class TRINITY_DLL_SPEC QueryResult
class QueryResult
{
public:
QueryResult(uint64 rowCount, uint32 fieldCount)
@@ -53,7 +53,7 @@ typedef ACE_Refcounted_Auto_Ptr<QueryResult, ACE_Null_Mutex> QueryResult_AutoPtr
typedef std::vector<std::string> QueryFieldNames;
class TRINITY_DLL_SPEC QueryNamedResult
class QueryNamedResult
{
public:
explicit QueryNamedResult(QueryResult* query, QueryFieldNames const& names) : mQuery(query), mFieldNames(names) {}

View File

@@ -179,10 +179,10 @@ class Log : public Trinity::Singleton<Log, Trinity::ClassLevelLockable<Log, ACE_
#endif
// primary for script library
void TRINITY_DLL_SPEC outstring_log(const char * str, ...) ATTR_PRINTF(1,2);
void TRINITY_DLL_SPEC detail_log(const char * str, ...) ATTR_PRINTF(1,2);
void TRINITY_DLL_SPEC debug_log(const char * str, ...) ATTR_PRINTF(1,2);
void TRINITY_DLL_SPEC error_log(const char * str, ...) ATTR_PRINTF(1,2);
void TRINITY_DLL_SPEC error_db_log(const char * str, ...) ATTR_PRINTF(1,2);
void outstring_log(const char * str, ...) ATTR_PRINTF(1,2);
void detail_log(const char * str, ...) ATTR_PRINTF(1,2);
void debug_log(const char * str, ...) ATTR_PRINTF(1,2);
void error_log(const char * str, ...) ATTR_PRINTF(1,2);
void error_db_log(const char * str, ...) ATTR_PRINTF(1,2);
#endif

View File

@@ -22,7 +22,7 @@
#include "Platform/Define.h"
class TRINITY_DLL_SPEC barGoLink
class barGoLink
{
static char const * const empty;
static char const * const full;

View File

@@ -43,24 +43,24 @@ inline uint32 secsToTimeBitFields(time_t secs)
}
/* Return a random number in the range min..max; (max-min) must be smaller than 32768. */
TRINITY_DLL_SPEC int32 irand(int32 min, int32 max);
int32 irand(int32 min, int32 max);
/* Return a random number in the range min..max (inclusive). For reliable results, the difference
* between max and min should be less than RAND32_MAX. */
TRINITY_DLL_SPEC uint32 urand(uint32 min, uint32 max);
uint32 urand(uint32 min, uint32 max);
/* Return a random number in the range 0 .. RAND32_MAX. */
TRINITY_DLL_SPEC int32 rand32();
int32 rand32();
/* Return a random double from 0.0 to 1.0 (exclusive). Floats support only 7 valid decimal digits.
* A double supports up to 15 valid decimal digits and is used internally (RAND32_MAX has 10 digits).
* With an FPU, there is usually no difference in performance between float and double. */
TRINITY_DLL_SPEC double rand_norm(void);
double rand_norm(void);
/* Return a random double from 0.0 to 99.9999999999999. Floats support only 7 valid decimal digits.
* A double supports up to 15 valid decimal digits and is used internaly (RAND32_MAX has 10 digits).
* With an FPU, there is usually no difference in performance between float and double. */
TRINITY_DLL_SPEC double rand_chance(void);
double rand_chance(void);
/* Return true if a random roll fits in the specified chance (range 0-100). */
inline bool roll_chance_f(float chance)