Minor Styling changes
This commit is contained in:
parent
3ca0018aa9
commit
1ae8df3572
@ -48,7 +48,7 @@ DatabaseMysql::DatabaseMysql()
|
|||||||
// before first connection
|
// before first connection
|
||||||
if (db_count++ == 0)
|
if (db_count++ == 0)
|
||||||
{
|
{
|
||||||
//Mysql Library Init
|
// Mysql Library Init
|
||||||
if(mysql_library_init(-1, NULL, NULL))
|
if(mysql_library_init(-1, NULL, NULL))
|
||||||
{
|
{
|
||||||
sLog.outError("Could not initialize MySQL client library\n");
|
sLog.outError("Could not initialize MySQL client library\n");
|
||||||
@ -69,9 +69,9 @@ DatabaseMysql::~DatabaseMysql()
|
|||||||
|
|
||||||
// Free Mysql library pointers for last ~DB
|
// Free Mysql library pointers for last ~DB
|
||||||
if (--db_count == 0)
|
if (--db_count == 0)
|
||||||
{
|
{
|
||||||
mysql_library_end();
|
mysql_library_end();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SqlConnection* DatabaseMysql::CreateConnection()
|
SqlConnection* DatabaseMysql::CreateConnection()
|
||||||
|
@ -44,20 +44,41 @@ namespace ACE_Based
|
|||||||
StorageType _queue; /**< Storage backing the queue. */
|
StorageType _queue; /**< Storage backing the queue. */
|
||||||
|
|
||||||
public:
|
public:
|
||||||
LockedQueue(): _lock(), _queue()
|
|
||||||
|
/**
|
||||||
|
* @brief Create a LockedQueue.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
LockedQueue()
|
||||||
|
: _lock(), _queue()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Destroy a LockedQueue.
|
||||||
|
*
|
||||||
|
*/
|
||||||
virtual ~LockedQueue()
|
virtual ~LockedQueue()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Adds an item to the queue.
|
||||||
|
*
|
||||||
|
* @param item
|
||||||
|
*/
|
||||||
void add(const T& item)
|
void add(const T& item)
|
||||||
{
|
{
|
||||||
ACE_GUARD (LockType, g, this->_lock);
|
ACE_GUARD (LockType, g, this->_lock);
|
||||||
_queue.push_back(item);
|
_queue.push_back(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Gets the next result in the queue, if any.
|
||||||
|
*
|
||||||
|
* @param result
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
bool next(T& result)
|
bool next(T& result)
|
||||||
{
|
{
|
||||||
ACE_GUARD_RETURN(LockType, g, this->_lock, false);
|
ACE_GUARD_RETURN(LockType, g, this->_lock, false);
|
||||||
@ -74,6 +95,13 @@ namespace ACE_Based
|
|||||||
}
|
}
|
||||||
|
|
||||||
template<class Checker>
|
template<class Checker>
|
||||||
|
/**
|
||||||
|
* @brief
|
||||||
|
*
|
||||||
|
* @param result
|
||||||
|
* @param check
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
bool next(T& result, Checker& check)
|
bool next(T& result, Checker& check)
|
||||||
{
|
{
|
||||||
ACE_GUARD_RETURN(LockType, g, this->_lock, false);
|
ACE_GUARD_RETURN(LockType, g, this->_lock, false);
|
||||||
@ -93,6 +121,12 @@ namespace ACE_Based
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Checks if we're empty or not with locks held
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
bool empty()
|
bool empty()
|
||||||
{
|
{
|
||||||
ACE_GUARD_RETURN (LockType, g, this->_lock, false);
|
ACE_GUARD_RETURN (LockType, g, this->_lock, false);
|
||||||
|
@ -121,27 +121,21 @@ void Log::SetColor(bool stdout_stream, Color color)
|
|||||||
|
|
||||||
static WORD WinColorFG[Color_count] =
|
static WORD WinColorFG[Color_count] =
|
||||||
{
|
{
|
||||||
0, // BLACK
|
0, // BLACK
|
||||||
FOREGROUND_RED, // RED
|
FOREGROUND_RED, // RED
|
||||||
FOREGROUND_GREEN, // GREEN
|
FOREGROUND_GREEN, // GREEN
|
||||||
FOREGROUND_RED | FOREGROUND_GREEN, // BROWN
|
FOREGROUND_RED | FOREGROUND_GREEN, // BROWN
|
||||||
FOREGROUND_BLUE, // BLUE
|
FOREGROUND_BLUE, // BLUE
|
||||||
FOREGROUND_RED | FOREGROUND_BLUE,// MAGENTA
|
FOREGROUND_RED | FOREGROUND_BLUE, // MAGENTA
|
||||||
FOREGROUND_GREEN | FOREGROUND_BLUE, // CYAN
|
FOREGROUND_GREEN | FOREGROUND_BLUE, // CYAN
|
||||||
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,// WHITE
|
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, // WHITE
|
||||||
// YELLOW
|
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY, // YELLOW
|
||||||
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY,
|
FOREGROUND_RED | FOREGROUND_INTENSITY, // RED_BOLD
|
||||||
// RED_BOLD
|
FOREGROUND_GREEN | FOREGROUND_INTENSITY, // GREEN_BOLD
|
||||||
FOREGROUND_RED | FOREGROUND_INTENSITY,
|
FOREGROUND_BLUE | FOREGROUND_INTENSITY, // BLUE_BOLD
|
||||||
// GREEN_BOLD
|
FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY, // MAGENTA_BOLD
|
||||||
FOREGROUND_GREEN | FOREGROUND_INTENSITY,
|
FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY, // CYAN_BOLD
|
||||||
FOREGROUND_BLUE | FOREGROUND_INTENSITY, // BLUE_BOLD
|
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY // WHITE_BOLD
|
||||||
// MAGENTA_BOLD
|
|
||||||
FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
|
|
||||||
// CYAN_BOLD
|
|
||||||
FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
|
|
||||||
// WHITE_BOLD
|
|
||||||
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY
|
|
||||||
};
|
};
|
||||||
|
|
||||||
HANDLE hConsole = GetStdHandle(stdout_stream ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE);
|
HANDLE hConsole = GetStdHandle(stdout_stream ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE);
|
||||||
|
@ -295,7 +295,9 @@ bool IsIPAddrInNetwork(ACE_INET_Addr const& net, ACE_INET_Addr const& addr, ACE_
|
|||||||
{
|
{
|
||||||
uint32 mask = subnetMask.get_ip_address();
|
uint32 mask = subnetMask.get_ip_address();
|
||||||
if ((net.get_ip_address() & mask) == (addr.get_ip_address() & mask))
|
if ((net.get_ip_address() & mask) == (addr.get_ip_address() & mask))
|
||||||
|
{
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -574,7 +576,9 @@ void HexStrToByteArray(std::string const& str, uint8* out, bool reverse /*= fals
|
|||||||
{
|
{
|
||||||
// string must have even number of characters
|
// string must have even number of characters
|
||||||
if (str.length() & 1)
|
if (str.length() & 1)
|
||||||
|
{
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
int32 init = 0;
|
int32 init = 0;
|
||||||
int32 end = str.length();
|
int32 end = str.length();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user