Date: Wednesday, December 27, 2006 @ 16:36:48
Author: marc
Path: /cvsroot/carob/carob/src
Modified: Common.cpp (1.55 -> 1.56)
cosmetic: regrouped #ifdef and #if !defined(CAROB_LOG4CXX_NAME)
------------+
Common.cpp | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
Index: carob/src/Common.cpp
diff -u carob/src/Common.cpp:1.55 carob/src/Common.cpp:1.56
--- carob/src/Common.cpp:1.55 Wed Dec 27 16:21:49 2006
+++ carob/src/Common.cpp Wed Dec 27 16:36:48 2006
@@ -47,12 +47,6 @@
#include <stdexcept>
#include <locale>
-#if ! defined(CAROB_LOG4CXX_NAME)
-namespace {
- /** The current log level (set by setLogLevel) */
- CarobNS::LogLevel currentLogLevel = CarobNS::LOG_LEVEL_WARN;
-}
-#endif
using std::wstring;
using std::string;
@@ -60,6 +54,7 @@
using std::endl;
+
#ifdef CAROB_LOG4CXX_NAME
using namespace log4cxx;
@@ -78,9 +73,17 @@
return logger;
}
}
+
+#else // CAROB_LOG4CXX_NAME
+
+namespace {
+ /** The current log level (set by setLogLevel) */
+ CarobNS::LogLevel currentLogLevel = CarobNS::LOG_LEVEL_WARN;
+}
#endif // CAROB_LOG4CXX_NAME
+
// On linux or MACOSX>10.4 try "locale -a" to get the list of all available
locales.
// TODO: it would be nice to be able to get this at runtime
// (in a non-portable way quite obviously...)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
