Changeset 5638 for source/ariba/utility/logging

Timestamp:

Aug 4, 2009, 10:17:33 AM (15 years ago)

Author:

Christoph Mayer

Message:

adress detection aufgeräumt, network info für bleutooth, data stream (hopeful crash fix), logging auf maemo nur warn, ...

File:

• source/ariba/utility/logging/Logging.h (modified) (2 diffs)

source/ariba/utility/logging/Logging.h

@@ -44 +44 @@
 #include <log4cxx/logger.h>
 #include <log4cxx/basicconfigurator.h>
-#include "ariba/config.h"
 
 
@@ -71 +70 @@
         log4cxx::LoggerPtr x::logger(log4cxx::Logger::getLogger(#x));
 
-#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_force(x)  {                                                             }
-  #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_force(x)  {colorInfo;  LOG4CXX_INFO(logger,x);  colorDefault;           }
-  #define logging_fatal(x)  {colorError; LOG4CXX_FATAL(logger,x); colorDefault; exit(-1); }
-
-#endif // HAVE_MAEMO
+#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 //LOGGING_H__