From 3368acf9bc13b5f8f06beb44fc69038f39ab1583 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sat, 21 Mar 2015 03:25:43 -0500 Subject: [PATCH] c++11 requires a space between string concatenations --- .../library/platform/utils/Base/AutoLog.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/external/3rd/library/platform/utils/Base/AutoLog.cpp b/external/3rd/library/platform/utils/Base/AutoLog.cpp index 0fe9b4e1..833a709a 100644 --- a/external/3rd/library/platform/utils/Base/AutoLog.cpp +++ b/external/3rd/library/platform/utils/Base/AutoLog.cpp @@ -6,14 +6,6 @@ #include #include -#ifdef EXTERNAL_DISTRO -namespace NAMESPACE -{ - -#endif -namespace Base -{ - #ifdef WIN32 #include // for NT directory commands #define SLASHCHAR "\\" @@ -23,6 +15,14 @@ namespace Base #define WRONGSLASH '\\' #endif +#ifdef EXTERNAL_DISTRO +namespace NAMESPACE +{ + +#endif +namespace Base +{ + // set default values for global masks CAutoLog::eLogLevel CAutoLog::nLogMask = eLOG_NORMAL; // what is logged in log files CAutoLog::eLogLevel CAutoLog::nPrintMask = eLOG_ERROR; // what is printed on the screen @@ -292,7 +292,7 @@ void CAutoLog::Archive(void) else sprintf(strCurrent,"."); - sprintf(strPath,"%s"SLASHCHAR"%s", strCurrent, strTime); // logs/041698 + sprintf(strPath,"%s" SLASHCHAR "%s", strCurrent, strTime); // logs/041698 #ifdef WIN32 // remember current directory @@ -335,7 +335,7 @@ void CAutoLog::Archive(void) else pCurrent++; - sprintf(strCurrent,"%s"SLASHCHAR"%s",strPath,pCurrent); + sprintf(strCurrent,"%s" SLASHCHAR "%s",strPath,pCurrent); fflush(pFile); fclose(pFile);