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 2004/12/12 06:53:58 UTC
cvs commit: logging-log4cxx/tests/src/util compare.h filter.h
carnold 2004/12/11 21:53:58
Modified: include/log4cxx appender.h basicconfigurator.h file.h
fileappender.h level.h logmanager.h mdc.h ndc.h
propertyconfigurator.h
include/log4cxx/config propertysetter.h
include/log4cxx/helpers class.h filewatchdog.h inetaddress.h
loader.h locale.h loglog.h object.h
optionconverter.h patternconverter.h
patternparser.h properties.h socket.h
socketinputstream.h socketoutputstream.h
stringhelper.h stringtokenizer.h system.h tchar.h
timezone.h transcoder.h transform.h xml.h
include/log4cxx/nt outputdebugstringappender.h
include/log4cxx/spi appenderattachable.h configurator.h
loggerfactory.h loggerrepository.h loggingevent.h
optionhandler.h
include/log4cxx/spi/location locationinfo.h
include/log4cxx/xml domconfigurator.h
performance nullappender.h
src cacheddateformat.cpp file.cpp hierarchy.cpp
outputdebugstringappender.cpp
tests/src/helpers Makefile.am
tests/src/util compare.h filter.h
Added: include/log4cxx logstring.h
Removed: include/log4cxx string.h
Log:
LOGCXX-10: tchar.h conflict: renamed log4cxx/string.h to log4cxx/logstring.h
Revision Changes Path
1.12 +1 -1 logging-log4cxx/include/log4cxx/appender.h
Index: appender.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/appender.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- appender.h 11 Dec 2004 04:53:21 -0000 1.11
+++ appender.h 12 Dec 2004 05:53:56 -0000 1.12
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_APPENDER_H
#define _LOG4CXX_APPENDER_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/object.h>
#include <vector>
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- basicconfigurator.h 11 Dec 2004 04:53:21 -0000 1.7
+++ basicconfigurator.h 12 Dec 2004 05:53:56 -0000 1.8
@@ -20,7 +20,7 @@
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/portability.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/spi/configurator.h>
#include <map>
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file.h 11 Dec 2004 04:53:21 -0000 1.1
+++ file.h 12 Dec 2004 05:53:56 -0000 1.2
@@ -18,7 +18,7 @@
#define _LOG4CXX_FILE_H
#include <log4cxx/portability.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
class apr_file_t;
class apr_pool_t;
1.16 +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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fileappender.h 11 Dec 2004 04:53:21 -0000 1.15
+++ fileappender.h 12 Dec 2004 05:53:56 -0000 1.16
@@ -18,7 +18,7 @@
#define _LOG4CXX_FILE_APPENDER_H
#include <log4cxx/portability.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/writerappender.h>
#include <log4cxx/file.h>
1.16 +1 -1 logging-log4cxx/include/log4cxx/level.h
Index: level.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/level.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- level.h 11 Dec 2004 05:51:06 -0000 1.15
+++ level.h 12 Dec 2004 05:53:57 -0000 1.16
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <limits.h>
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/helpers/objectptr.h>
1.15 +1 -1 logging-log4cxx/include/log4cxx/logmanager.h
Index: logmanager.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/logmanager.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- logmanager.h 11 Dec 2004 04:53:21 -0000 1.14
+++ logmanager.h 12 Dec 2004 05:53:57 -0000 1.15
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_LOG_MANAGER_H
#define _LOG4CXX_LOG_MANAGER_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <vector>
#include <log4cxx/spi/repositoryselector.h>
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mdc.h 11 Dec 2004 04:53:21 -0000 1.8
+++ mdc.h 12 Dec 2004 05:53:57 -0000 1.9
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_MDC_H
#define _LOG4CXX_MDC_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/threadspecificdata.h>
#include <map>
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ndc.h 11 Dec 2004 04:53:21 -0000 1.8
+++ ndc.h 12 Dec 2004 05:53:57 -0000 1.9
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_NDC_H
#define _LOG4CXX_NDC_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/threadspecificdata.h>
#include <stack>
1.16 +1 -1 logging-log4cxx/include/log4cxx/propertyconfigurator.h
Index: propertyconfigurator.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/propertyconfigurator.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- propertyconfigurator.h 11 Dec 2004 04:53:21 -0000 1.15
+++ propertyconfigurator.h 12 Dec 2004 05:53:57 -0000 1.16
@@ -20,7 +20,7 @@
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/portability.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/spi/configurator.h>
#include <map>
#include <log4cxx/file.h>
1.1 logging-log4cxx/include/log4cxx/logstring.h
Index: logstring.h
===================================================================
/*
* 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.
*/
#ifndef _LOG4CXX_STRING_H
#define _LOG4CXX_STRING_H
#include <string>
#define LOG4CXX_LOGCHAR_IS_WCHAR 1
namespace log4cxx {
#if LOG4CXX_LOGCHAR_IS_WCHAR
typedef wchar_t logchar;
#endif
#if LOG4CXX_LOGCHAR_IS_CHAR
typedef char logchar;
#endif
typedef std::basic_string<logchar> LogString;
}
#if LOG4CXX_LOGCHAR_IS_WCHAR
#define LOG4CXX_STR(str) L ## str
#endif
#if LOG4CXX_LOGCHAR_IS_CHAR
#define LOG4CXX_STR(str) str
#endif
#endif //_LOG4CXX_STRING_H
1.11 +1 -1 logging-log4cxx/include/log4cxx/config/propertysetter.h
Index: propertysetter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/config/propertysetter.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- propertysetter.h 11 Dec 2004 04:53:22 -0000 1.10
+++ propertysetter.h 12 Dec 2004 05:53:57 -0000 1.11
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_CONFIG_PROPERTYSETTER_H
#define _LOG4CXX_CONFIG_PROPERTYSETTER_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
namespace log4cxx
1.14 +1 -1 logging-log4cxx/include/log4cxx/helpers/class.h
Index: class.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/class.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- class.h 11 Dec 2004 04:53:22 -0000 1.13
+++ class.h 12 Dec 2004 05:53:57 -0000 1.14
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_CLASS_H
#define _LOG4CXX_HELPERS_CLASS_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <map>
1.9 +1 -1 logging-log4cxx/include/log4cxx/helpers/filewatchdog.h
Index: filewatchdog.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/filewatchdog.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- filewatchdog.h 11 Dec 2004 04:53:22 -0000 1.8
+++ filewatchdog.h 12 Dec 2004 05:53:57 -0000 1.9
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_FILEWATCHDOG_H
#define _LOG4CXX_HELPERS_FILEWATCHDOG_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <time.h>
#include <log4cxx/helpers/pool.h>
#include <log4cxx/helpers/thread.h>
1.10 +1 -1 logging-log4cxx/include/log4cxx/helpers/inetaddress.h
Index: inetaddress.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/inetaddress.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- inetaddress.h 11 Dec 2004 04:53:22 -0000 1.9
+++ inetaddress.h 12 Dec 2004 05:53:57 -0000 1.10
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPER_INETADDRESS_H
#define _LOG4CXX_HELPER_INETADDRESS_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <vector>
#include <log4cxx/helpers/exception.h>
1.9 +1 -1 logging-log4cxx/include/log4cxx/helpers/loader.h
Index: loader.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/loader.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- loader.h 11 Dec 2004 04:53:22 -0000 1.8
+++ loader.h 12 Dec 2004 05:53:57 -0000 1.9
@@ -18,7 +18,7 @@
#define _LOG4CXX_HELPERS_LOADER_H
#include <log4cxx/helpers/objectptr.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/exception.h>
typedef size_t apr_size_t;
1.6 +1 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- locale.h 11 Dec 2004 04:53:22 -0000 1.5
+++ locale.h 12 Dec 2004 05:53:57 -0000 1.6
@@ -18,7 +18,7 @@
#define _LOG4CXX_HELPERS_LOCALE_H
#include <log4cxx/portability.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
namespace log4cxx
{
1.10 +1 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- loglog.h 11 Dec 2004 04:53:22 -0000 1.9
+++ loglog.h 12 Dec 2004 05:53:57 -0000 1.10
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_LOG_LOG_H
#define _LOG4CXX_HELPERS_LOG_LOG_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <exception>
#include <log4cxx/portability.h>
1.16 +1 -1 logging-log4cxx/include/log4cxx/helpers/object.h
Index: object.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/object.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- object.h 11 Dec 2004 04:53:22 -0000 1.15
+++ object.h 12 Dec 2004 05:53:57 -0000 1.16
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_OBJECT_H
#define _LOG4CXX_HELPERS_OBJECT_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/class.h>
#include <log4cxx/helpers/objectptr.h>
1.15 +1 -1 logging-log4cxx/include/log4cxx/helpers/optionconverter.h
Index: optionconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/optionconverter.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- optionconverter.h 11 Dec 2004 04:53:22 -0000 1.14
+++ optionconverter.h 12 Dec 2004 05:53:57 -0000 1.15
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPER_OPTION_CONVERTER_H
#define _LOG4CXX_HELPER_OPTION_CONVERTER_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
namespace log4cxx
1.14 +1 -1 logging-log4cxx/include/log4cxx/helpers/patternconverter.h
Index: patternconverter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/patternconverter.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- patternconverter.h 11 Dec 2004 04:53:22 -0000 1.13
+++ patternconverter.h 12 Dec 2004 05:53:57 -0000 1.14
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPER_PATTERN_CONVERTER_H
#define _LOG4CXX_HELPER_PATTERN_CONVERTER_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
1.13 +1 -1 logging-log4cxx/include/log4cxx/helpers/patternparser.h
Index: patternparser.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/patternparser.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- patternparser.h 11 Dec 2004 04:53:22 -0000 1.12
+++ patternparser.h 12 Dec 2004 05:53:57 -0000 1.13
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPER_PATTERN_PARSER_H
#define _LOG4CXX_HELPER_PATTERN_PARSER_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/helpers/formattinginfo.h>
1.9 +1 -1 logging-log4cxx/include/log4cxx/helpers/properties.h
Index: properties.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/properties.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- properties.h 11 Dec 2004 04:53:22 -0000 1.8
+++ properties.h 12 Dec 2004 05:53:57 -0000 1.9
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPER_PROPERTIES_H
#define _LOG4CXX_HELPER_PROPERTIES_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
#include <map>
1.10 +1 -1 logging-log4cxx/include/log4cxx/helpers/socket.h
Index: socket.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/socket.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- socket.h 11 Dec 2004 04:53:22 -0000 1.9
+++ socket.h 12 Dec 2004 05:53:57 -0000 1.10
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_SOCKET_H
#define _LOG4CXX_HELPERS_SOCKET_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/socketimpl.h>
#include <log4cxx/helpers/socketinputstream.h>
#include <log4cxx/helpers/socketoutputstream.h>
1.13 +1 -1 logging-log4cxx/include/log4cxx/helpers/socketinputstream.h
Index: socketinputstream.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/socketinputstream.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- socketinputstream.h 11 Dec 2004 04:53:22 -0000 1.12
+++ socketinputstream.h 12 Dec 2004 05:53:57 -0000 1.13
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_SOCKET_INPUT_STREAM_H
#define _LOG4CXX_HELPERS_SOCKET_INPUT_STREAM_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/exception.h>
1.11 +1 -1 logging-log4cxx/include/log4cxx/helpers/socketoutputstream.h
Index: socketoutputstream.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/socketoutputstream.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- socketoutputstream.h 11 Dec 2004 04:53:22 -0000 1.10
+++ socketoutputstream.h 12 Dec 2004 05:53:57 -0000 1.11
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_SOCKET_OUTPUT_STREAM_H
#define _LOG4CXX_HELPERS_SOCKET_OUTPUT_STREAM_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/helpers/objectptr.h>
1.12 +1 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- stringhelper.h 11 Dec 2004 04:53:22 -0000 1.11
+++ stringhelper.h 12 Dec 2004 05:53:57 -0000 1.12
@@ -18,7 +18,7 @@
#define _LOG4CXX_HELPERS_STRING_HELPER_H
#include <log4cxx/portability.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <stdarg.h>
class apr_pool_t;
1.10 +1 -1 logging-log4cxx/include/log4cxx/helpers/stringtokenizer.h
Index: stringtokenizer.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/stringtokenizer.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- stringtokenizer.h 11 Dec 2004 04:53:22 -0000 1.9
+++ stringtokenizer.h 12 Dec 2004 05:53:57 -0000 1.10
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_STRING_TOKENIZER_H
#define _LOG4CXX_HELPERS_STRING_TOKENIZER_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/exception.h>
namespace log4cxx
1.11 +1 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- system.h 11 Dec 2004 04:53:22 -0000 1.10
+++ system.h 12 Dec 2004 05:53:57 -0000 1.11
@@ -18,7 +18,7 @@
#define _LOG4CXX_HELPERS_SYSTEM_H
#include <log4cxx/portability.h>
- #include <log4cxx/string.h>
+ #include <log4cxx/logstring.h>
#include <log4cxx/helpers/exception.h>
namespace log4cxx
1.42 +1 -1 logging-log4cxx/include/log4cxx/helpers/tchar.h
Index: tchar.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/tchar.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- tchar.h 11 Dec 2004 04:53:22 -0000 1.41
+++ tchar.h 12 Dec 2004 05:53:57 -0000 1.42
@@ -76,7 +76,7 @@
* 1. All inclusions of log4cxx/helpers/tchar.h
* and use of TCHAR, log4cxx::String and _T
* were removed from log4cxx.
-* 2. log4cxx/string.h was added to define the
+* 2. log4cxx/logstring.h was added to define the
* implementation character model using the log4cxx::logchar
* and log4cxx::LogString typedefs and LOG4CXX_STR macro.
* 3. Methods commonly used by calling applications were defined
1.8 +1 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- timezone.h 11 Dec 2004 04:53:22 -0000 1.7
+++ timezone.h 12 Dec 2004 05:53:57 -0000 1.8
@@ -18,7 +18,7 @@
#define _LOG4CXX_HELPERS_TIMEZONE_H
#include <log4cxx/portability.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/helpers/objectptr.h>
1.2 +1 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- transcoder.h 11 Dec 2004 04:53:22 -0000 1.1
+++ transcoder.h 12 Dec 2004 05:53:57 -0000 1.2
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_TRANSCODER_H
#define _LOG4CXX_HELPERS_TRANSCODER_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/portability.h>
#include <string.h>
#include <wchar.h>
1.9 +1 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- transform.h 11 Dec 2004 04:53:22 -0000 1.8
+++ transform.h 12 Dec 2004 05:53:57 -0000 1.9
@@ -18,7 +18,7 @@
#define _LOG4CXX_HELPERS_TRANSFORM_H
#include <log4cxx/portability.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
namespace log4cxx
{
1.9 +1 -1 logging-log4cxx/include/log4cxx/helpers/xml.h
Index: xml.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/xml.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xml.h 11 Dec 2004 04:53:22 -0000 1.8
+++ xml.h 12 Dec 2004 05:53:57 -0000 1.9
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_HELPERS_XML_H
#define _LOG4CXX_HELPERS_XML_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/object.h>
#include <log4cxx/helpers/exception.h>
1.4 +1 -1 logging-log4cxx/include/log4cxx/nt/outputdebugstringappender.h
Index: outputdebugstringappender.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/nt/outputdebugstringappender.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- outputdebugstringappender.h 25 Nov 2004 05:18:58 -0000 1.3
+++ outputdebugstringappender.h 12 Dec 2004 05:53:57 -0000 1.4
@@ -40,7 +40,7 @@
virtual void close() {}
- virtual void append(const spi::LoggingEventPtr& event);
+ virtual void append(const spi::LoggingEventPtr& event, apr_pool_t* p);
};
}
}
1.11 +1 -1 logging-log4cxx/include/log4cxx/spi/appenderattachable.h
Index: appenderattachable.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/spi/appenderattachable.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- appenderattachable.h 11 Dec 2004 04:53:24 -0000 1.10
+++ appenderattachable.h 12 Dec 2004 05:53:57 -0000 1.11
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_SPI_APPENDER_ATTACHABLE_H_
#define _LOG4CXX_SPI_APPENDER_ATTACHABLE_H_
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <vector>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/object.h>
1.10 +1 -1 logging-log4cxx/include/log4cxx/spi/configurator.h
Index: configurator.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/spi/configurator.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configurator.h 11 Dec 2004 04:53:24 -0000 1.9
+++ configurator.h 12 Dec 2004 05:53:57 -0000 1.10
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_SPI_CONFIGURATOR_H
#define _LOG4CXX_SPI_CONFIGURATOR_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/object.h>
#include <log4cxx/helpers/objectptr.h>
1.9 +1 -1 logging-log4cxx/include/log4cxx/spi/loggerfactory.h
Index: loggerfactory.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/spi/loggerfactory.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- loggerfactory.h 11 Dec 2004 04:53:24 -0000 1.8
+++ loggerfactory.h 12 Dec 2004 05:53:57 -0000 1.9
@@ -19,7 +19,7 @@
#include <log4cxx/helpers/object.h>
#include <log4cxx/helpers/objectptr.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
namespace log4cxx
{
1.13 +1 -1 logging-log4cxx/include/log4cxx/spi/loggerrepository.h
Index: loggerrepository.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/spi/loggerrepository.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- loggerrepository.h 11 Dec 2004 04:53:24 -0000 1.12
+++ loggerrepository.h 12 Dec 2004 05:53:57 -0000 1.13
@@ -19,7 +19,7 @@
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/object.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <vector>
namespace log4cxx
1.21 +1 -1 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- loggingevent.h 11 Dec 2004 04:53:24 -0000 1.20
+++ loggingevent.h 12 Dec 2004 05:53:57 -0000 1.21
@@ -18,7 +18,7 @@
#define _LOG4CXX_SPI_LOGGING_EVENT_H
#include <log4cxx/helpers/objectptr.h>
-#include <log4cxx//string.h>
+#include <log4cxx/logstring.h>
#include <time.h>
#include <log4cxx/logger.h>
#include <log4cxx/mdc.h>
1.9 +1 -1 logging-log4cxx/include/log4cxx/spi/optionhandler.h
Index: optionhandler.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/spi/optionhandler.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- optionhandler.h 11 Dec 2004 04:53:24 -0000 1.8
+++ optionhandler.h 12 Dec 2004 05:53:57 -0000 1.9
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_SPI_OPTION_HANDLER_H
#define _LOG4CXX_SPI_OPTION_HANDLER_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/object.h>
#include <log4cxx/helpers/objectptr.h>
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- locationinfo.h 11 Dec 2004 04:53:24 -0000 1.5
+++ locationinfo.h 12 Dec 2004 05:53:57 -0000 1.6
@@ -18,7 +18,7 @@
#define _LOG4CXX_SPI_LOCATION_LOCATIONINFO_H
#include <log4cxx/portability.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
class apr_pool_t;
1.21 +1 -1 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- domconfigurator.h 11 Dec 2004 04:53:24 -0000 1.20
+++ domconfigurator.h 12 Dec 2004 05:53:57 -0000 1.21
@@ -21,7 +21,7 @@
#ifdef LOG4CXX_HAVE_XML
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
#include <map>
1.10 +1 -1 logging-log4cxx/performance/nullappender.h
Index: nullappender.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/performance/nullappender.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nullappender.h 11 Dec 2004 05:42:26 -0000 1.9
+++ nullappender.h 12 Dec 2004 05:53:58 -0000 1.10
@@ -18,7 +18,7 @@
#define _LOG4CXX_PERFORMANCE_NULL_APPENDER_H
#include <log4cxx/portability.h>
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/appenderskeleton.h>
1.5 +1 -0 logging-log4cxx/src/cacheddateformat.cpp
Index: cacheddateformat.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/cacheddateformat.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cacheddateformat.cpp 11 Dec 2004 04:53:24 -0000 1.4
+++ cacheddateformat.cpp 12 Dec 2004 05:53:58 -0000 1.5
@@ -21,6 +21,7 @@
#include <apr_time.h>
#include <log4cxx/helpers/pool.h>
+using namespace log4cxx;
using namespace log4cxx::helpers;
CachedDateFormat::CachedDateFormat(DateFormatPtr& formatter) :
1.2 +1 -0 logging-log4cxx/src/file.cpp
Index: file.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/file.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- file.cpp 11 Dec 2004 04:53:25 -0000 1.1
+++ file.cpp 12 Dec 2004 05:53:58 -0000 1.2
@@ -45,6 +45,7 @@
File& File::operator=(const File& src) {
internalName.assign(src.internalName);
mbcsName.assign(src.mbcsName);
+ return *this;
}
1.16 +1 -1 logging-log4cxx/src/hierarchy.cpp
Index: hierarchy.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/hierarchy.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- hierarchy.cpp 11 Dec 2004 04:53:25 -0000 1.15
+++ hierarchy.cpp 12 Dec 2004 05:53:58 -0000 1.16
@@ -293,7 +293,7 @@
LogString substr = name.substr(0, i);
//tcout << _T("UpdateParents processing ") << substr << std::endl;
- LoggerMap::iterator it = loggers.find(substr);
+ LoggerMap::iterator it = loggers.find(substr);
if(it != loggers.end())
{
parentFound = true;
1.4 +7 -7 logging-log4cxx/src/outputdebugstringappender.cpp
Index: outputdebugstringappender.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/outputdebugstringappender.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- outputdebugstringappender.cpp 25 Nov 2004 05:18:58 -0000 1.3
+++ outputdebugstringappender.cpp 12 Dec 2004 05:53:58 -0000 1.4
@@ -16,6 +16,7 @@
#if defined(_WIN32)
#include <log4cxx/nt/outputdebugstringappender.h>
+#include <log4cxx/helpers/transcoder.h>
using namespace log4cxx;
using namespace log4cxx::nt;
@@ -25,14 +26,13 @@
OutputDebugStringAppender::OutputDebugStringAppender() {
}
-void OutputDebugStringAppender::append(const spi::LoggingEventPtr& event)
+void OutputDebugStringAppender::append(const spi::LoggingEventPtr& event, apr_pool_t* p)
{
- StringBuffer oss;
- layout->format(oss, event);
- String sz = oss.str();
- const TCHAR * s = sz.c_str();
-
- ::OutputDebugString(s);
+ LogString buf;
+ layout->format(buf, event, p);
+ std::wstring wstr;
+ log4cxx::helpers::Transcoder::encode(buf, wstr);
+ ::OutputDebugStringW(wstr.c_str());
}
#endif
1.6 +1 -1 logging-log4cxx/tests/src/helpers/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/helpers/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am 26 Nov 2004 07:23:30 -0000 1.5
+++ Makefile.am 12 Dec 2004 05:53:58 -0000 1.6
@@ -12,7 +12,7 @@
cyclicbuffertestcase.cpp\
datetimedateformattestcase.cpp \
iso8601dateformattestcase.cpp \
- optionconvertertestcase.cpp
+ optionconvertertestcase.cpp \
relativetimedateformattestcase.cpp \
stringtokenizertestcase.cpp \
timezonetestcase.cpp
1.5 +1 -1 logging-log4cxx/tests/src/util/compare.h
Index: compare.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/util/compare.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- compare.h 11 Dec 2004 04:53:29 -0000 1.4
+++ compare.h 12 Dec 2004 05:53:58 -0000 1.5
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
class apr_pool_t;
namespace log4cxx
1.8 +1 -1 logging-log4cxx/tests/src/util/filter.h
Index: filter.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/tests/src/util/filter.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- filter.h 11 Dec 2004 04:53:29 -0000 1.7
+++ filter.h 12 Dec 2004 05:53:58 -0000 1.8
@@ -17,7 +17,7 @@
#ifndef _LOG4CXX_TESTS_UTIL_FILTER_H
#define _LOG4CXX_TESTS_UTIL_FILTER_H
-#include <log4cxx/string.h>
+#include <log4cxx/logstring.h>
#include <log4cxx/helpers/exception.h>
#define BASIC_PAT LOG4CXX_STR("\\[\\d*\\] (FATAL|ERROR|WARN|INFO|DEBUG)")