summaryrefslogtreecommitdiff
path: root/cesar/maximus/utils
diff options
context:
space:
mode:
authorschodet2008-09-16 14:45:49 +0000
committerschodet2008-09-16 14:45:49 +0000
commit39ebfbaa5d0c5afeba0e35ac6440b9e4980b6044 (patch)
tree54bb88ee9e48af41eaca94082c6e57910e455fa6 /cesar/maximus/utils
parent5382dac6d1f198528aabc6a1fd8d0d95cead2e9d (diff)
* maximus/utils:
- more optimisations. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@2990 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/maximus/utils')
-rw-r--r--cesar/maximus/utils/inc/Logger.h18
-rw-r--r--cesar/maximus/utils/src/Logger.cpp17
2 files changed, 15 insertions, 20 deletions
diff --git a/cesar/maximus/utils/inc/Logger.h b/cesar/maximus/utils/inc/Logger.h
index c048f04300..4cc318ab93 100644
--- a/cesar/maximus/utils/inc/Logger.h
+++ b/cesar/maximus/utils/inc/Logger.h
@@ -16,7 +16,11 @@
#define LOG_FATAL 5
#define LOG_NONE 6
-#define logFunction() clog << logger(LOG_DEBUG) << __PRETTY_FUNCTION__ << endl
+#define logFunction() do { \
+ if (logger.is (LOG_DEBUG)) { \
+ clog << logger(LOG_DEBUG) << __PRETTY_FUNCTION__ << endl; \
+ } \
+} while (0)
#define logTest() clog << endl << "---" << endl << __PRETTY_FUNCTION__ << endl
@@ -53,7 +57,11 @@ class Logger
/**
* Operator to set the level of a message
*/
- Logger & operator() ( int msg_level );
+ Logger & operator() ( int msg_level )
+ {
+ setMsgLevel(msg_level);
+ return *this;
+ }
/**
* Test log level to shortcut execution
@@ -81,7 +89,11 @@ class Logger
* Functions to get and set the msg level
*/
int getMsgLevel ( ) const { return mMsgLevel; }
- void setMsgLevel ( int msg_level );
+ void setMsgLevel ( int msg_level )
+ {
+ if ( (LOG_DEBUG <= msg_level) && (LOG_NONE >= msg_level) )
+ mMsgLevel = msg_level;
+ }
/**
* @return Network_Clock_Tick
diff --git a/cesar/maximus/utils/src/Logger.cpp b/cesar/maximus/utils/src/Logger.cpp
index 3140c147f0..756b530e60 100644
--- a/cesar/maximus/utils/src/Logger.cpp
+++ b/cesar/maximus/utils/src/Logger.cpp
@@ -44,14 +44,6 @@ Logger::~Logger ( )
}
-Logger & Logger::operator() ( int msg_level )
-{
- setMsgLevel(msg_level);
-
- return (*this);
-}
-
-
LoggerStream operator<< ( ostream & os, const Logger & logger )
{
if (logger.getMsgLevel() >= logger.getLogLevel())
@@ -92,15 +84,6 @@ void Logger::setLogLevel ( int log_level )
}
-void Logger::setMsgLevel ( int msg_level )
-{
- if ( (LOG_DEBUG <= msg_level) && (LOG_NONE >= msg_level) )
- {
- mMsgLevel = msg_level;
- }
-}
-
-
bool Logger::updateTickValue ( const Network_Clock_Tick current_tick_value )
{
mCurrentTickValue = current_tick_value;