ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

utility: Fixed name collision of log macros in clang

Browse Source 
This change removes the local std::string variable in the log macros due to possible name collisions with macro callers
in clang. Responsibility of this change is held by Malte.
This commit is contained in:
Eberhard Graether
2014-07-07 13:43:29 +02:00
parent addd86288f
commit e38914887d
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utility/logging/logging.h
+3 -6
View File
@@ -9,24 +9,21 @@
#define LOG_INFO(str) \
do \
{ \
std::string s((str)); \
LogManager::getInstance()->logInfo(s, __FILE__, __FUNCTION__, __LINE__); \
LogManager::getInstance()->logInfo(str, __FILE__, __FUNCTION__, __LINE__); \
} \
while(0) \
#define LOG_WARNING(str) \
do \
{ \
std::string s((str)); \
LogManager::getInstance()->logWarning(s, __FILE__, __FUNCTION__, __LINE__); \
LogManager::getInstance()->logWarning(str, __FILE__, __FUNCTION__, __LINE__); \
} \
while(0) \
#define LOG_ERROR(str) \
do \
{ \
std::string s((str)); \
LogManager::getInstance()->logError(s, __FILE__, __FUNCTION__, __LINE__); \
LogManager::getInstance()->logError(str, __FILE__, __FUNCTION__, __LINE__); \
} \
while(0) \