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 2005/05/04 18:13:42 UTC
cvs commit: logging-log4cxx/tests/src/xml customleveltestcase.cpp domtestcase.cpp
carnold 2005/05/04 09:13:42
Modified: . build.xml configure.in
include/log4cxx Makefile.am basicconfigurator.h file.h
fileappender.h logger.h logstring.h mdc.h ndc.h
portability.h propertyconfigurator.h
include/log4cxx/db odbcappender.h
include/log4cxx/helpers aprinitializer.h bytebuffer.h
condition.h datetimedateformat.h exception.h
formattinginfo.h gnomexml.h locale.h loglog.h
msxml.h mutex.h objectimpl.h objectptr.h pool.h
strictmath.h stringhelper.h system.h thread.h
timezone.h transcoder.h transform.h
include/log4cxx/net smtpappender.h
include/log4cxx/rolling sizebasedtriggeringpolicy.h
include/log4cxx/spi/location locationinfo.h
include/log4cxx/xml domconfigurator.h
src class.cpp datagramsocket.cpp domconfigurator.cpp
gnomexml.cpp logger.cpp loglog.cpp msxml.cpp
odbcappender.cpp propertyresourcebundle.cpp
serversocket.cpp smtpappender.cpp socket.cpp
stringhelper.cpp stringtokenizer.cpp
threadspecificdata.cpp
tests/src encodingtest.cpp main.cpp
tests/src/customlogger xloggertestcase.cpp
tests/src/db odbcappendertestcase.cpp
tests/src/defaultinit testcase2.cpp testcase4.cpp
tests/src/net smtpappendertestcase.cpp
tests/src/varia errorhandlertestcase.cpp
tests/src/xml customleveltestcase.cpp domtestcase.cpp
Added: include/log4cxx log4cxx.h log4cxx.h.in log4cxx.hw
include/log4cxx/private Makefile.am log4cxx.h log4cxx.h.in
log4cxx.hw
Log:
LOGCXX-43: Config header improvements
Revision Changes Path
1.63 +37 -20 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- build.xml 29 Apr 2005 01:23:16 -0000 1.62
+++ build.xml 4 May 2005 16:13:40 -0000 1.63
@@ -315,12 +315,16 @@
<delete>
<fileset dir="${tests.dir}/src" includes="shortsocket*" excludes="*.cpp"/>
<fileset dir="${tests.dir}/output"/>
+ <fileset dir="${include.dir}/log4cxx" includes="**/log4cxx.h"/>
</delete>
</target>
-<target name="config-check">
+<target name="config-check" depends="os-detect">
<condition property="config-available" value="true">
- <available file="${include.dir}/log4cxx/config_auto.h"/>
+ <and>
+ <available file="${include.dir}/log4cxx/log4cxx.h"/>
+ <available file="${include.dir}/log4cxx/private/log4cxx.h"/>
+ </and>
</condition>
</target>
@@ -330,18 +334,41 @@
if="is-unix"
unless="config-available">
- <!-- exec executable="configure">
- <arg value="- -with-apr=${with-apr}"/>
- <arg value="- -with-aprutil=${aprutil.dir}"/>
- <arg value="- -with-cppunit=${cppunit.dir}"/>
- </exec-->
+ <copy tofile="${include.dir}/log4cxx/log4cxx.h"
+ file="${include.dir}/log4cxx/log4cxx.h.in"/>
+ <copy tofile="${include.dir}/log4cxx/private/log4cxx.h"
+ file="${include.dir}/log4cxx/private/log4cxx.h.in"/>
</target>
-<target name="win-configure" depends="config-check" if="is-windows">
+<target name="win-configure"
+ depends="config-check"
+ if="is-windows"
+ unless="config-available">
+ <copy tofile="${include.dir}/log4cxx/log4cxx.h"
+ file="${include.dir}/log4cxx/log4cxx.hw"/>
+ <copy tofile="${include.dir}/log4cxx/private/log4cxx.h"
+ file="${include.dir}/log4cxx/private/log4cxx.hw"/>
</target>
-<target name="configure" depends="unix-configure, win-configure"/>
+
+<target name="configure" depends="unix-configure,
+ win-configure">
+ <condition property="logchar_is_utf8" value="1">
+ <isset property="is-utf8"/>
+ </condition>
+ <property name="logchar_is_utf8" value="0"/>
+
+ <replaceregexp file="${include.dir}/log4cxx/log4cxx.h"
+ match="#define LOG4CXX_LOGCHAR_IS_UTF8.*"
+ replace="#define LOG4CXX_LOGCHAR_IS_UTF8 ${logchar_is_utf8}"/>
+
+ <replaceregexp file="${include.dir}/log4cxx/log4cxx.h"
+ match="#define LOG4CXX_HAS_WCHAR_T.*"
+ replace="#define LOG4CXX_HAS_WCHAR_T ${has.wchar_t}"/>
+
+
+</target>
<target name="get-apr-module">
<mkdir dir="${lib.dir}"/>
@@ -555,7 +582,7 @@
</target>
-<target name="build" depends="build-aprutil" description="Build log4cxx library">
+<target name="build" depends="build-aprutil, configure" description="Build log4cxx library">
<mkdir dir="${log4cxx.lib.dir}/log4cxx_obj"/>
<cc name="${compiler}"
@@ -579,16 +606,6 @@
<defineset define="APR_DECLARE_STATIC" if="apr-static"/>
<defineset define="APU_DECLARE_STATIC" if="aprutil-static"/>
<defineset define="WIN32" if="is-windows"/>
- <defineset if="is-utf8">
- <define name="LOG4CXX_LOGCHAR_IS_UTF8" value="1"/>
- </defineset>
- <defineset>
- <define name="LOG4CXX_HAS_WCHAR_T" value="${has.wchar_t}"/>
- </defineset>
- <defineset if="is-mingw">
- <define name="LOG4CXX_HAS_STD_WCOUT" value="0"/>
- <define name="LOG4CXX_HAS_STD_WLOCALE" value="0"/>
- </defineset>
<compilerarg value="${pic-option}" if="pic-option"/>
&libsets;
<project type="${project.type}" outfile="${project.dir}/log4cxx" if="project.if"/>
1.51 +1 -3 logging-log4cxx/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/logging-log4cxx/configure.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- configure.in 29 Apr 2005 00:26:15 -0000 1.50
+++ configure.in 4 May 2005 16:13:40 -0000 1.51
@@ -18,8 +18,6 @@
AC_SUBST(LT_VERSION)
-AC_CONFIG_HEADERS([include/log4cxx/config_auto.h],[cat "${ac_abs_top_builddir}/include/log4cxx/config_auto.h" | sed -e 's/\(HAVE_\|MUST_\|UNICODE\)/LOG4CXX_\1/;s/^\(.*PACKAGE.*\|.*VERSION.*\|.*STDC_HEADERS.*\)$/\/* \1 *\//' > "${ac_abs_top_builddir}/include/log4cxx/config_auto_log4cxx.h"])
-
AH_VERBATIM([HAVE_NO_EXPLICIT_EXPORTS],
[/* no explicit exports */
#define LOG4CXX_EXPORT])
@@ -380,7 +378,7 @@
docs/Doxyfile
src/Makefile
include/Makefile
-include/log4cxx/config_msvc.h
+include/log4cxx/private/log4cxx.h
include/log4cxx/Makefile
include/log4cxx/helpers/Makefile
include/log4cxx/net/Makefile
1.8 +3 -3 logging-log4cxx/include/log4cxx/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 7 Jan 2005 01:25:19 -0000 1.7
+++ Makefile.am 4 May 2005 16:13:40 -0000 1.8
@@ -1,4 +1,4 @@
-SUBDIRS = helpers net nt rolling spi varia xml config db
+SUBDIRS = helpers net nt rolling spi varia xml config db private
log4cxxincdir = $(includedir)/log4cxx
-log4cxxinc_HEADERS= $(top_srcdir)/include/log4cxx/*.h config_auto_log4cxx.h
-DISTCLEANFILES = config_auto_log4cxx.h
+log4cxxinc_HEADERS= $(top_srcdir)/include/log4cxx/*.h log4cxx.h
+DISTCLEANFILES = log4cxx.h
1.10 +1 -1 logging-log4cxx/include/log4cxx/basicconfigurator.h
Index: basicconfigurator.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/basicconfigurator.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- basicconfigurator.h 15 Feb 2005 23:55:58 -0000 1.9
+++ basicconfigurator.h 4 May 2005 16:13:40 -0000 1.10
@@ -19,7 +19,7 @@
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
-#include <log4cxx/portability.h>
+#include <log4cxx/logger.h>
#include <log4cxx/logstring.h>
#include <log4cxx/spi/configurator.h>
#include <map>
1.11 +1 -1 logging-log4cxx/include/log4cxx/file.h
Index: file.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/file.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- file.h 11 Mar 2005 06:34:48 -0000 1.10
+++ file.h 4 May 2005 16:13:40 -0000 1.11
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_FILE_H
#define _LOG4CXX_FILE_H
-#include <log4cxx/portability.h>
+#include <log4cxx/logger.h>
#include <log4cxx/logstring.h>
extern "C" {
1.25 +1 -1 logging-log4cxx/include/log4cxx/fileappender.h
Index: fileappender.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/fileappender.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fileappender.h 1 Apr 2005 02:02:33 -0000 1.24
+++ fileappender.h 4 May 2005 16:13:40 -0000 1.25
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_FILE_APPENDER_H
#define _LOG4CXX_FILE_APPENDER_H
-#include <log4cxx/portability.h>
+#include <log4cxx/logger.h>
#include <log4cxx/logstring.h>
#include <log4cxx/writerappender.h>
#include <log4cxx/file.h>
1.36 +1 -1 logging-log4cxx/include/log4cxx/logger.h
Index: logger.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/logger.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- logger.h 11 Mar 2005 06:34:48 -0000 1.35
+++ logger.h 4 May 2005 16:13:40 -0000 1.36
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_LOGGER_H
#define _LOG4CXX_LOGGER_H
-#include <log4cxx/portability.h>
+#include <log4cxx/logger.h>
#include <log4cxx/helpers/appenderattachableimpl.h>
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/level.h>
1.5 +1 -12 logging-log4cxx/include/log4cxx/logstring.h
Index: logstring.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/logstring.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- logstring.h 11 Mar 2005 06:34:48 -0000 1.4
+++ logstring.h 4 May 2005 16:13:40 -0000 1.5
@@ -18,23 +18,12 @@
#define _LOG4CXX_STRING_H
#include <string>
+#include <log4cxx/log4cxx.h>
#if LOG4CXX_LOGCHAR_IS_WCHAR && LOG4CXX_LOGCHAR_IS_UTF8
#error only one of LOG4CXX_LOGCHAR_IS_WCHAR and LOG4CXX_LOGCHAR_IS_UTF8 may be true
#endif
-#if !defined(LOG4CXX_HAS_WCHAR_T)
-#define LOG4CXX_HAS_WCHAR_T 1
-#endif
-
-#if !LOG4CXX_LOGCHAR_IS_WCHAR && !LOG4CXX_LOGCHAR_IS_UTF8
-
-#if LOG4CXX_HAS_WCHAR_T
-#define LOG4CXX_LOGCHAR_IS_WCHAR 1
-#else
-#define LOG4CXX_LOGCHAR_IS_UTF8 1
-#endif
-#endif
namespace log4cxx {
1.12 +1 -1 logging-log4cxx/include/log4cxx/mdc.h
Index: mdc.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/mdc.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mdc.h 11 Mar 2005 06:34:48 -0000 1.11
+++ mdc.h 4 May 2005 16:13:40 -0000 1.12
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_MDC_H
#define _LOG4CXX_MDC_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
#include <log4cxx/logstring.h>
#include <map>
1.15 +1 -1 logging-log4cxx/include/log4cxx/ndc.h
Index: ndc.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/ndc.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ndc.h 11 Mar 2005 06:34:48 -0000 1.14
+++ ndc.h 4 May 2005 16:13:40 -0000 1.15
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_NDC_H
#define _LOG4CXX_NDC_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
#include <log4cxx/logstring.h>
#include <stack>
1.16 +3 -55 logging-log4cxx/include/log4cxx/portability.h
Index: portability.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/portability.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- portability.h 16 Mar 2005 19:07:21 -0000 1.15
+++ portability.h 4 May 2005 16:13:40 -0000 1.16
@@ -17,60 +17,8 @@
#ifndef _LOG4CXX_PORTABILITY_H
#define _LOG4CXX_PORTABILITY_H
-#if defined(LOG4CXX_STATIC)
-#define LOG4CXX_EXPORT
-#else
-#if defined(_WIN32)
-#ifdef LOG4CXX
- #define LOG4CXX_EXPORT __declspec(dllexport)
-#else
- #define LOG4CXX_EXPORT __declspec(dllimport)
-#endif
-#else
-#define LOG4CXX_EXPORT
-#endif
-#endif
-
-#if defined(_MSC_VER)
-#pragma warning(disable : 4250 4251 4786 4290)
-
-
-#if defined(_MSC_VER) && _MSC_VER >= 1200
-typedef __int64 log4cxx_int64_t;
-#else
-typedef long long log4cxx_int64_t;
-#endif
-
-#else
-typedef long long log4cxx_int64_t;
-
-#endif
-
-
-typedef log4cxx_int64_t log4cxx_time_t;
-typedef int log4cxx_status_t;
-
-#if defined(_MSC_VER)
-#define HAVE_XML 1
-#define LOG4CXX_HAVE_XML 1
-#endif
-
-#if !defined(__BORLANDC__)
-#define LOG4CXX_RETURN_AFTER_THROW
-#endif
-
-#if !defined(_WIN32)
-#define HAVE_XML 1
-#define LOG4CXX_HAVE_XML 1
-#define LOG4CXX_HAVE_SYSLOG 1
-#endif
-
-#if !defined(LOG4CXX_HAS_STD_WCOUT)
-#define LOG4CXX_HAS_STD_WCOUT 1
-#endif
-
-#if !defined(LOG4CXX_HAS_STD_WLOCALE)
-#define LOG4CXX_HAS_STD_WLOCALE 1
-#endif
+//
+// Obsolete file
+//
#endif //_LOG4CXX_PORTABILITY_H
1.19 +0 -1 logging-log4cxx/include/log4cxx/propertyconfigurator.h
Index: propertyconfigurator.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/propertyconfigurator.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- propertyconfigurator.h 15 Feb 2005 23:55:58 -0000 1.18
+++ propertyconfigurator.h 4 May 2005 16:13:40 -0000 1.19
@@ -19,7 +19,6 @@
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
-#include <log4cxx/portability.h>
#include <log4cxx/logstring.h>
#include <log4cxx/spi/configurator.h>
#include <map>
1.1 logging-log4cxx/include/log4cxx/log4cxx.h
Index: log4cxx.h
===================================================================
/* Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LOG4CXX_LOG4CXX_H
#define LOG4CXX_LOG4CXX_H
/* GENERATED FILE WARNING! DO NOT EDIT log4cxx.h
*
* Edit log4cxx.h.in instead
*
*/
#define LOG4CXX_LOGCHAR_IS_UTF8 0
#if LOG4CXX_LOGCHAR_IS_UTF8
#define LOG4CXX_LOGCHAR_IS_WCHAR 0
#else
#define LOG4CXX_LOGCHAR_IS_WCHAR 1
#endif
#define LOG4CXX_HAS_WCHAR_T 1
#define LOG4CXX_EXPORT
typedef long long log4cxx_int64_t;
typedef log4cxx_int64_t log4cxx_time_t;
typedef int log4cxx_status_t;
#endif
1.1 logging-log4cxx/include/log4cxx/log4cxx.h.in
Index: log4cxx.h.in
===================================================================
/* Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LOG4CXX_LOG4CXX_H
#define LOG4CXX_LOG4CXX_H
/* GENERATED FILE WARNING! DO NOT EDIT log4cxx.h
*
* Edit log4cxx.h.in instead
*
*/
#define LOG4CXX_LOGCHAR_IS_UTF8 @LOGCHAR_IS_UTF8@
#if LOG4CXX_LOGCHAR_IS_UTF8
#define LOG4CXX_LOGCHAR_IS_WCHAR 0
#else
#define LOG4CXX_LOGCHAR_IS_WCHAR 1
#endif
#define LOG4CXX_HAS_WCHAR_T @HAS_WCHAR_T@
#define LOG4CXX_EXPORT
typedef long long log4cxx_int64_t;
typedef log4cxx_int64_t log4cxx_time_t;
typedef int log4cxx_status_t;
#endif
1.1 logging-log4cxx/include/log4cxx/log4cxx.hw
Index: log4cxx.hw
===================================================================
/* Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LOG4CXX_LOG4CXX_H
#define LOG4CXX_LOG4CXX_H
/* GENERATED FILE WARNING! DO NOT EDIT log4cxx.h
*
* Edit log4cxx.h.in instead
*
*/
#define LOG4CXX_LOGCHAR_IS_UTF8 0
#if LOG4CXX_LOGCHAR_IS_UTF8
#define LOG4CXX_LOGCHAR_IS_WCHAR 0
#else
#define LOG4CXX_LOGCHAR_IS_WCHAR 1
#endif
#define LOG4CXX_HAS_WCHAR_T 1
#if defined(_MSC_VER)
#if _MSC_VER >= 1200
typedef __int64 log4cxx_int64_t;
#else
typedef long long log4cxx_int64_t;
#endif
typedef log4cxx_int64_t log4cxx_time_t;
typedef int log4cxx_status_t;
#if defined(LOG4CXX_STATIC)
#define LOG4CXX_EXPORT
#else
#ifdef LOG4CXX
#define LOG4CXX_EXPORT __declspec(dllexport)
#else
#define LOG4CXX_EXPORT __declspec(dllimport)
#endif
#endif
#endif
1.19 +0 -1 logging-log4cxx/include/log4cxx/db/odbcappender.h
Index: odbcappender.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/db/odbcappender.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- odbcappender.h 15 Feb 2005 23:55:59 -0000 1.18
+++ odbcappender.h 4 May 2005 16:13:40 -0000 1.19
@@ -17,7 +17,6 @@
#ifndef _LOG4CXX_DB_ODBC_APPENDER_H
#define _LOG4CXX_DB_ODBC_APPENDER_H
-#include <log4cxx/portability.h>
#ifdef LOG4CXX_HAVE_ODBC
1.11 +0 -1 logging-log4cxx/include/log4cxx/helpers/aprinitializer.h
Index: aprinitializer.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/aprinitializer.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- aprinitializer.h 15 Feb 2005 23:55:59 -0000 1.10
+++ aprinitializer.h 4 May 2005 16:13:40 -0000 1.11
@@ -17,7 +17,6 @@
#ifndef _LOG4CXX_HELPERS_APRINITIALIZER_H
#define _LOG4CXX_HELPERS_APRINITIALIZER_H
-#include <log4cxx/portability.h>
#include <log4cxx/helpers/pool.h>
#include <apr_pools.h>
#include <apr_thread_proc.h>
1.3 +1 -1 logging-log4cxx/include/log4cxx/helpers/bytebuffer.h
Index: bytebuffer.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/bytebuffer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bytebuffer.h 28 Apr 2005 20:53:45 -0000 1.2
+++ bytebuffer.h 4 May 2005 16:13:40 -0000 1.3
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_BYTEBUFFER_H
#define _LOG4CXX_HELPERS_BYTEBUFFER_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
#include <stdio.h>
namespace log4cxx
1.16 +1 -1 logging-log4cxx/include/log4cxx/helpers/condition.h
Index: condition.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/condition.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- condition.h 15 Feb 2005 23:55:59 -0000 1.15
+++ condition.h 4 May 2005 16:13:40 -0000 1.16
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_CONDITION_H
#define _LOG4CXX_HELPERS_CONDITION_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
namespace log4cxx
1.11 +1 -1 logging-log4cxx/include/log4cxx/helpers/datetimedateformat.h
Index: datetimedateformat.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/datetimedateformat.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- datetimedateformat.h 15 Dec 2004 00:38:47 -0000 1.10
+++ datetimedateformat.h 4 May 2005 16:13:40 -0000 1.11
@@ -32,7 +32,7 @@
public:
DateTimeDateFormat()
: SimpleDateFormat(LOG4CXX_STR("dd MMM yyyy HH:mm:ss,SSS")) {}
- DateTimeDateFormat(const std::locale& locale)
+ DateTimeDateFormat(const std::locale* locale)
: SimpleDateFormat(LOG4CXX_STR("dd MMM yyyy HH:mm:ss,SSS"), locale) {}
};
} // namespace helpers
1.20 +1 -1 logging-log4cxx/include/log4cxx/helpers/exception.h
Index: exception.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/exception.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- exception.h 11 Mar 2005 06:34:49 -0000 1.19
+++ exception.h 4 May 2005 16:13:40 -0000 1.20
@@ -17,8 +17,8 @@
#ifndef _LOG4CXX_HELPERS_EXCEPTION_H
#define _LOG4CXX_HELPERS_EXCEPTION_H
-#include <log4cxx/portability.h>
#include <exception>
+#include <log4cxx/log4cxx.h>
#include <log4cxx/logstring.h>
namespace log4cxx
1.9 +1 -1 logging-log4cxx/include/log4cxx/helpers/formattinginfo.h
Index: formattinginfo.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/formattinginfo.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- formattinginfo.h 15 Dec 2004 00:38:47 -0000 1.8
+++ formattinginfo.h 4 May 2005 16:13:40 -0000 1.9
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPER_FORMATTING_INFO_H
#define _LOG4CXX_HELPER_FORMATTING_INFO_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
namespace log4cxx
{
1.14 +1 -1 logging-log4cxx/include/log4cxx/helpers/gnomexml.h
Index: gnomexml.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/gnomexml.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnomexml.h 12 Jan 2005 20:13:56 -0000 1.13
+++ gnomexml.h 4 May 2005 16:13:40 -0000 1.14
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_GNOMEXML_H
#define _LOG4CXX_HELPERS_GNOMEXML_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
#if !defined(_WIN32)
1.8 +0 -1 logging-log4cxx/include/log4cxx/helpers/locale.h
Index: locale.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/locale.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- locale.h 15 Dec 2004 00:38:47 -0000 1.7
+++ locale.h 4 May 2005 16:13:40 -0000 1.8
@@ -17,7 +17,6 @@
#ifndef _LOG4CXX_HELPERS_LOCALE_H
#define _LOG4CXX_HELPERS_LOCALE_H
-#include <log4cxx/portability.h>
#include <log4cxx/logstring.h>
namespace log4cxx
1.13 +0 -1 logging-log4cxx/include/log4cxx/helpers/loglog.h
Index: loglog.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/loglog.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- loglog.h 11 Mar 2005 06:34:49 -0000 1.12
+++ loglog.h 4 May 2005 16:13:40 -0000 1.13
@@ -19,7 +19,6 @@
#include <log4cxx/logstring.h>
#include <exception>
-#include <log4cxx/portability.h>
namespace log4cxx
{
1.15 +0 -2 logging-log4cxx/include/log4cxx/helpers/msxml.h
Index: msxml.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/msxml.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- msxml.h 12 Mar 2005 06:37:27 -0000 1.14
+++ msxml.h 4 May 2005 16:13:40 -0000 1.15
@@ -17,8 +17,6 @@
#ifndef _LOG4CXX_HELPERS_MSXML_H
#define _LOG4CXX_HELPERS_MSXML_H
-#include <log4cxx/portability.h>
-
#ifdef _WIN32
#include <log4cxx/helpers/xml.h>
1.16 +1 -1 logging-log4cxx/include/log4cxx/helpers/mutex.h
Index: mutex.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/mutex.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mutex.h 15 Feb 2005 23:55:59 -0000 1.15
+++ mutex.h 4 May 2005 16:13:40 -0000 1.16
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_MUTEX_H
#define _LOG4CXX_HELPERS_MUTEX_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
typedef void log4cxx_thread_mutex_t;
1.20 +0 -1 logging-log4cxx/include/log4cxx/helpers/objectimpl.h
Index: objectimpl.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/objectimpl.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- objectimpl.h 15 Feb 2005 23:55:59 -0000 1.19
+++ objectimpl.h 4 May 2005 16:13:40 -0000 1.20
@@ -17,7 +17,6 @@
#ifndef _LOG4CXX_HELPERS_OBJECT_IMPL_H
#define _LOG4CXX_HELPERS_OBJECT_IMPL_H
-#include <log4cxx/portability.h>
#include <log4cxx/helpers/object.h>
namespace log4cxx
1.12 +1 -1 logging-log4cxx/include/log4cxx/helpers/objectptr.h
Index: objectptr.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/objectptr.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- objectptr.h 15 Feb 2005 23:55:59 -0000 1.11
+++ objectptr.h 4 May 2005 16:13:40 -0000 1.12
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_OBJECT_PTR_H
#define _LOG4CXX_HELPERS_OBJECT_PTR_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
namespace log4cxx
{
1.8 +1 -1 logging-log4cxx/include/log4cxx/helpers/pool.h
Index: pool.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/pool.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pool.h 26 Dec 2004 07:31:52 -0000 1.7
+++ pool.h 4 May 2005 16:13:40 -0000 1.8
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_POOL_H
#define _LOG4CXX_HELPERS_POOL_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
#include <string.h>
typedef void log4cxx_pool_t;
1.7 +1 -1 logging-log4cxx/include/log4cxx/helpers/strictmath.h
Index: strictmath.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/strictmath.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- strictmath.h 15 Dec 2004 00:38:47 -0000 1.6
+++ strictmath.h 4 May 2005 16:13:40 -0000 1.7
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_STRICTMATH_H
#define _LOG4CXX_HELPERS_STRICTMATH_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
namespace log4cxx
{
1.20 +0 -1 logging-log4cxx/include/log4cxx/helpers/stringhelper.h
Index: stringhelper.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/stringhelper.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- stringhelper.h 1 Apr 2005 02:02:33 -0000 1.19
+++ stringhelper.h 4 May 2005 16:13:40 -0000 1.20
@@ -17,7 +17,6 @@
#ifndef _LOG4CXX_HELPERS_STRING_HELPER_H
#define _LOG4CXX_HELPERS_STRING_HELPER_H
-#include <log4cxx/portability.h>
#include <log4cxx/logstring.h>
#include <stdarg.h>
1.13 +0 -1 logging-log4cxx/include/log4cxx/helpers/system.h
Index: system.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/system.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- system.h 15 Dec 2004 00:38:47 -0000 1.12
+++ system.h 4 May 2005 16:13:40 -0000 1.13
@@ -17,7 +17,6 @@
#ifndef _LOG4CXX_HELPERS_SYSTEM_H
#define _LOG4CXX_HELPERS_SYSTEM_H
- #include <log4cxx/portability.h>
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/exception.h>
1.28 +1 -5 logging-log4cxx/include/log4cxx/helpers/thread.h
Index: thread.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/thread.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- thread.h 11 Apr 2005 04:36:34 -0000 1.27
+++ thread.h 4 May 2005 16:13:40 -0000 1.28
@@ -17,19 +17,15 @@
#ifndef _LOG4CXX_HELPERS_THREAD_H
#define _LOG4CXX_HELPERS_THREAD_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
#if !defined(LOG4CXX_THREAD_FUNC)
-#if defined(APR_THREAD_FUNC)
-#define LOG4CXX_THREAD_FUNC APR_THREAD_FUNC
-#else
#if defined(_WIN32)
#define LOG4CXX_THREAD_FUNC __stdcall
#else
#define LOG4CXX_THREAD_FUNC
#endif
#endif
-#endif
namespace log4cxx
1.11 +0 -1 logging-log4cxx/include/log4cxx/helpers/timezone.h
Index: timezone.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/timezone.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- timezone.h 15 Feb 2005 23:55:59 -0000 1.10
+++ timezone.h 4 May 2005 16:13:40 -0000 1.11
@@ -17,7 +17,6 @@
#ifndef _LOG4CXX_HELPERS_TIMEZONE_H
#define _LOG4CXX_HELPERS_TIMEZONE_H
-#include <log4cxx/portability.h>
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/helpers/objectptr.h>
1.11 +2 -5 logging-log4cxx/include/log4cxx/helpers/transcoder.h
Index: transcoder.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/transcoder.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- transcoder.h 12 Mar 2005 06:37:27 -0000 1.10
+++ transcoder.h 4 May 2005 16:13:40 -0000 1.11
@@ -18,9 +18,6 @@
#define _LOG4CXX_HELPERS_TRANSCODER_H
#include <log4cxx/logstring.h>
-#include <log4cxx/portability.h>
-#include <string.h>
-#include <wchar.h>
namespace log4cxx {
@@ -114,7 +111,7 @@
log4cxx::helpers::Transcoder::decode(src)
-#if defined(LOG4CXX_LOGCHAR_IS_WCHAR)
+#if LOG4CXX_LOGCHAR_IS_WCHAR
#define LOG4CXX_ENCODE_WCHAR(var, src) \
const std::wstring& var = src
@@ -128,7 +125,7 @@
#endif
-#if defined(LOG4CXX_LOGCHAR_IS_UTF8)
+#if LOG4CXX_LOGCHAR_IS_UTF8
#define LOG4CXX_ENCODE_WCHAR(var, src) \
std::wstring var; \
1.11 +0 -1 logging-log4cxx/include/log4cxx/helpers/transform.h
Index: transform.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/transform.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- transform.h 15 Dec 2004 00:38:47 -0000 1.10
+++ transform.h 4 May 2005 16:13:40 -0000 1.11
@@ -17,7 +17,6 @@
#ifndef _LOG4CXX_HELPERS_TRANSFORM_H
#define _LOG4CXX_HELPERS_TRANSFORM_H
-#include <log4cxx/portability.h>
#include <log4cxx/logstring.h>
namespace log4cxx
1.20 +2 -4 logging-log4cxx/include/log4cxx/net/smtpappender.h
Index: smtpappender.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/net/smtpappender.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- smtpappender.h 15 Feb 2005 23:56:00 -0000 1.19
+++ smtpappender.h 4 May 2005 16:13:41 -0000 1.20
@@ -17,9 +17,6 @@
#ifndef _LOG4CXX_NET_SMTP_H
#define _LOG4CXX_NET_SMTP_H
-#include <log4cxx/portability.h>
-
-#ifdef LOG4CXX_HAVE_SMTP
#include <log4cxx/appenderskeleton.h>
#include <log4cxx/helpers/cyclicbuffer.h>
@@ -67,6 +64,7 @@
LOG4CXX_CAST_ENTRY_CHAIN(AppenderSkeleton)
END_LOG4CXX_CAST_MAP()
+ SMTPAppender();
/**
The default constructor will instantiate the appender with a
spi::TriggeringEventEvaluator that will trigger on events with
@@ -260,6 +258,7 @@
LOG4CXX_CAST_ENTRY(spi::TriggeringEventEvaluator)
END_LOG4CXX_CAST_MAP()
+ DefaultEvaluator();
DefaultEvaluator(log4cxx::helpers::Pool& p);
/**
@@ -273,5 +272,4 @@
} // namespace net
} // namespace log4cxx
-#endif // LOG4CXX_HAVE_SMTP
#endif // _LOG4CXX_NET_SMTP_H
1.1 logging-log4cxx/include/log4cxx/private/Makefile.am
Index: Makefile.am
===================================================================
privateincdir = $(includedir)/log4cxx/private
privateinc_HEADERS= $(top_srcdir)/include/log4cxx/private/*.h log4cxx.h
DISTCLEANFILES = log4cxx.h
1.1 logging-log4cxx/include/log4cxx/private/log4cxx.h
Index: log4cxx.h
===================================================================
/* Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LOG4CXX_PRIVATE_LOG4CXX_H
#define LOG4CXX_PRIVATE_LOG4CXX_H
/* GENERATED FILE WARNING! DO NOT EDIT log4cxx.h
*
* You must modify log4cxx.h.in instead.
*
*/
#include <log4cxx/log4cxx.h>
#if !defined(LOG4CXX) && !defined(LOG4CXX_TEST)
#error "log4cxx/private/log4cxx.h should only be used within log4cxx implementation or tests"
#endif
#define LOG4CXX_HAS_STD_LOCALE 1
#define LOG4CXX_HAS_STD_WLOCALE 1
#define LOG4CXX_RETURN_AFTER_THROW 0
#define LOG4CXX_HAS_STD_WCOUT 1
#define LOG4CXX_HAS_STD_WLOCALE 1
typedef long long log4cxx_int64_t;
typedef log4cxx_int64_t log4cxx_time_t;
typedef int log4cxx_status_t;
//
// unsigned int same size as void*
//
typedef unsigned int log4cxx_intptr_t;
#define LOG4CXX_EXPORT
//
// Capabilities should be checked in client code by
// attempting creation of the corresponding appender
#define LOG4CXX_HAVE_XML 1
#define LOG4CXX_HAVE_SMTP 0
#define LOG4CXX_HAVE_SYSLOG 1
#endif
1.1 logging-log4cxx/include/log4cxx/private/log4cxx.h.in
Index: log4cxx.h.in
===================================================================
/* Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LOG4CXX_PRIVATE_LOG4CXX_H
#define LOG4CXX_PRIVATE_LOG4CXX_H
/* GENERATED FILE WARNING! DO NOT EDIT log4cxx.h
*
* You must modify log4cxx.h.in instead.
*
*/
#include <log4cxx/log4cxx.h>
#if !defined(LOG4CXX) && !defined(LOG4CXX_TEST)
#error "log4cxx/private/log4cxx.h should only be used within log4cxx implementation or tests"
#endif
#define LOG4CXX_HAS_STD_LOCALE 0
#define LOG4CXX_HAS_STD_WLOCALE 1
#define LOG4CXX_RETURN_AFTER_THROW 0
#define LOG4CXX_HAS_STD_WCOUT 1
#define LOG4CXX_HAS_STD_WLOCALE 1
typedef long long log4cxx_int64_t;
typedef log4cxx_int64_t log4cxx_time_t;
typedef int log4cxx_status_t;
//
// unsigned int same size as void*
//
typedef unsigned int log4cxx_intptr_t;
#define LOG4CXX_EXPORT
//
// Capabilities should be checked in client code by
// attempting creation of the corresponding appender
#define LOG4CXX_HAVE_XML 1
#define LOG4CXX_HAVE_SMTP 0
#define LOG4CXX_HAVE_SYSLOG 1
#endif
1.1 logging-log4cxx/include/log4cxx/private/log4cxx.hw
Index: log4cxx.hw
===================================================================
/* Copyright 2003-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef LOG4CXX_PRIVATE_H
#define LOG4CXX_PRIVATE_H
/* GENERATED FILE WARNING! DO NOT EDIT log4cxx.h
*
* You must modify log4cxx.hw instead.
*
*
* This is the Win32 specific version of log4cxx.h.
*/
#include <log4cxx/log4cxx.h>
#if !defined(LOG4CXX)
#error "log4cxx/private/log4cxx.h should only be used within log4cxx implementation"
#endif
#if defined(_MSC_VER)
#define HAVE_XML 1
#define LOG4CXX_HAVE_XML 1
#endif
#if !defined(__BORLANDC__)
#define LOG4CXX_RETURN_AFTER_THROW 1
#else
#define LOG4CXX_RETURN_AFTER_THROW 0
#endif
#define LOG4CXX_HAS_STD_LOCALE 1
#if defined(__GNUC__)
#define LOG4CXX_HAS_STD_WLOCALE 0
#else
#define LOG4CXX_HAS_STD_WLOCALE 1
#endif
#define LOG4CXX_HAS_STD_WCOUT 1
#define LOG4CXX_HAS_STD_WLOCALE 1
#if defined(LOG4CXX_STATIC)
#define LOG4CXX_EXPORT
#else
#if defined(_WIN32)
#ifdef LOG4CXX
#define LOG4CXX_EXPORT __declspec(dllexport)
#else
#define LOG4CXX_EXPORT __declspec(dllimport)
#endif
#else
#define LOG4CXX_EXPORT
#endif
#endif
#if defined(_MSC_VER)
#pragma warning(disable : 4250 4251 4786 4290)
#if defined(_MSC_VER) && _MSC_VER >= 1200
typedef __int64 log4cxx_int64_t;
#else
typedef long long log4cxx_int64_t;
#endif
#else
typedef long long log4cxx_int64_t;
#endif
#if defined(_MSC_VER)
#define LOG4CXX_HAVE_XML 1
#endif
#define LOG4CXX_HAVE_SYSLOG 0
#endif
1.3 +0 -1 logging-log4cxx/include/log4cxx/rolling/sizebasedtriggeringpolicy.h
Index: sizebasedtriggeringpolicy.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/rolling/sizebasedtriggeringpolicy.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sizebasedtriggeringpolicy.h 7 Jan 2005 05:42:04 -0000 1.2
+++ sizebasedtriggeringpolicy.h 4 May 2005 16:13:41 -0000 1.3
@@ -17,7 +17,6 @@
#if !defined(_LOG4CXX_ROLLING_SIZE_BASED_TRIGGERING_POLICY_H)
#define _LOG4CXX_ROLLING_SIZE_BASED_TRIGGERING_POLICY_H
-#include <log4cxx/portability.h>
#include <log4cxx/rolling/triggeringpolicy.h>
namespace log4cxx {
1.14 +1 -1 logging-log4cxx/include/log4cxx/spi/location/locationinfo.h
Index: locationinfo.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/spi/location/locationinfo.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- locationinfo.h 12 Mar 2005 21:00:37 -0000 1.13
+++ locationinfo.h 4 May 2005 16:13:41 -0000 1.14
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_SPI_LOCATION_LOCATIONINFO_H
#define _LOG4CXX_SPI_LOCATION_LOCATIONINFO_H
-#include <log4cxx/portability.h>
+#include <log4cxx/log4cxx.h>
#include <string>
namespace log4cxx
1.27 +13 -18 logging-log4cxx/include/log4cxx/xml/domconfigurator.h
Index: domconfigurator.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/xml/domconfigurator.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- domconfigurator.h 11 Mar 2005 06:34:49 -0000 1.26
+++ domconfigurator.h 4 May 2005 16:13:41 -0000 1.27
@@ -17,10 +17,6 @@
#ifndef _LOG4CXX_XML_DOM_CONFIGURATOR_H
#define _LOG4CXX_XML_DOM_CONFIGURATOR_H
-#include <log4cxx/portability.h>
-
-#ifdef LOG4CXX_HAVE_XML
-
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
@@ -76,21 +72,21 @@
std::map<LogString, AppenderPtr> map;
};
-/**
-Use this class to initialize the log4cxx environment using a DOM tree.
+ /**
+ Use this class to initialize the log4cxx environment using a DOM tree.
-<p>Sometimes it is useful to see how log4cxx is reading configuration
-files. You can enable log4cxx internal logging by setting the
-<code>debug</code> attribute in the
-<code>log4cxx</code> element. As in
-<pre>
- <log4j:configuration <b>debug="true"</b> xmlns:log4j="http://jakarta.apache.org/log4j/">
- ...
- </log4j:configuration>
-</pre>
+ <p>Sometimes it is useful to see how log4cxx is reading configuration
+ files. You can enable log4cxx internal logging by setting the
+ <code>debug</code> attribute in the
+ <code>log4cxx</code> element. As in
+ <pre>
+ <log4j:configuration <b>debug="true"</b> xmlns:log4j="http://jakarta.apache.org/log4j/">
+ ...
+ </log4j:configuration>
+ </pre>
-<p>There are sample XML files included in the package.
-*/
+ <p>There are sample XML files included in the package.
+ */
class LOG4CXX_EXPORT DOMConfigurator :
virtual public spi::Configurator,
virtual public helpers::ObjectImpl
@@ -239,5 +235,4 @@
} // namespace xml
} // namespace log4cxx
-#endif // LOG4CXX_HAVE_XML
#endif // _LOG4CXX_XML_DOM_CONFIGURATOR_H
1.20 +2 -1 logging-log4cxx/src/class.cpp
Index: class.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/class.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- class.cpp 1 Mar 2005 23:30:44 -0000 1.19
+++ class.cpp 4 May 2005 16:13:41 -0000 1.20
@@ -19,6 +19,7 @@
#include <log4cxx/helpers/object.h>
#include <map>
#include <log4cxx/helpers/stringhelper.h>
+#include <log4cxx/private/log4cxx.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -40,7 +41,7 @@
ObjectPtr Class::newInstance() const
{
throw InstantiationException("Cannot create new instances of Class.");
-#if defined(LOG4CXX_RETURN_AFTER_THROW)
+#if LOG4CXX_RETURN_AFTER_THROW
return 0;
#endif
}
1.16 +1 -2 logging-log4cxx/src/datagramsocket.cpp
Index: datagramsocket.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/datagramsocket.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- datagramsocket.cpp 15 Feb 2005 23:56:01 -0000 1.15
+++ datagramsocket.cpp 4 May 2005 16:13:41 -0000 1.16
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
-#if defined(WIN32) || defined(_WIN32)
+#if defined(_WIN32)
#include <windows.h>
#include <winsock.h>
#else
1.24 +1 -2 logging-log4cxx/src/domconfigurator.cpp
Index: domconfigurator.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/domconfigurator.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- domconfigurator.cpp 11 Mar 2005 06:34:49 -0000 1.23
+++ domconfigurator.cpp 4 May 2005 16:13:41 -0000 1.24
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
-
+#include <log4cxx/private/log4cxx.h>
#ifdef LOG4CXX_HAVE_XML
#if defined(_WIN32)
1.7 +0 -1 logging-log4cxx/src/gnomexml.cpp
Index: gnomexml.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/gnomexml.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnomexml.cpp 12 Jan 2005 05:12:16 -0000 1.6
+++ gnomexml.cpp 4 May 2005 16:13:41 -0000 1.7
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
#if !defined(_WIN32)
1.29 +2 -1 logging-log4cxx/src/logger.cpp
Index: logger.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/logger.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- logger.cpp 11 Mar 2005 06:34:49 -0000 1.28
+++ logger.cpp 4 May 2005 16:13:41 -0000 1.29
@@ -29,6 +29,7 @@
#include <log4cxx/helpers/appenderattachableimpl.h>
#include <log4cxx/helpers/exception.h>
#include <log4cxx/helpers/aprinitializer.h>
+#include <log4cxx/private/log4cxx.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -181,7 +182,7 @@
}
throw NullPointerException("No level specified for logger or ancestors.");
-#if defined(LOG4CXX_RETURN_AFTER_THROW)
+#if LOG4CXX_RETURN_AFTER_THROW
return this->level;
#endif
}
1.14 +2 -1 logging-log4cxx/src/loglog.cpp
Index: loglog.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/loglog.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- loglog.cpp 29 Apr 2005 00:36:13 -0000 1.13
+++ loglog.cpp 4 May 2005 16:13:41 -0000 1.14
@@ -17,6 +17,7 @@
#include <log4cxx/helpers/loglog.h>
#include <log4cxx/helpers/transcoder.h>
#include <iostream>
+#include <log4cxx/private/log4cxx.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -87,7 +88,7 @@
std::wcerr << "log4cxx: " << msg << std::endl;
#else
LOG4CXX_ENCODE_CHAR(encoded, msg);
- std::err << "log4cxx: " << encoded << std::endl;
+ std::cerr << "log4cxx: " << encoded << std::endl;
#endif
}
#endif
1.15 +0 -1 logging-log4cxx/src/msxml.cpp
Index: msxml.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/msxml.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- msxml.cpp 12 Mar 2005 06:37:27 -0000 1.14
+++ msxml.cpp 4 May 2005 16:13:41 -0000 1.15
@@ -15,7 +15,6 @@
*/
#define _WIN32_DCOM
-#include <log4cxx/portability.h>
#if LOG4CXX_HAVE_XML
1.15 +0 -1 logging-log4cxx/src/odbcappender.cpp
Index: odbcappender.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/odbcappender.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- odbcappender.cpp 15 Feb 2005 23:56:01 -0000 1.14
+++ odbcappender.cpp 4 May 2005 16:13:41 -0000 1.15
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
#if defined(WIN32) || defined(_WIN32)
#include <windows.h>
1.9 +2 -1 logging-log4cxx/src/propertyresourcebundle.cpp
Index: propertyresourcebundle.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/propertyresourcebundle.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- propertyresourcebundle.cpp 1 Mar 2005 23:30:44 -0000 1.8
+++ propertyresourcebundle.cpp 4 May 2005 16:13:41 -0000 1.9
@@ -16,6 +16,7 @@
#include <log4cxx/helpers/propertyresourcebundle.h>
#include <log4cxx/helpers/exception.h>
+#include <log4cxx/private/log4cxx.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -45,7 +46,7 @@
while (resourceBundle != 0);
throw MissingResourceException(key);
-#if defined(LOG4CXX_RETURN_AFTER_THROW)
+#if LOG4CXX_RETURN_AFTER_THROW
return resource;
#endif
}
1.10 +5 -7 logging-log4cxx/src/serversocket.cpp
Index: serversocket.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/serversocket.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- serversocket.cpp 15 Feb 2005 23:56:01 -0000 1.9
+++ serversocket.cpp 4 May 2005 16:13:41 -0000 1.10
@@ -1,22 +1,20 @@
/*
* Copyright 2003,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-#include <log4cxx/portability.h>
-#if defined(WIN32) || defined(_WIN32)
+#if defined(_WIN32)
#include <windows.h>
#include <winsock.h>
#else
@@ -30,7 +28,7 @@
#include <assert.h>
using namespace log4cxx::helpers;
-
+
/** Creates a server socket on a specified port.
*/
ServerSocket::ServerSocket(int port)
1.11 +2 -3 logging-log4cxx/src/smtpappender.cpp
Index: smtpappender.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/smtpappender.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- smtpappender.cpp 15 Feb 2005 23:56:01 -0000 1.10
+++ smtpappender.cpp 4 May 2005 16:13:41 -0000 1.11
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
-
-#ifdef LOG4CXX_HAVE_SMTP
+#include <log4cxx/private/log4cxx.h>
+#if LOG4CXX_HAVE_SMTP
#include <log4cxx/net/smtpappender.h>
#include <log4cxx/level.h>
1.14 +1 -3 logging-log4cxx/src/socket.cpp
Index: socket.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/socket.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- socket.cpp 15 Feb 2005 23:56:01 -0000 1.13
+++ socket.cpp 4 May 2005 16:13:41 -0000 1.14
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
-
-#if defined(WIN32) || defined(_WIN32)
+#if defined(_WIN32)
#include <windows.h>
#include <winsock.h>
#else
1.21 +3 -3 logging-log4cxx/src/stringhelper.cpp
Index: stringhelper.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/stringhelper.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- stringhelper.cpp 1 Apr 2005 02:02:33 -0000 1.20
+++ stringhelper.cpp 4 May 2005 16:13:41 -0000 1.21
@@ -22,7 +22,7 @@
#include <locale>
#include <apr_strings.h>
#include <log4cxx/helpers/pool.h>
-
+#include <log4cxx/private/log4cxx.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -223,7 +223,7 @@
#if LOG4CXX_HAS_WCHAR_T
void StringHelper::toString(int n, Pool& pool, std::wstring& str) {
char* fmt = apr_itoa((apr_pool_t*) pool.getAPRPool(), n);
-#if defined(LOG4CXX_LOGCHAR_IS_UTF8)
+#if LOG4CXX_LOGCHAR_IS_UTF8
LogString ls;
log4cxx::helpers::Transcoder::decode(fmt, strlen(fmt), ls);
log4cxx::helpers::Transcoder::encode(ls, str);
@@ -284,7 +284,7 @@
LogString StringHelper::formatHex(const void* ptr) {
const logchar* hexdigits = LOG4CXX_STR("0123456789ABCDEF");
- apr_uint64_t iptr = (apr_uint64_t) ptr;
+ log4cxx_intptr_t iptr = (log4cxx_intptr_t) ptr;
int width = sizeof(ptr)*2 + 2;
LogString s(width, LOG4CXX_STR('x'));
s[0] = LOG4CXX_STR('0');
1.13 +2 -1 logging-log4cxx/src/stringtokenizer.cpp
Index: stringtokenizer.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/stringtokenizer.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- stringtokenizer.cpp 1 Mar 2005 23:30:44 -0000 1.12
+++ stringtokenizer.cpp 4 May 2005 16:13:41 -0000 1.13
@@ -16,6 +16,7 @@
#include <log4cxx/helpers/stringtokenizer.h>
#include <log4cxx/helpers/exception.h>
+#include <log4cxx/private/log4cxx.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -48,7 +49,7 @@
}
}
throw NoSuchElementException();
-#if defined(LOG4CXX_RETURN_AFTER_THROW)
+#if LOG4CXX_RETURN_AFTER_THROW
return LogString();
#endif
}
1.13 +0 -1 logging-log4cxx/src/threadspecificdata.cpp
Index: threadspecificdata.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/threadspecificdata.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- threadspecificdata.cpp 11 Apr 2005 04:36:35 -0000 1.12
+++ threadspecificdata.cpp 4 May 2005 16:13:41 -0000 1.13
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
#include <log4cxx/helpers/threadspecificdata.h>
#include <log4cxx/helpers/aprinitializer.h>
#include <log4cxx/helpers/exception.h>
1.2 +0 -2 logging-log4cxx/tests/src/encodingtest.cpp
Index: encodingtest.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/encodingtest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- encodingtest.cpp 1 Apr 2005 02:02:34 -0000 1.1
+++ encodingtest.cpp 4 May 2005 16:13:41 -0000 1.2
@@ -15,8 +15,6 @@
*/
-#include <log4cxx/portability.h>
-
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
1.17 +3 -2 logging-log4cxx/tests/src/main.cpp
Index: main.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/main.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- main.cpp 11 Mar 2005 06:34:49 -0000 1.16
+++ main.cpp 4 May 2005 16:13:41 -0000 1.17
@@ -36,11 +36,12 @@
#include <stdexcept>
#include <log4cxx/basicconfigurator.h>
+#include <log4cxx/log4cxx.h>
extern CPPUNIT_NS::Test* createTestCase1();
extern CPPUNIT_NS::Test* createTestCase3();
-#if defined(LOG4CXX_HAVE_XML)
+#if LOG4CXX_HAVE_XML
extern CPPUNIT_NS::Test* createTestCase2();
extern CPPUNIT_NS::Test* createTestCase4();
#endif
@@ -87,7 +88,7 @@
case '3':
runner.addTest(createTestCase3());
break;
-#if defined(LOG4CXX_HAVE_XML)
+#if LOG4CXX_HAVE_XML
case '2':
runner.addTest(createTestCase2());
break;
1.11 +2 -1 logging-log4cxx/tests/src/customlogger/xloggertestcase.cpp
Index: xloggertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/customlogger/xloggertestcase.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xloggertestcase.cpp 11 Mar 2005 06:34:50 -0000 1.10
+++ xloggertestcase.cpp 4 May 2005 16:13:42 -0000 1.11
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
+#define LOG4CXX_TEST 1
+#include <log4cxx/private/log4cxx.h>
#ifdef LOG4CXX_HAVE_XML
1.3 +3 -0 logging-log4cxx/tests/src/db/odbcappendertestcase.cpp
Index: odbcappendertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/db/odbcappendertestcase.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- odbcappendertestcase.cpp 15 Feb 2005 23:56:04 -0000 1.2
+++ odbcappendertestcase.cpp 4 May 2005 16:13:42 -0000 1.3
@@ -19,6 +19,9 @@
#include <log4cxx/db/odbcappender.h>
#include "../appenderskeletontestcase.h"
+#define LOG4CXX_TEST 1
+#include <log4cxx/private/log4cxx.h>
+
#ifdef LOG4CXX_HAVE_ODBC
using namespace log4cxx;
1.10 +9 -8 logging-log4cxx/tests/src/defaultinit/testcase2.cpp
Index: testcase2.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/defaultinit/testcase2.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- testcase2.cpp 15 Feb 2005 23:56:04 -0000 1.9
+++ testcase2.cpp 4 May 2005 16:13:42 -0000 1.10
@@ -1,20 +1,21 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-#include <log4cxx/portability.h>
+
+#define LOG4CXX_TEST 1
+#include <log4cxx/private/log4cxx.h>
#ifdef LOG4CXX_HAVE_XML
@@ -32,7 +33,7 @@
CPPUNIT_TEST_SUITE(TestCase2);
CPPUNIT_TEST(xmlTest);
CPPUNIT_TEST_SUITE_END();
-
+
public:
void setUp()
{
@@ -42,13 +43,13 @@
{
LogManager::shutdown();
}
-
+
void xmlTest()
{
LoggerPtr root = Logger::getRootLogger();
bool rootIsConfigured = !root->getAllAppenders().empty();
CPPUNIT_ASSERT(rootIsConfigured);
-
+
AppenderList list = root->getAllAppenders();
AppenderPtr appender = list.front();
CPPUNIT_ASSERT_EQUAL((LogString) LOG4CXX_STR("D1"), appender->getName());
1.10 +8 -7 logging-log4cxx/tests/src/defaultinit/testcase4.cpp
Index: testcase4.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/defaultinit/testcase4.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- testcase4.cpp 15 Feb 2005 23:56:04 -0000 1.9
+++ testcase4.cpp 4 May 2005 16:13:42 -0000 1.10
@@ -1,12 +1,12 @@
/*
* Copyright 2003-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
+#define LOG4CXX_TEST 1
+#include <log4cxx/private/log4cxx.h>
#ifdef LOG4CXX_HAVE_XML
@@ -32,7 +33,7 @@
CPPUNIT_TEST_SUITE(TestCase4);
CPPUNIT_TEST(combinedTest);
CPPUNIT_TEST_SUITE_END();
-
+
public:
void setUp()
{
@@ -42,13 +43,13 @@
{
LogManager::shutdown();
}
-
+
void combinedTest()
{
LoggerPtr root = Logger::getRootLogger();
bool rootIsConfigured = !root->getAllAppenders().empty();
CPPUNIT_ASSERT(rootIsConfigured);
-
+
AppenderList list = root->getAllAppenders();
CPPUNIT_ASSERT_EQUAL((size_t) 1, list.size());
AppenderPtr appender = list.front();
1.3 +4 -1 logging-log4cxx/tests/src/net/smtpappendertestcase.cpp
Index: smtpappendertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/net/smtpappendertestcase.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smtpappendertestcase.cpp 15 Feb 2005 23:56:04 -0000 1.2
+++ smtpappendertestcase.cpp 4 May 2005 16:13:42 -0000 1.3
@@ -20,7 +20,10 @@
#include <log4cxx/net/smtpappender.h>
#include "../appenderskeletontestcase.h"
-#ifdef LOG4CXX_HAVE_SMTP
+#define LOG4CXX_TEST 1
+#include <log4cxx/private/log4cxx.h>
+
+#if LOG4CXX_HAVE_SMTP
using namespace log4cxx;
using namespace log4cxx::helpers;
1.11 +2 -1 logging-log4cxx/tests/src/varia/errorhandlertestcase.cpp
Index: errorhandlertestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/varia/errorhandlertestcase.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- errorhandlertestcase.cpp 11 Mar 2005 06:34:50 -0000 1.10
+++ errorhandlertestcase.cpp 4 May 2005 16:13:42 -0000 1.11
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
+#define LOG4CXX_TEST 1
+#include <log4cxx/private/log4cxx.h>
#ifdef LOG4CXX_HAVE_XML
1.9 +3 -1 logging-log4cxx/tests/src/xml/customleveltestcase.cpp
Index: customleveltestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/xml/customleveltestcase.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- customleveltestcase.cpp 11 Mar 2005 06:34:50 -0000 1.8
+++ customleveltestcase.cpp 4 May 2005 16:13:42 -0000 1.9
@@ -14,7 +14,9 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
+#define LOG4CXX_TEST 1
+#include <log4cxx/private/log4cxx.h>
+
#ifdef LOG4CXX_HAVE_XML
1.15 +0 -2 logging-log4cxx/tests/src/xml/domtestcase.cpp
Index: domtestcase.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/xml/domtestcase.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- domtestcase.cpp 11 Mar 2005 06:34:50 -0000 1.14
+++ domtestcase.cpp 4 May 2005 16:13:42 -0000 1.15
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-#include <log4cxx/portability.h>
-
#ifdef HAVE_XML
#include <cppunit/TestFixture.h>