carnold 2005/02/12 21:55:02
Modified: . aprutil-build.xml build.xml
examples delayedloop.cpp
include/log4cxx logger.h portability.h stream.h
include/log4cxx/helpers cacheddateformat.h
simpledateformat.h
include/log4cxx/spi loggingevent.h rootcategory.h
include/log4cxx/spi/location locationinfo.h
performance main.cpp
simplesocketserver simplesocketserver.cpp
src cacheddateformat.cpp formattinginfo.cpp
htmllayout.cpp locationinfo.cpp logger.cpp
loggingevent.cpp msxml.cpp optionconverter.cpp
patternparser.cpp rootcategory.cpp system.cpp
xmllayout.cpp
tests/src main.cpp shortsocketserver.cpp
tests/src/customlogger xlogger.cpp xlogger.h
xloggertestcase.cpp
tests/src/defaultinit testcase2.cpp testcase4.cpp
tests/src/helpers cyclicbuffertestcase.cpp
optionconvertertestcase.cpp
tests/src/varia errorhandlertestcase.cpp
tests/src/xml customleveltestcase.cpp
Added: . apr-1.1.0.patch
Log:
LOGCXX-37: Borland C++ fixes
Revision Changes Path
1.6 +6 -2 logging-log4cxx/aprutil-build.xml
Index: aprutil-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/aprutil-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aprutil-build.xml 10 Feb 2005 19:36:03 -0000 1.5
+++ aprutil-build.xml 13 Feb 2005 05:55:00 -0000 1.6
@@ -169,7 +169,8 @@
subsystem="console"
multithreaded="true"
outtype="${aprutil.lib.type}"
- objdir="${aprutil.lib.dir}/aprutil_obj"
+ objdir="${aprutil.lib.dir}/aprutil_obj"
+ warnings="none"
debug="${debug}">
<fileset dir="${base.dir}" includes="**/*.c"
excludes="test/*.c ldap/*.c xml/expat/lib/*"/>
@@ -194,7 +195,10 @@
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset dir="${apriconv.lib.dir}" libs="apriconv${lib-suffix}"/>
- <libset libs="cw32mt" if="is-bcc"/>
+ <libset libs="cw32mt" if="is-bcc"/>
+ <defineset if="is-bcc">
+ <define name="EILSEQ" value="50"/>
+ </defineset>
</cc>
</target>
1.41 +18 -5 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- build.xml 10 Feb 2005 19:33:25 -0000 1.40
+++ build.xml 13 Feb 2005 05:55:00 -0000 1.41
@@ -115,7 +115,13 @@
<property name="lib.extension" value=".lib"/>
<property name="project.type" value="msvc6"/>
<property name="project.dir" value="msvc"/>
- <property name="compiler" value="msvc"/>
+ <property name="compiler" value="msvc"/>
+ <condition property="is-bcc" value="true">
+ <or>
+ <equals arg1="${compiler}" arg2="bcc"/>
+ </or>
+ </condition>
+
</target>
<target name="mac-init" depends="os-detect" if="is-mac">
@@ -313,8 +319,7 @@
<untar src="${lib.dir}/${module}-${module.version}.tar.gz"
dest="${lib.dir}" compression="gzip"/>
<chmod file="${lib.dir}/${module}-${module.version}/configure"
- perm="u+x"/>
-
+ perm="u+x"/>
</target>
<target name="get-apr-src" unless="apr-src-available">
@@ -328,7 +333,10 @@
<antcall target="untar-apr-module">
<param name="module" value="apr"/>
<param name="module.version" value="${apr.version}"/>
- </antcall>
+ </antcall>
+ <patch patchfile="${base.dir}/apr-${apr.version}.patch"
+ dir="${lib.dir}/apr-${apr.version}"
+ strip="0"/>
</target>
<target name="build-apr" depends="init" unless="apr-available">
@@ -551,7 +559,8 @@
<defineset define="APU_DECLARE_STATIC" if="aprutil-static"/>
<defineset define="WIN32" if="is-windows"/>
<libset libs="advapi32 odbc32 ws2_32" if="is-windows"/>
- <libset libs="stdc++" if="is-gcc"/>
+ <libset libs="stdc++" if="is-gcc"/>
+ <libset libs="cw32mt" if="is-bcc"/>
<libset libs="xml2" if="is-unix"/>
<libset libs="${apr.lib.name}${lib-suffix}" dir="${apr.lib.dir}"
if="apr.lib.dir"/>
<libset libs="${apr.lib.name}${lib-suffix}" unless="apr.lib.dir"/>
@@ -601,6 +610,7 @@
unless="apriconv.lib.dir"/>
<libset libs="${extra.libs}" if="extra.libs"/>
<libset libs="stdc++" if="is-gcc"/>
+ <libset libs="cw32mt" if="is-bcc"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
@@ -701,6 +711,7 @@
<libset libs="${apriconv.lib.name}${lib-suffix}"
unless="apriconv.lib.dir"/>
<libset libs="stdc++" if="is-gcc"/>
+ <libset libs="cw32mt" if="is-bcc"/>
<libset libs="${extra.libs}" if="extra.libs"/>
<project outfile="${project.dir}/shortsocketserver"
type="${project.type}" if="project.if"/>
</cc>
@@ -743,6 +754,7 @@
<libset libs="${cppunit.lib.name}${lib-suffix}"
dir="${cppunit.lib.dir}" if="cppunit.lib.dir"/>
<libset libs="${cppunit.lib.name}${lib-suffix}"
unless="cppunit.lib.dir"/>
<libset libs="stdc++" if="is-gcc"/>
+ <libset libs="cw32mt" if="is-bcc"/>
<syslibset libs="Ws2_32 ws2 advapi32" if="is-windows"/>
<project outfile="${project.dir}/log4cxx-test"
type="${project.type}" if="project.if"/>
@@ -791,6 +803,7 @@
<defineset define="LOG4CXX"/>
<libset libs="advapi32 odbc32 ws2_32" if="is-windows"/>
<libset libs="xml2" if="is-unix"/>
+ <libset libs="cw32mt" if="is-bcc"/>
<project outfile="${projects.dir}/log4cxx-standalone-test"
type="${project.type}" if="project.if"/>
1.1 logging-log4cxx/apr-1.1.0.patch
Index: apr-1.1.0.patch
===================================================================
Index: include/arch/win32/apr_private.h
===================================================================
--- include/arch/win32/apr_private.h (revision 153549)
+++ include/arch/win32/apr_private.h (working copy)
@@ -19,6 +19,9 @@
* This is the windows specific autoconf-like config file
* which unix would create at build time.
*/
+#if defined(_WIN32) && !defined(WIN32)
+#define WIN32 1
+#endif
#ifdef WIN32
@@ -82,37 +85,7 @@
#define HAVE_STRSTR 1
#define HAVE_MEMCHR 1
-#define SIGHUP 1
-/* 2 is used for SIGINT on windows */
-#define SIGQUIT 3
-/* 4 is used for SIGILL on windows */
-#define SIGTRAP 5
-#define SIGIOT 6
-#define SIGBUS 7
-/* 8 is used for SIGFPE on windows */
#define SIGKILL 9
-#define SIGUSR1 10
-/* 11 is used for SIGSEGV on windows */
-#define SIGUSR2 12
-#define SIGPIPE 13
-#define SIGALRM 14
-/* 15 is used for SIGTERM on windows */
-#define SIGSTKFLT 16
-#define SIGCHLD 17
-#define SIGCONT 18
-#define SIGSTOP 19
-#define SIGTSTP 20
-/* 21 is used for SIGBREAK on windows */
-/* 22 is used for SIGABRT on windows */
-#define SIGTTIN 23
-#define SIGTTOU 24
-#define SIGURG 25
-#define SIGXCPU 26
-#define SIGXFSZ 27
-#define SIGVTALRM 28
-#define SIGPROF 29
-#define SIGWINCH 30
-#define SIGIO 31
#define __attribute__(__x)
@@ -162,6 +135,13 @@
/* used to check for DWORD overflow in 64bit compiles */
#define APR_DWORD_MAX 0xFFFFFFFFUL
+//
+// allocate memory like VC's _malloc_dbg or _realloc_dbg
+// (or just call malloc and realloc if necessary)
+void* apr_malloc_dbg(size_t size, const char* filename, int linenumber);
+void* apr_realloc_dbg(void* userData, size_t newSize, const char* filename,
int linenumber);
+
+
/*
* Include common private declarations.
*/
Index: include/apr.hw
===================================================================
--- include/apr.hw (revision 153549)
+++ include/apr.hw (working copy)
@@ -35,6 +35,7 @@
* for Win32 or Netware by those build environments, respectively.
*/
+
#if defined(WIN32) || defined(DOXYGEN)
/* Ignore most warnings (back down to /W3) for poorly constructed headers
@@ -88,7 +89,9 @@
#ifndef _WIN32_WCE
#include <winsock2.h>
#include <mswsock.h>
+#if defined(_MSC_VER)
#include <ws2tcpip.h>
+#endif
#else
#include <winsock.h>
#endif
@@ -349,8 +352,10 @@
* based on some APR_HAVE_PID/GID/UID?
*/
typedef int pid_t;
+#if !defined(__BORLANDC__)
typedef int uid_t;
typedef int gid_t;
+#endif
/* Mechanisms to properly type numeric literals */
Index: misc/win32/apr_app.c
===================================================================
--- misc/win32/apr_app.c (revision 153549)
+++ misc/win32/apr_app.c (working copy)
@@ -35,7 +35,6 @@
#include "apr_general.h"
#include "ShellAPI.h"
-#include "crtdbg.h"
#include "wchar.h"
#include "apr_arch_file_io.h"
#include "assert.h"
@@ -57,8 +56,8 @@
dupenv = apr_wastrtoastr(&env, wenv, -1);
- _environ = _malloc_dbg((dupenv + 1) * sizeof (char *),
- _CRT_BLOCK, __FILE__, __LINE__ );
+ _environ = apr_malloc_dbg((dupenv + 1) * sizeof (char *),
+ __FILE__, __LINE__ );
memcpy(_environ, env, (dupenv + 1) * sizeof (char *));
/* MSVCRT will attempt to maintain the wide environment calls
Index: misc/win32/misc.c
===================================================================
--- misc/win32/misc.c (revision 153549)
+++ misc/win32/misc.c (working copy)
@@ -16,7 +16,6 @@
#include "apr_private.h"
#include "apr_arch_misc.h"
-#include "crtdbg.h"
#include "apr_arch_file_io.h"
#include "assert.h"
#include "apr_lib.h"
Index: misc/win32/internal.c
===================================================================
--- misc/win32/internal.c (revision 153549)
+++ misc/win32/internal.c (working copy)
@@ -18,7 +18,6 @@
#include "apr_arch_misc.h"
#include "apr_arch_file_io.h"
-#include <crtdbg.h>
#include <assert.h>
/* This module is the source of -static- helper functions that are
@@ -52,8 +51,8 @@
;
}
- newarr = _malloc_dbg((args + 1) * sizeof(char *),
- _CRT_BLOCK, __FILE__, __LINE__);
+ newarr = apr_malloc_dbg((args + 1) * sizeof(char *),
+ __FILE__, __LINE__);
for (arg = 0; arg < args; ++arg) {
newarr[arg] = (void*)(wcslen(arr[arg]) + 1);
@@ -66,8 +65,8 @@
* 4 ucs bytes will hold a wchar_t pair value (20 bits)
*/
elesize = elesize * 3 + 1;
- ele = elements = _malloc_dbg(elesize * sizeof(char),
- _CRT_BLOCK, __FILE__, __LINE__);
+ ele = elements = apr_malloc_dbg(elesize * sizeof(char),
+ __FILE__, __LINE__);
for (arg = 0; arg < args; ++arg) {
apr_size_t len = (apr_size_t)newarr[arg];
@@ -87,8 +86,8 @@
/* Return to the free store if the heap realloc is the least bit
optimized
*/
- ele = _realloc_dbg(elements, ele - elements,
- _CRT_BLOCK, __FILE__, __LINE__);
+ ele = apr_realloc_dbg(elements, ele - elements,
+ __FILE__, __LINE__);
if (ele != elements) {
apr_size_t diff = ele - elements;
@@ -100,3 +99,27 @@
*retarr = newarr;
return args;
}
+
+
+#if defined(_MSC_VER)
+#include "crtdbg.h"
+
+void* apr_malloc_dbg(size_t size, const char* filename, int linenumber) {
+ return _malloc_dbg(size, _CRT_BLOCK, filename, linenumber);
+}
+
+void* apr_realloc_dbg(void* userData, size_t newSize, const char* filename,
int linenumber) {
+ return _realloc_dbg(userData, newSize, _CRT_BLOCK, filename, linenumber);
+}
+
+#else
+
+void* apr_malloc_dbg(size_t size, const char* filename, int linenumber) {
+ return malloc(size);
+}
+
+void* apr_realloc_dbg(void* userData, size_t newSize, const char* filename,
int linenumber) {
+ return realloc(userData, newSize);
+}
+
+#endif
Index: misc/win32/start.c
===================================================================
--- misc/win32/start.c (revision 153549)
+++ misc/win32/start.c (working copy)
@@ -23,7 +23,6 @@
#include "apr_arch_misc.h" /* for WSAHighByte / WSALowByte */
#include "wchar.h"
#include "apr_arch_file_io.h"
-#include "crtdbg.h"
#include "assert.h"
/* This symbol is _private_, although it must be exported.
@@ -54,8 +53,8 @@
}
wsize = 1 + wch - arrsz;
- newarr = _malloc_dbg((args + 1) * sizeof(char *),
- _CRT_BLOCK, __FILE__, __LINE__);
+ newarr = apr_malloc_dbg((args + 1) * sizeof(char *),
+ __FILE__, __LINE__);
/* This is a safe max allocation, we will realloc after
* processing and return the excess to the free store.
@@ -63,8 +62,8 @@
* 4 ucs bytes will hold a wchar_t pair value (20 bits)
*/
newlen = totlen = wsize * 3 + 1;
- newarr[0] = _malloc_dbg(newlen * sizeof(char),
- _CRT_BLOCK, __FILE__, __LINE__);
+ newarr[0] = apr_malloc_dbg(newlen * sizeof(char),
+ __FILE__, __LINE__);
(void)apr_conv_ucs2_to_utf8(arrsz, &wsize,
newarr[0], &newlen);
@@ -72,8 +71,8 @@
assert(newlen && !wsize);
/* Return to the free store if the heap realloc is the least bit
optimized
*/
- newarr[0] = _realloc_dbg(newarr[0], totlen - newlen,
- _CRT_BLOCK, __FILE__, __LINE__);
+ newarr[0] = apr_realloc_dbg(newarr[0], totlen - newlen,
+ __FILE__, __LINE__);
for (arg = 1; arg < args; ++arg) {
newarr[arg] = newarr[arg - 1] + 2;
@@ -128,8 +127,8 @@
dupenv = warrsztoastr(&_environ, sysstr, -1);
if (env) {
- *env = _malloc_dbg((dupenv + 1) * sizeof (char *),
- _CRT_BLOCK, __FILE__, __LINE__ );
+ *env = apr_malloc_dbg((dupenv + 1) * sizeof (char *),
+ __FILE__, __LINE__ );
memcpy((void*)*env, _environ, (dupenv + 1) * sizeof (char *));
}
else {
1.8 +1 -1 logging-log4cxx/examples/delayedloop.cpp
Index: delayedloop.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/examples/delayedloop.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- delayedloop.cpp 18 Dec 2004 08:28:28 -0000 1.7
+++ delayedloop.cpp 13 Feb 2005 05:55:00 -0000 1.8
@@ -61,7 +61,7 @@
static void init(const std::string& configFile)
{
-#ifdef HAVE_XML
+#ifdef LOG4CXX_HAVE_XML
if(configFile.length() > 4 &&
configFile.substr(configFile.length() - 4) == ".xml")
{
1.33 +16 -16 logging-log4cxx/include/log4cxx/logger.h
Index: logger.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/logger.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- logger.h 26 Dec 2004 07:31:52 -0000 1.32
+++ logger.h 13 Feb 2005 05:55:00 -0000 1.33
@@ -152,8 +152,8 @@
@param file the file where the log statement was written.
@param line the line where the log statement was written.
*/
- void debug(const std::string& msg, const
log4cxx::spi::location::LocationInfo& location);
- void debug(const std::wstring& msg, const
log4cxx::spi::location::LocationInfo& location);
+ void debug(const std::string& msg, const log4cxx::spi::LocationInfo&
location);
+ void debug(const std::wstring& msg, const
log4cxx::spi::LocationInfo& location);
void debug(const std::string& msg);
void debug(const std::wstring& msg);
@@ -172,8 +172,8 @@
@param file the file where the log statement was written.
@param line the line where the log statement was written.
*/
- void error(const std::wstring& msg, const
log4cxx::spi::location::LocationInfo& location);
- void error(const std::string& msg, const
log4cxx::spi::location::LocationInfo& location);
+ void error(const std::wstring& msg, const
log4cxx::spi::LocationInfo& location);
+ void error(const std::string& msg, const log4cxx::spi::LocationInfo&
location);
void error(const std::wstring& msg);
void error(const std::string& msg);
@@ -192,8 +192,8 @@
@param file the file where the log statement was written.
@param line the line where the log statement was written.
*/
- void fatal(const std::wstring& msg, const
log4cxx::spi::location::LocationInfo& location);
- void fatal(const std::string& msg, const
log4cxx::spi::location::LocationInfo& location);
+ void fatal(const std::wstring& msg, const
log4cxx::spi::LocationInfo& location);
+ void fatal(const std::string& msg, const log4cxx::spi::LocationInfo&
location);
void fatal(const std::wstring& msg);
void fatal(const std::string& msg);
@@ -205,9 +205,9 @@
@param locaion location of the logging statement.
*/
void forcedLog(const LevelPtr& level, const std::string& message,
- const log4cxx::spi::location::LocationInfo&
location);
+ const log4cxx::spi::LocationInfo& location);
void forcedLog(const LevelPtr& level, const std::wstring& message,
- const log4cxx::spi::location::LocationInfo&
location);
+ const log4cxx::spi::LocationInfo& location);
void forcedLog(const LevelPtr& level, const std::string& message);
@@ -343,8 +343,8 @@
@param file the file where the log statement was written.
@param line the line where the log statement was written.
*/
- void info(const std::wstring& msg, const
log4cxx::spi::location::LocationInfo& location);
- void info(const std::string& msg, const
log4cxx::spi::location::LocationInfo& location);
+ void info(const std::wstring& msg, const log4cxx::spi::LocationInfo&
location);
+ void info(const std::string& msg, const log4cxx::spi::LocationInfo&
location);
void info(const std::wstring& msg);
void info(const std::string& msg);
@@ -452,10 +452,10 @@
@see #setResourceBundle
*/
void l7dlog(const LevelPtr& level, const std::wstring& key,
- const log4cxx::spi::location::LocationInfo&
locationInfo,
+ const log4cxx::spi::LocationInfo&
locationInfo,
...);
void l7dlog(const LevelPtr& level, const std::string& key,
- const log4cxx::spi::location::LocationInfo&
locationInfo,
+ const log4cxx::spi::LocationInfo&
locationInfo,
...);
/**
@@ -467,9 +467,9 @@
@param file The source file of the logging request, may be null.
@param line The number line of the logging request. */
void log(const LevelPtr& level, const std::wstring& message,
- const log4cxx::spi::location::LocationInfo& location);
+ const log4cxx::spi::LocationInfo& location);
void log(const LevelPtr& level, const std::string& message,
- const log4cxx::spi::location::LocationInfo& location);
+ const log4cxx::spi::LocationInfo& location);
void log(const LevelPtr& level, const std::wstring& message);
void log(const LevelPtr& level, const std::string& message);
@@ -538,8 +538,8 @@
@param file the file where the log statement was written.
@param line the line where the log statement was written.
*/
- void warn(const std::wstring& msg, const
log4cxx::spi::location::LocationInfo& location);
- void warn(const std::string& msg, const
log4cxx::spi::location::LocationInfo& location);
+ void warn(const std::wstring& msg, const log4cxx::spi::LocationInfo&
location);
+ void warn(const std::string& msg, const log4cxx::spi::LocationInfo&
location);
void warn(const std::wstring& msg);
void warn(const std::string& msg);
1.9 +16 -12 logging-log4cxx/include/log4cxx/portability.h
Index: portability.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/portability.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- portability.h 12 Jan 2005 04:37:11 -0000 1.8
+++ portability.h 13 Feb 2005 05:55:00 -0000 1.9
@@ -17,20 +17,25 @@
#ifndef _LOG4CXX_PORTABILITY_H
#define _LOG4CXX_PORTABILITY_H
-#if defined(_MSC_VER)
-#pragma warning(disable : 4250 4251 4786 4290)
-
-#ifdef LOG4CXX_STATIC
+#if defined(LOG4CXX_STATIC)
#define LOG4CXX_EXPORT
-// cf. file msvc/static/static.cpp
-#pragma comment(linker, "/include:?ForceSymbolReferences@@YAXXZ")
-#else // DLL
+#else
+#if defined(_WIN32)
#ifdef LOG4CXX
#define LOG4CXX_EXPORT __declspec(dllexport)
#else
#define LOG4CXX_EXPORT __declspec(dllimport)
#endif
#endif
+#endif
+
+#if defined(_MSC_VER)
+#pragma warning(disable : 4250 4251 4786 4290)
+
+#ifdef LOG4CXX_STATIC
+// cf. file msvc/static/static.cpp
+#pragma comment(linker, "/include:?ForceSymbolReferences@@YAXXZ")
+#endif
#if defined(_MSC_VER) && _MSC_VER >= 1200
@@ -40,8 +45,6 @@
#endif
#else
-
-#define LOG4CXX_EXPORT
typedef long long log4cxx_int64_t;
#endif
@@ -50,8 +53,9 @@
typedef log4cxx_int64_t log4cxx_time_t;
typedef int log4cxx_status_t;
-#define HAVE_XML
-#define LOG4CXX_HAVE_XML
-
+#if !defined(__BORLANDC__)
+#define HAVE_XML 1
+#define LOG4CXX_HAVE_XML 1
+#endif
#endif //_LOG4CXX_PORTABILITY_H
1.9 +5 -5 logging-log4cxx/include/log4cxx/stream.h
Index: stream.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/stream.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- stream.h 4 Jan 2005 03:37:07 -0000 1.8
+++ stream.h 13 Feb 2005 05:55:00 -0000 1.9
@@ -81,7 +81,7 @@
}
- void setLocation(const ::log4cxx::spi::location::LocationInfo&
location) {
+ void setLocation(const ::log4cxx::spi::LocationInfo& location)
{
if (LOG4CXX_UNLIKELY(enabled)) {
currentLocation = location;
}
@@ -89,7 +89,7 @@
- inline void flush(const ::log4cxx::spi::location::LocationInfo&
location) {
+ inline void flush(const ::log4cxx::spi::LocationInfo& location)
{
if (LOG4CXX_UNLIKELY(enabled && 0 != impl)) {
logger->log(currentLevel,
impl->str(),
@@ -121,7 +121,7 @@
LevelPtr currentLevel;
::std::wostringstream* impl;
bool enabled;
- ::log4cxx::spi::location::LocationInfo currentLocation;
+ ::log4cxx::spi::LocationInfo currentLocation;
};
@@ -138,7 +138,7 @@
::log4cxx::logstream& operator<<(
::log4cxx::logstream& lhs,
- const ::log4cxx::spi::location::LocationInfo& rhs) {
+ const ::log4cxx::spi::LocationInfo& rhs) {
lhs.setLocation(rhs);
return lhs;
}
@@ -146,7 +146,7 @@
::log4cxx::logstream& operator<<(
::log4cxx::logstream& lhs,
- const ::log4cxx::spi::location::LocationFlush& rhs) {
+ const ::log4cxx::spi::LocationFlush& rhs) {
lhs.flush(rhs);
return lhs;
}
1.9 +2 -2
logging-log4cxx/include/log4cxx/helpers/cacheddateformat.h
Index: cacheddateformat.h
===================================================================
RCS file:
/home/cvs/logging-log4cxx/include/log4cxx/helpers/cacheddateformat.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cacheddateformat.h 26 Dec 2004 07:31:52 -0000 1.8
+++ cacheddateformat.h 13 Feb 2005 05:55:01 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2004-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.
@@ -32,7 +32,7 @@
log4cxx::helpers::Pool& p) const;
virtual void setTimeZone(const TimeZonePtr& zone);
virtual void numberFormat(LogString& s,
- long n,
+ int n,
log4cxx::helpers::Pool& p) const;
1.7 +1 -0
logging-log4cxx/include/log4cxx/helpers/simpledateformat.h
Index: simpledateformat.h
===================================================================
RCS file:
/home/cvs/logging-log4cxx/include/log4cxx/helpers/simpledateformat.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- simpledateformat.h 26 Dec 2004 07:31:52 -0000 1.6
+++ simpledateformat.h 13 Feb 2005 05:55:01 -0000 1.7
@@ -20,6 +20,7 @@
#include <log4cxx/helpers/dateformat.h>
#include <vector>
#include <locale>
+#include <time.h>
namespace log4cxx
{
1.25 +3 -3 logging-log4cxx/include/log4cxx/spi/loggingevent.h
Index: loggingevent.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/spi/loggingevent.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- loggingevent.h 3 Jan 2005 06:43:44 -0000 1.24
+++ loggingevent.h 13 Feb 2005 05:55:01 -0000 1.25
@@ -83,7 +83,7 @@
*/
LoggingEvent(const LoggerPtr& logger,
const LevelPtr& level, const
LogString& message,
- const log4cxx::spi::location::LocationInfo&
location);
+ const log4cxx::spi::LocationInfo& location);
~LoggingEvent();
@@ -117,7 +117,7 @@
{ return timeStamp; }
/* Return the file where this log statement was
written. */
- inline const log4cxx::spi::location::LocationInfo&
getLocationInformation() const
+ inline const log4cxx::spi::LocationInfo&
getLocationInformation() const
{ return locationInfo; }
/**
@@ -238,7 +238,7 @@
log4cxx_time_t timeStamp;
/** The is the location where this log statement was
written. */
- const log4cxx::spi::location::LocationInfo
locationInfo;
+ const log4cxx::spi::LocationInfo locationInfo;
/** The identifier of thread in which this logging
event
1.10 +1 -1 logging-log4cxx/include/log4cxx/spi/rootcategory.h
Index: rootcategory.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/spi/rootcategory.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rootcategory.h 15 Dec 2004 00:38:50 -0000 1.9
+++ rootcategory.h 13 Feb 2005 05:55:01 -0000 1.10
@@ -45,7 +45,7 @@
Return the assigned level value without walking the category
hierarchy.
*/
- virtual const LevelPtr& getEffectiveLevel();
+ virtual const LevelPtr& getEffectiveLevel() const;
/**
Setting a null value to the level of the root
category may have catastrophic
1.10 +7 -8
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- locationinfo.h 4 Jan 2005 06:38:14 -0000 1.9
+++ locationinfo.h 13 Feb 2005 05:55:01 -0000 1.10
@@ -24,12 +24,9 @@
{
namespace spi
{
- namespace location
- {
/**
* This class represents the location of a logging statement.
*
- * @remarks This class currently only used by the experimental (and
optional) log4cxx::stream class.
*/
class LOG4CXX_EXPORT LocationInfo
{
@@ -127,7 +124,6 @@
}
};
- }
}
}
@@ -135,16 +131,19 @@
#if defined(_MSC_VER)
#if _MSC_VER >= 1300
#define __LOG4CXX_FUNC__ __FUNCDNAME__
-#else
-#define __LOG4CXX_FUNC__ ""
#endif
#else
+#if defined(__GCC)
#define __LOG4CXX_FUNC__ __PRETTY_FUNCTION__
#endif
- #define LOG4CXX_LOCATION
::log4cxx::spi::location::LocationInfo(__FILE__, \
+#endif
+#if !defined(__LOG4CXX_FUNC__)
+#define __LOG4CXX_FUNC__ ""
+#endif
+ #define LOG4CXX_LOCATION ::log4cxx::spi::LocationInfo(__FILE__, \
__LOG4CXX_FUNC__,
\
__LINE__)
- #define LOG4CXX_LOCATION_FLUSH
::log4cxx::spi::location::LocationFlush(__FILE__, \
+ #define LOG4CXX_LOCATION_FLUSH ::log4cxx::spi::LocationFlush(__FILE__,
\
__LOG4CXX_FUNC__,
\
__LINE__)
#endif
1.16 +4 -3 logging-log4cxx/performance/main.cpp
Index: main.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/performance/main.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- main.cpp 10 Feb 2005 05:07:31 -0000 1.15
+++ main.cpp 13 Feb 2005 05:55:01 -0000 1.16
@@ -48,7 +48,7 @@
static loopFunc loop;
public:
- static void main(std::vector<LogString>& args) {
+ static int main(std::vector<LogString>& args) {
LoggerPtr j(Logger::getLogger("org.apache.log4j.joran"));
j->setAdditivity(false);
j->setLevel(Level::WARN);
@@ -75,7 +75,8 @@
"Loop completed in [" << res << "] milliseconds, or [" << average
<< "] microseconds per log.";
- //memPrint();
+ //memPrint();
+ return 1;
}
static void usage(const char* msg) {
@@ -187,5 +188,5 @@
for (int i = 1; i < argc; i++) {
Transcoder::decode(argv[i], args[i - 1]);
}
- Loop::main(args);
+ return Loop::main(args);
}
1.5 +2 -2 logging-log4cxx/simplesocketserver/simplesocketserver.cpp
Index: simplesocketserver.cpp
===================================================================
RCS file:
/home/cvs/logging-log4cxx/simplesocketserver/simplesocketserver.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- simplesocketserver.cpp 26 Dec 2004 07:31:53 -0000 1.4
+++ simplesocketserver.cpp 13 Feb 2005 05:55:01 -0000 1.5
@@ -33,7 +33,7 @@
#include <log4cxx/stream.h>
using namespace log4cxx;
-#ifdef HAVE_XML
+#ifdef LOG4CXX_HAVE_XML
using namespace log4cxx::xml;
#endif
using namespace log4cxx::net;
@@ -51,7 +51,7 @@
{
port = atol(portStr.c_str());
-#ifdef HAVE_XML
+#ifdef LOG4CXX_HAVE_XML
// tests if configFile ends with ".xml"
if (configFile.length() > 4 &&
configFile.substr(configFile.length() -4) == ".xml")
1.9 +2 -2 logging-log4cxx/src/cacheddateformat.cpp
Index: cacheddateformat.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/cacheddateformat.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cacheddateformat.cpp 26 Dec 2004 07:31:53 -0000 1.8
+++ cacheddateformat.cpp 13 Feb 2005 05:55:01 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,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.
@@ -161,6 +161,6 @@
}
-void CachedDateFormat::numberFormat(LogString& s, long n, Pool& p) const {
+void CachedDateFormat::numberFormat(LogString& s, int n, Pool& p) const {
formatter->numberFormat(s, n, p);
}
1.7 +1 -1 logging-log4cxx/src/formattinginfo.cpp
Index: formattinginfo.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/formattinginfo.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- formattinginfo.cpp 11 Dec 2004 04:53:25 -0000 1.6
+++ formattinginfo.cpp 13 Feb 2005 05:55:01 -0000 1.7
@@ -41,7 +41,7 @@
+ LOG4CXX_STR(", maxChar=")
+ StringHelper::toString(maxChar, pool)
+ LOG4CXX_STR(", leftAlign=")
- + StringHelper::toString(leftAlign, pool));
+ + (leftAlign ? LOG4CXX_STR("true") : LOG4CXX_STR("false")));
}
1.18 +0 -1 logging-log4cxx/src/htmllayout.cpp
Index: htmllayout.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/htmllayout.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- htmllayout.cpp 2 Jan 2005 05:40:04 -0000 1.17
+++ htmllayout.cpp 13 Feb 2005 05:55:01 -0000 1.18
@@ -31,7 +31,6 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-using namespace log4cxx::spi::location;
IMPLEMENT_LOG4CXX_OBJECT(HTMLLayout)
1.9 +1 -1 logging-log4cxx/src/locationinfo.cpp
Index: locationinfo.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/locationinfo.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- locationinfo.cpp 4 Jan 2005 06:38:14 -0000 1.8
+++ locationinfo.cpp 13 Feb 2005 05:55:01 -0000 1.9
@@ -17,7 +17,7 @@
#include <log4cxx/spi/location/locationinfo.h>
#include <sstream>
- using namespace ::log4cxx::spi::location;
+ using namespace ::log4cxx::spi;
/**
When location information is not available the constant
<code>NA</code> is returned. Current value of this string
1.25 +12 -13 logging-log4cxx/src/logger.cpp
Index: logger.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/logger.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- logger.cpp 2 Jan 2005 05:40:05 -0000 1.24
+++ logger.cpp 13 Feb 2005 05:55:01 -0000 1.25
@@ -33,7 +33,6 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-using namespace log4cxx::spi::location;
IMPLEMENT_LOG4CXX_OBJECT(Logger)
@@ -496,13 +495,13 @@
}
-void Logger::debug(const std::string& msg, const
log4cxx::spi::location::LocationInfo& location) {
+void Logger::debug(const std::string& msg, const log4cxx::spi::LocationInfo&
location) {
if (isEnabledFor(log4cxx::Level::getDebug())) {
forcedLog(log4cxx::Level::getDebug(), msg, location);
}
}
-void Logger::debug(const std::wstring& msg, const
log4cxx::spi::location::LocationInfo& location) {
+void Logger::debug(const std::wstring& msg, const
log4cxx::spi::LocationInfo& location) {
if (isEnabledFor(log4cxx::Level::getDebug())) {
forcedLog(log4cxx::Level::getDebug(), msg, location);
}
@@ -522,13 +521,13 @@
}
-void Logger::error(const std::wstring& msg, const
log4cxx::spi::location::LocationInfo& location) {
+void Logger::error(const std::wstring& msg, const
log4cxx::spi::LocationInfo& location) {
if (isEnabledFor(log4cxx::Level::getError())) {
forcedLog(log4cxx::Level::getError(), msg, location);
}
}
-void Logger::error(const std::string& msg, const
log4cxx::spi::location::LocationInfo& location) {
+void Logger::error(const std::string& msg, const log4cxx::spi::LocationInfo&
location) {
if (isEnabledFor(log4cxx::Level::getError())) {
forcedLog(log4cxx::Level::getError(), msg, location);
}
@@ -548,13 +547,13 @@
}
-void Logger::fatal(const std::wstring& msg, const
log4cxx::spi::location::LocationInfo& location) {
+void Logger::fatal(const std::wstring& msg, const
log4cxx::spi::LocationInfo& location) {
if (isEnabledFor(log4cxx::Level::FATAL)) {
forcedLog(log4cxx::Level::FATAL, msg, location);
}
}
-void Logger::fatal(const std::string& msg, const
log4cxx::spi::location::LocationInfo& location) {
+void Logger::fatal(const std::string& msg, const log4cxx::spi::LocationInfo&
location) {
if (isEnabledFor(log4cxx::Level::FATAL)) {
forcedLog(log4cxx::Level::FATAL, msg, location);
}
@@ -572,14 +571,14 @@
}
}
-void Logger::info(const std::wstring& msg, const
log4cxx::spi::location::LocationInfo& location) {
+void Logger::info(const std::wstring& msg, const log4cxx::spi::LocationInfo&
location) {
if (isEnabledFor(log4cxx::Level::INFO)) {
forcedLog(log4cxx::Level::INFO, msg, location);
}
}
-void Logger::info(const std::string& msg, const
log4cxx::spi::location::LocationInfo& location) {
+void Logger::info(const std::string& msg, const log4cxx::spi::LocationInfo&
location) {
if (isEnabledFor(log4cxx::Level::INFO)) {
forcedLog(log4cxx::Level::INFO, msg, location);
}
@@ -598,7 +597,7 @@
}
void Logger::log(const LevelPtr& level, const std::wstring& message,
- const log4cxx::spi::location::LocationInfo& location) {
+ const log4cxx::spi::LocationInfo& location) {
if (isEnabledFor(level)) {
forcedLog(level, message, location);
}
@@ -606,7 +605,7 @@
void Logger::log(const LevelPtr& level, const std::string& message,
- const log4cxx::spi::location::LocationInfo& location) {
+ const log4cxx::spi::LocationInfo& location) {
if (isEnabledFor(level)) {
forcedLog(level, message, location);
}
@@ -625,13 +624,13 @@
}
-void Logger::warn(const std::wstring& msg, const
log4cxx::spi::location::LocationInfo& location) {
+void Logger::warn(const std::wstring& msg, const log4cxx::spi::LocationInfo&
location) {
if (isEnabledFor(log4cxx::Level::WARN)) {
forcedLog(log4cxx::Level::WARN, msg, location);
}
}
-void Logger::warn(const std::string& msg, const
log4cxx::spi::location::LocationInfo& location) {
+void Logger::warn(const std::string& msg, const log4cxx::spi::LocationInfo&
location) {
if (isEnabledFor(log4cxx::Level::WARN)) {
forcedLog(log4cxx::Level::WARN, msg, location);
}
1.26 +0 -1 logging-log4cxx/src/loggingevent.cpp
Index: loggingevent.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/loggingevent.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- loggingevent.cpp 28 Jan 2005 17:03:37 -0000 1.25
+++ loggingevent.cpp 13 Feb 2005 05:55:01 -0000 1.26
@@ -33,7 +33,6 @@
using namespace log4cxx;
using namespace log4cxx::spi;
-using namespace log4cxx::spi::location;
using namespace log4cxx::helpers;
IMPLEMENT_LOG4CXX_OBJECT(LoggingEvent)
1.12 +4 -1 logging-log4cxx/src/msxml.cpp
Index: msxml.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/msxml.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- msxml.cpp 12 Jan 2005 04:37:12 -0000 1.11
+++ msxml.cpp 13 Feb 2005 05:55:01 -0000 1.12
@@ -13,9 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#define _WIN32_DCOM
#include <log4cxx/portability.h>
+
+#if LOG4CXX_HAVE_XML
#ifdef _WIN32
@@ -302,3 +304,4 @@
}
#endif
+#endif
\ No newline at end of file
1.23 +3 -1 logging-log4cxx/src/optionconverter.cpp
Index: optionconverter.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/optionconverter.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- optionconverter.cpp 12 Jan 2005 04:37:12 -0000 1.22
+++ optionconverter.cpp 13 Feb 2005 05:55:01 -0000 1.23
@@ -38,7 +38,7 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-using namespace log4cxx::xml;
+using namespace log4cxx::xml;
LogString OptionConverter::convertSpecialChars(const LogString& s)
@@ -362,6 +362,7 @@
LogString clazz = _clazz;
LogString filename(configFileName.getName());
+#ifdef LOG4CXX_HAVE_XML
if(clazz.empty()
&& filename.length() > 4
&& StringHelper::equalsIgnoreCase(
@@ -370,6 +371,7 @@
{
clazz = DOMConfigurator::getStaticClass().toString();
}
+#endif
if(!clazz.empty())
{
1.26 +0 -1 logging-log4cxx/src/patternparser.cpp
Index: patternparser.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/patternparser.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- patternparser.cpp 4 Jan 2005 06:38:14 -0000 1.25
+++ patternparser.cpp 13 Feb 2005 05:55:01 -0000 1.26
@@ -32,7 +32,6 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-using namespace log4cxx::spi::location;
#define ESCAPE_CHAR LOG4CXX_STR('%')
1.7 +1 -1 logging-log4cxx/src/rootcategory.cpp
Index: rootcategory.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/rootcategory.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rootcategory.cpp 11 Dec 2004 04:53:25 -0000 1.6
+++ rootcategory.cpp 13 Feb 2005 05:55:01 -0000 1.7
@@ -28,7 +28,7 @@
setLevel(level);
}
-const LevelPtr& RootCategory::getEffectiveLevel()
+const LevelPtr& RootCategory::getEffectiveLevel() const
{
return level;
}
1.18 +2 -1 logging-log4cxx/src/system.cpp
Index: system.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/system.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- system.cpp 2 Jan 2005 05:40:05 -0000 1.17
+++ system.cpp 13 Feb 2005 05:55:01 -0000 1.18
@@ -26,7 +26,8 @@
#include <time.h>
#include <log4cxx/helpers/properties.h>
-#include <log4cxx/helpers/transcoder.h>
+#include <log4cxx/helpers/transcoder.h>
+#include <stdlib.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
1.23 +0 -1 logging-log4cxx/src/xmllayout.cpp
Index: xmllayout.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/xmllayout.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xmllayout.cpp 5 Jan 2005 22:42:58 -0000 1.22
+++ xmllayout.cpp 13 Feb 2005 05:55:01 -0000 1.23
@@ -28,7 +28,6 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
using namespace log4cxx::spi;
-using namespace log4cxx::spi::location;
using namespace log4cxx::xml;
IMPLEMENT_LOG4CXX_OBJECT(XMLLayout)
1.14 +10 -6 logging-log4cxx/tests/src/main.cpp
Index: main.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/main.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- main.cpp 6 Feb 2005 02:04:33 -0000 1.13
+++ main.cpp 13 Feb 2005 05:55:01 -0000 1.14
@@ -38,17 +38,19 @@
extern CPPUNIT_NS::Test* createTestCase1();
-extern CPPUNIT_NS::Test* createTestCase2();
extern CPPUNIT_NS::Test* createTestCase3();
-extern CPPUNIT_NS::Test* createTestCase4();
+#if defined(LOG4CXX_HAVE_XML)
+extern CPPUNIT_NS::Test* createTestCase2();
+extern CPPUNIT_NS::Test* createTestCase4();
+#endif
//
// initializing a logger will cause the APR used by log4cxx library to be
initialized
//
log4cxx::LoggerPtr logger(log4cxx::Logger::getLogger("log4cxx_unittest"));
-int main( int argc, const char * const argv[])
+int main( int argc, const char * const * argv)
{
apr_app_initialize(&argc, &argv, NULL);
CppUnit::TextUi::TestRunner runner;
@@ -82,15 +84,17 @@
case '1':
runner.addTest(createTestCase1());
break;
- case '2':
-
runner.addTest(createTestCase2());
- break;
case '3':
runner.addTest(createTestCase3());
break;
+#if defined(LOG4CXX_HAVE_XML)
+ case '2':
+
runner.addTest(createTestCase2());
+ break;
case '4':
runner.addTest(createTestCase4());
break;
+#endif
default:
break;
}
1.5 +1 -0 logging-log4cxx/tests/src/shortsocketserver.cpp
Index: shortsocketserver.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/shortsocketserver.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- shortsocketserver.cpp 11 Dec 2004 04:53:27 -0000 1.4
+++ shortsocketserver.cpp 13 Feb 2005 05:55:01 -0000 1.5
@@ -27,6 +27,7 @@
#include "net/socketservertestcase.h"
#include <log4cxx/stream.h>
#include <iostream>
+#include <stdlib.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
1.6 +1 -1 logging-log4cxx/tests/src/customlogger/xlogger.cpp
Index: xlogger.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/customlogger/xlogger.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xlogger.cpp 18 Dec 2004 07:53:06 -0000 1.5
+++ xlogger.cpp 13 Feb 2005 05:55:01 -0000 1.6
@@ -22,7 +22,7 @@
using namespace log4cxx;
-using namespace log4cxx::spi::location;
+using namespace log4cxx::spi;
IMPLEMENT_LOG4CXX_OBJECT(XLogger)
IMPLEMENT_LOG4CXX_OBJECT(XFactory)
1.7 +2 -2 logging-log4cxx/tests/src/customlogger/xlogger.h
Index: xlogger.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/customlogger/xlogger.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xlogger.h 12 Jan 2005 04:37:12 -0000 1.6
+++ xlogger.h 13 Feb 2005 05:55:01 -0000 1.7
@@ -78,7 +78,7 @@
/**
We introduce a new printing method in order to
support [EMAIL PROTECTED]
XLevel#LETHAL}. */
- void lethal(const LogString& message, const
log4cxx::spi::location::LocationInfo& location);
+ void lethal(const LogString& message, const
log4cxx::spi::LocationInfo& location);
/**
We introduce a new printing method in order to
support [EMAIL PROTECTED]
@@ -98,7 +98,7 @@
/**
We introduce a new printing method that takes the
TRACE level.
*/
- void trace(const LogString& message, const
log4cxx::spi::location::LocationInfo& location);
+ void trace(const LogString& message, const
log4cxx::spi::LocationInfo& location);
/**
We introduce a new printing method that takes the
TRACE level.
1.8 +1 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xloggertestcase.cpp 12 Jan 2005 04:37:12 -0000 1.7
+++ xloggertestcase.cpp 13 Feb 2005 05:55:01 -0000 1.8
@@ -16,7 +16,7 @@
#include <log4cxx/portability.h>
-#ifdef HAVE_XML
+#ifdef LOG4CXX_HAVE_XML
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
1.8 +2 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testcase2.cpp 6 Feb 2005 02:04:33 -0000 1.7
+++ testcase2.cpp 13 Feb 2005 05:55:01 -0000 1.8
@@ -16,7 +16,7 @@
#include <log4cxx/portability.h>
-#ifdef HAVE_XML
+#ifdef LOG4CXX_HAVE_XML
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
@@ -61,4 +61,4 @@
}
-#endif //HAVE_XML
+#endif //LOG4CXX_HAVE_XML
1.8 +2 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testcase4.cpp 6 Feb 2005 02:04:33 -0000 1.7
+++ testcase4.cpp 13 Feb 2005 05:55:01 -0000 1.8
@@ -16,7 +16,7 @@
#include <log4cxx/portability.h>
-#ifdef HAVE_XML
+#ifdef LOG4CXX_HAVE_XML
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
@@ -61,4 +61,4 @@
return TestCase4::suite();
}
-#endif //HAVE_XML
+#endif //LOG4CXX_HAVE_XML
1.6 +1 -1
logging-log4cxx/tests/src/helpers/cyclicbuffertestcase.cpp
Index: cyclicbuffertestcase.cpp
===================================================================
RCS file:
/home/cvs/logging-log4cxx/tests/src/helpers/cyclicbuffertestcase.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cyclicbuffertestcase.cpp 16 Dec 2004 06:41:19 -0000 1.5
+++ cyclicbuffertestcase.cpp 13 Feb 2005 05:55:01 -0000 1.6
@@ -50,7 +50,7 @@
{
e.push_back(
new LoggingEvent(logger, Level::DEBUG, LOG4CXX_STR("e"),
-
log4cxx::spi::location::LocationInfo::getLocationUnavailable()));
+
log4cxx::spi::LocationInfo::getLocationUnavailable()));
}
}
1.7 +2 -1
logging-log4cxx/tests/src/helpers/optionconvertertestcase.cpp
Index: optionconvertertestcase.cpp
===================================================================
RCS file:
/home/cvs/logging-log4cxx/tests/src/helpers/optionconvertertestcase.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- optionconvertertestcase.cpp 16 Dec 2004 06:41:19 -0000 1.6
+++ optionconvertertestcase.cpp 13 Feb 2005 05:55:01 -0000 1.7
@@ -22,7 +22,8 @@
#include <log4cxx/helpers/system.h>
#include <log4cxx/helpers/transcoder.h>
#include "../testchar.h"
-#include "../insertwide.h"
+#include "../insertwide.h"
+#include <stdlib.h>
using namespace log4cxx;
1.9 +1 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- errorhandlertestcase.cpp 29 Jan 2005 23:44:53 -0000 1.8
+++ errorhandlertestcase.cpp 13 Feb 2005 05:55:02 -0000 1.9
@@ -16,7 +16,7 @@
#include <log4cxx/portability.h>
-#ifdef HAVE_XML
+#ifdef LOG4CXX_HAVE_XML
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
1.6 +1 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- customleveltestcase.cpp 12 Jan 2005 04:37:12 -0000 1.5
+++ customleveltestcase.cpp 13 Feb 2005 05:55:02 -0000 1.6
@@ -16,7 +16,7 @@
#include <log4cxx/portability.h>
-#ifdef HAVE_XML
+#ifdef LOG4CXX_HAVE_XML
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
