Changeset 5151 for source/ariba/utility

Timestamp:

Jul 21, 2009, 1:54:55 PM (15 years ago)

Author:

Christoph Mayer

Message:

begin merge back from relay branch

Location:

source/ariba/utility

Files:

• logging/Logging.h (modified) (1 diff)
• system/StartupWrapper.cpp (modified) (1 diff)

source/ariba/utility/logging/Logging.h

@@ -69 +69 @@
         log4cxx::LoggerPtr x::logger(log4cxx::Logger::getLogger(#x));
 
-#define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);                         }
-#define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;           }
-#define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
-#define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
-#define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
-#define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
+#ifdef HAVE_MAEMO
+
+  #define logging_trace(x)  { }
+  #define logging_debug(x)  { }
+  #define logging_info(x)   { }
+  #define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
+  #define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
+  #define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
+
+#else
+
+  #define logging_trace(x)  {            LOG4CXX_TRACE(logger,x);                         }
+  #define logging_debug(x)  {colorDebug; LOG4CXX_DEBUG(logger,x); colorDefault;           }
+  #define logging_info(x)   {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
+  #define logging_warn(x)   {colorWarn;  LOG4CXX_WARN(logger,x);  colorDefault;           }
+  #define logging_error(x)  {colorError; LOG4CXX_ERROR(logger,x); colorDefault;           }
+  #define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
+
+#endif // HAVE_MAEMO
 
 #endif //LOGGING_H__

source/ariba/utility/system/StartupWrapper.cpp

@@ -103 +103 @@
         // set up again an individual level if you like
         {
-//              log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("BaseOverlay"));
+//              log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("PingPong"));
 //              logger->setLevel(log4cxx::Level::getDebug());
         }