Changeset 10700 for source/ariba/utility/logging

Timestamp:

Aug 22, 2012, 2:09:00 PM (12 years ago)

Author:

Michael Tänzer

Message:

Merge CMake branch into trunk

Location:

source

Files:

• . (modified) (1 prop)
• ariba (modified) (1 prop)
• ariba/utility (modified) (1 prop)
• ariba/utility/logging (modified) (1 prop)
• ariba/utility/logging/CMakeLists.txt (added)
• ariba/utility/logging/Logging.h (modified) (4 diffs)

source/ariba/utility/logging/Logging.h

@@ -44 +44 @@
 #include "ariba/config.h"
 
-#ifdef HAVE_LOG4CXX_LOGGER_H
+#ifdef HAVE_LOG4CXX
         #include <log4cxx/logger.h>
         #include <log4cxx/basicconfigurator.h>
-#endif // HAVE_LOG4CXX_LOGGER_H
+#endif // HAVE_LOG4CXX
 
 #ifdef LOGCOLORS
@@ -64 +64 @@
 
 
-#ifdef HAVE_LOG4CXX_LOGGER_H
+#ifdef HAVE_LOG4CXX
 
   #define use_logging_h(x) \
@@ -89 +89 @@
   #define logging_classlevel_error(x) {log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger(#x)); if(logger != NULL) logger->setLevel(log4cxx::Level::getError()); }
 
-#else // HAVE_LOG4CXX_LOGGER_H
+#else // HAVE_LOG4CXX
 
   #define use_logging_h(x)
@@ -115 +115 @@
   #define logging_classlevel_error(x) {std::cout << "individual class logging only available with log4cxx library" << std::endl;}
 
-#endif // HAVE_LOG4CXX_LOGGER_H
+#endif // HAVE_LOG4CXX
 
 #endif //LOGGING_H__