Attached Files | clog.h.patch [^] (4,225 bytes) 2016-02-19 13:51 [Show Content] [Hide Content]--- clog.h.old.h 2015-12-09 14:56:30.000000000 +0100
+++ clog.h 2016-02-19 14:44:09.000000000 +0100
@@ -130,9 +130,9 @@
*/
#ifndef GLOBAL_COMPILETIME_LOGLEVEL
#ifdef NDEBUG
-#define GLOBAL_COMPILETIME_LOGLEVEL LOGLEVEL_INFO
+#define GLOBAL_COMPILETIME_LOGLEVEL omnetpp::LOGLEVEL_INFO
#else
-#define GLOBAL_COMPILETIME_LOGLEVEL LOGLEVEL_TRACE
+#define GLOBAL_COMPILETIME_LOGLEVEL omnetpp::LOGLEVEL_TRACE
#endif
#endif
@@ -145,7 +145,7 @@
//
#define OPP_LOGPROXY(object, classname, loglevel, category) \
((void)0, !(loglevel <= GLOBAL_COMPILETIME_LOGLEVEL && \
- !getEnvir()->isDisabled() && \
+ !omnetpp::getEnvir()->isDisabled() && \
loglevel <= omnetpp::cLogLevel::globalRuntimeLoglevel && \
omnetpp::cLogProxy::isEnabled(object, category, loglevel))) ? \
omnetpp::cLogProxy::dummyStream : omnetpp::cLogProxy(object, category, loglevel, __FILE__, __LINE__, classname, __FUNCTION__)
@@ -194,13 +194,13 @@
*/
//@{
#define EV EV_INFO ///< Short for EV_INFO
-#define EV_FATAL OPP_LOG(LOGLEVEL_FATAL, nullptr) ///< Log local fatal errors
-#define EV_ERROR OPP_LOG(LOGLEVEL_ERROR, nullptr) ///< Log local but recoverable errors
-#define EV_WARN OPP_LOG(LOGLEVEL_WARN, nullptr) ///< Log warnings
-#define EV_INFO OPP_LOG(LOGLEVEL_INFO, nullptr) ///< Log information (default log level)
-#define EV_DETAIL OPP_LOG(LOGLEVEL_DETAIL, nullptr) ///< Log state variables and other low-level information
-#define EV_DEBUG OPP_LOG(LOGLEVEL_DEBUG, nullptr) ///< Log state variables and other low-level information
-#define EV_TRACE OPP_LOG(LOGLEVEL_TRACE, nullptr) ///< Log control flow information (entering/exiting functions, etc)
+#define EV_FATAL OPP_LOG(omnetpp::LOGLEVEL_FATAL, nullptr) ///< Log local fatal errors
+#define EV_ERROR OPP_LOG(omnetpp::LOGLEVEL_ERROR, nullptr) ///< Log local but recoverable errors
+#define EV_WARN OPP_LOG(omnetpp::LOGLEVEL_WARN, nullptr) ///< Log warnings
+#define EV_INFO OPP_LOG(omnetpp::LOGLEVEL_INFO, nullptr) ///< Log information (default log level)
+#define EV_DETAIL OPP_LOG(omnetpp::LOGLEVEL_DETAIL, nullptr) ///< Log state variables and other low-level information
+#define EV_DEBUG OPP_LOG(omnetpp::LOGLEVEL_DEBUG, nullptr) ///< Log state variables and other low-level information
+#define EV_TRACE OPP_LOG(omnetpp::LOGLEVEL_TRACE, nullptr) ///< Log control flow information (entering/exiting functions, etc)
//@}
/**
@@ -214,13 +214,13 @@
*/
//@{
#define EV_C(category) EV_INFO_C(category) ///< Short for EV_INFO_C
-#define EV_FATAL_C(category) OPP_LOG(LOGLEVEL_FATAL, category) ///< Log local fatal errors
-#define EV_ERROR_C(category) OPP_LOG(LOGLEVEL_ERROR, category) ///< Log local but recoverable errors
-#define EV_WARN_C(category) OPP_LOG(LOGLEVEL_WARN, category) ///< Log warnings
-#define EV_INFO_C(category) OPP_LOG(LOGLEVEL_INFO, category) ///< Log information (default log level)
-#define EV_DETAIL_C(category) OPP_LOG(LOGLEVEL_DETAIL, category) ///< Log state variables and other low-level information
-#define EV_DEBUG_C(category) OPP_LOG(LOGLEVEL_DEBUG, category) ///< Log state variables and other low-level information
-#define EV_TRACE_C(category) OPP_LOG(LOGLEVEL_TRACE, category) ///< Log control flow information (entering/exiting functions, etc)
+#define EV_FATAL_C(category) OPP_LOG(omnetpp::LOGLEVEL_FATAL, category) ///< Log local fatal errors
+#define EV_ERROR_C(category) OPP_LOG(omnetpp::LOGLEVEL_ERROR, category) ///< Log local but recoverable errors
+#define EV_WARN_C(category) OPP_LOG(omnetpp::LOGLEVEL_WARN, category) ///< Log warnings
+#define EV_INFO_C(category) OPP_LOG(omnetpp::LOGLEVEL_INFO, category) ///< Log information (default log level)
+#define EV_DETAIL_C(category) OPP_LOG(omnetpp::LOGLEVEL_DETAIL, category) ///< Log state variables and other low-level information
+#define EV_DEBUG_C(category) OPP_LOG(omnetpp::LOGLEVEL_DEBUG, category) ///< Log state variables and other low-level information
+#define EV_TRACE_C(category) OPP_LOG(omnetpp::LOGLEVEL_TRACE, category) ///< Log control flow information (entering/exiting functions, etc)
//@}
/**
|