You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2007/12/11 22:51:44 UTC
svn commit: r603372 - /logging/log4cxx/trunk/src/main/cpp/class.cpp
Author: carnold
Date: Tue Dec 11 13:51:37 2007
New Revision: 603372
URL: http://svn.apache.org/viewvc?rev=603372&view=rev
Log:
LOGCXX-215: Eliminate reference to sqlext.h in odbcappender.h
Modified:
logging/log4cxx/trunk/src/main/cpp/class.cpp
Modified: logging/log4cxx/trunk/src/main/cpp/class.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/class.cpp?rev=603372&r1=603371&r2=603372&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/class.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/class.cpp Tue Dec 11 13:51:37 2007
@@ -31,10 +31,10 @@
#include <log4cxx/consoleappender.h>
#include <log4cxx/fileappender.h>
#include <log4cxx/db/odbcappender.h>
-#if (defined(WIN32) || defined(_WIN32)) && !defined(_WIN32_WCE)
+#if defined(WIN32) || defined(_WIN32)
+#if !defined(_WIN32_WCE)
#include <log4cxx/nt/nteventlogappender.h>
#endif
-#if defined(WIN32) || defined(_WIN32)
#include <log4cxx/nt/outputdebugstringappender.h>
#endif
#include <log4cxx/rolling/rollingfileappender.h>
@@ -71,9 +71,6 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::net;
-#ifdef _WIN32
-using namespace log4cxx::nt;
-#endif
using namespace log4cxx::filter;
using namespace log4cxx::xml;
using namespace log4cxx::rolling;
@@ -148,20 +145,15 @@
#endif
ConsoleAppender::registerClass();
FileAppender::registerClass();
-#ifdef LOG4CXX_HAVE_ODBC
log4cxx::db::ODBCAppender::registerClass();
-#endif
-#if (defined(WIN32) || defined(_WIN32)) && !defined(_WIN32_WCE)
- NTEventLogAppender::registerClass();
-#endif
#if (defined(WIN32) || defined(_WIN32))
- OutputDebugStringAppender::registerClass();
+#if !defined(_WIN32_WCE)
+ log4cxx::nt::NTEventLogAppender::registerClass();
#endif
- RollingFileAppender::registerClass();
-#if LOG4CXX_HAVE_SMTP
-// TODO:
-// SMTPAppender::registerClass();
+ log4cxx::nt::OutputDebugStringAppender::registerClass();
#endif
+ RollingFileAppender::registerClass();
+ SMTPAppender::registerClass();
SocketAppender::registerClass();
SocketHubAppender::registerClass();
SyslogAppender::registerClass();
@@ -169,7 +161,7 @@
TelnetAppender::registerClass();
#endif
XMLSocketAppender::registerClass();
-// DateLayout::registerClass();
+ DateLayout::registerClass();
HTMLLayout::registerClass();
PatternLayout::registerClass();
SimpleLayout::registerClass();