You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/11/13 22:05:18 UTC
svn commit: r474517 - in
/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util: Logger.cpp
Logger.h Logging.h
Author: jsdelfino
Date: Mon Nov 13 13:05:17 2006
New Revision: 474517
URL: http://svn.apache.org/viewvc?view=rev&rev=474517
Log:
Changed logging macros to not use __VA_ARGS__ as VC7 does not support this
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp?view=diff&rev=474517&r1=474516&r2=474517
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp Mon Nov 13 13:05:17 2006
@@ -104,6 +104,42 @@
}
}
+ void Logger::logArgs0(const char* msg, ...)
+ {
+ if (0 <= loggingLevel)
+ {
+ va_list variableArguments;
+ va_start(variableArguments, msg);
+ char messageBuffer[1024];
+ vsprintf(messageBuffer, msg, variableArguments);
+ logWriter->log(0, messageBuffer);
+ va_end(variableArguments);
+ }
+ }
+ void Logger::logArgs1(const char* msg, ...)
+ {
+ if (1 <= loggingLevel)
+ {
+ va_list variableArguments;
+ va_start(variableArguments, msg);
+ char messageBuffer[1024];
+ vsprintf(messageBuffer, msg, variableArguments);
+ logWriter->log(1, messageBuffer);
+ va_end(variableArguments);
+ }
+ }
+ void Logger::logArgs2(const char* msg, ...)
+ {
+ if (2 <= loggingLevel)
+ {
+ va_list variableArguments;
+ va_start(variableArguments, msg);
+ char messageBuffer[1024];
+ vsprintf(messageBuffer, msg, variableArguments);
+ logWriter->log(2, messageBuffer);
+ va_end(variableArguments);
+ }
+ }
+
} // End namespace sca
} // End namespace tuscany
-
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h?view=diff&rev=474517&r1=474516&r2=474517
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.h Mon Nov 13 13:05:17 2006
@@ -62,6 +62,9 @@
* @param ... Variable arguments.
*/
SCA_API static void logArgs(int level, const char* msg, ...);
+ SCA_API static void logArgs0(const char* msg, ...);
+ SCA_API static void logArgs1(const char* msg, ...);
+ SCA_API static void logArgs2(const char* msg, ...);
/**
* The currently set logging level
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h?view=diff&rev=474517&r1=474516&r2=474517
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logging.h Mon Nov 13 13:05:17 2006
@@ -32,16 +32,13 @@
const LogEntry& __LOGENTRY__ = tuscany::sca::Logger::loggingLevel >= 2 ? tuscany::sca::EnabledLogEntry(__PRETTY_FUNCTION__) : tuscany::sca::LogEntry()
#endif
-#define loginfo(...) \
-if (tuscany::sca::Logger::loggingLevel >= 2) \
-tuscany::sca::Logger::logArgs(2, __VA_ARGS__);
+#define loginfo \
+if (tuscany::sca::Logger::loggingLevel >= 2) tuscany::sca::Logger::logArgs2
-#define logwarning(...) \
-if (tuscany::sca::Logger::loggingLevel >= 1) \
-tuscany::sca::Logger::logArgs(1, __VA_ARGS__);
+#define logwarning \
+if (tuscany::sca::Logger::loggingLevel >= 1) tuscany::sca::Logger::logArgs1
-#define logerror(...) \
-if (tuscany::sca::Logger::loggingLevel >= 0) \
-tuscany::sca::Logger::logArgs(0, __VA_ARGS__);
+#define logerror \
+if (tuscany::sca::Logger::loggingLevel >= 0) tuscany::sca::Logger::logArgs0
#endif // tuscany_sca_util_logging_h
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org