svn commit: r525393 - in /logging/log4cxx/trunk: examples/console.cpp examples/delayedloop.cpp examples/stream.cpp examples/trivial.cpp performance/main.cpp tests/src/main.cpp

[carnold]

Author: carnold
Date: Tue Apr  3 21:19:28 2007
New Revision: 525393

URL: http://svn.apache.org/viewvc?view=rev&rev=525393
Log:
LOGCXX-167: Examples and unit tests do not call setlocale

Modified:
    logging/log4cxx/trunk/examples/console.cpp
    logging/log4cxx/trunk/examples/delayedloop.cpp
    logging/log4cxx/trunk/examples/stream.cpp
    logging/log4cxx/trunk/examples/trivial.cpp
    logging/log4cxx/trunk/performance/main.cpp
    logging/log4cxx/trunk/tests/src/main.cpp

Modified: logging/log4cxx/trunk/examples/console.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/examples/console.cpp?view=diff&rev=525393&r1=525392&r2=525393
==============================================================================
--- logging/log4cxx/trunk/examples/console.cpp (original)
+++ logging/log4cxx/trunk/examples/console.cpp Tue Apr  3 21:19:28 2007
@@ -21,6 +21,7 @@
 #include <log4cxx/simplelayout.h>
 #include <log4cxx/logmanager.h>
 #include <iostream>
+#include <locale.h>
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;
@@ -52,6 +53,7 @@
  */
 int main(int argc, char** argv)
 {
+    setlocale(LC_ALL, "");
     if (argc <= 1) {
         puts("Console test program\nUsage: console [-err] [ puts | putws | 
cout | wcout | configure | log | wide | byte ]*\n");  
     }

Modified: logging/log4cxx/trunk/examples/delayedloop.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/examples/delayedloop.cpp?view=diff&rev=525393&r1=525392&r2=525393
==============================================================================
--- logging/log4cxx/trunk/examples/delayedloop.cpp (original)
+++ logging/log4cxx/trunk/examples/delayedloop.cpp Tue Apr  3 21:19:28 2007
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <log4cxx/stream.h>
 #include <exception>
+#include <locale.h>
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;
@@ -90,6 +91,13 @@
                 }
         }
 };
+
+static class LocaleSetter {
+    public:
+    LocaleSetter() {
+       setlocale(LC_ALL, "");
+    }
+} localeSetter;
 
 LoggerPtr DelayedLoop::logger = Logger::getLogger("DelayedLoop");
 

Modified: logging/log4cxx/trunk/examples/stream.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/examples/stream.cpp?view=diff&rev=525393&r1=525392&r2=525393
==============================================================================
--- logging/log4cxx/trunk/examples/stream.cpp (original)
+++ logging/log4cxx/trunk/examples/stream.cpp Tue Apr  3 21:19:28 2007
@@ -20,12 +20,14 @@
 #include <log4cxx/basicconfigurator.h>
 #include <log4cxx/helpers/exception.h>
 #include <log4cxx/ndc.h>
+#include <locale.h>
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;
 
 int main()
 {
+    setlocale(LC_ALL, "");
     int result = EXIT_SUCCESS;
     try
     {

Modified: logging/log4cxx/trunk/examples/trivial.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/examples/trivial.cpp?view=diff&rev=525393&r1=525392&r2=525393
==============================================================================
--- logging/log4cxx/trunk/examples/trivial.cpp (original)
+++ logging/log4cxx/trunk/examples/trivial.cpp Tue Apr  3 21:19:28 2007
@@ -20,12 +20,14 @@
 #include <log4cxx/basicconfigurator.h>
 #include <log4cxx/helpers/exception.h>
 #include <log4cxx/ndc.h>
+#include <locale.h>
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;
 
 int main()
 {
+    setlocale(LC_ALL, "");
     int result = EXIT_SUCCESS;
     try
     {

Modified: logging/log4cxx/trunk/performance/main.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/performance/main.cpp?view=diff&rev=525393&r1=525392&r2=525393
==============================================================================
--- logging/log4cxx/trunk/performance/main.cpp (original)
+++ logging/log4cxx/trunk/performance/main.cpp Tue Apr  3 21:19:28 2007
@@ -29,6 +29,7 @@
 #include <log4cxx/helpers/pool.h>
 #include <log4cxx/xml/domconfigurator.h>
 #include <log4cxx/stream.h>
+#include <locale.h>
 
 using namespace log4cxx;
 using namespace log4cxx::helpers;
@@ -191,6 +192,7 @@
 
 int main(int argc, const char* const argv[])
 {
+        setlocale(LC_ALL, "");
         apr_app_initialize(&argc, &argv, NULL);
         std::vector<LogString> args(argc - 1);
         for (int i = 1; i < argc; i++) {

Modified: logging/log4cxx/trunk/tests/src/main.cpp
URL: 
http://svn.apache.org/viewvc/logging/log4cxx/trunk/tests/src/main.cpp?view=diff&rev=525393&r1=525392&r2=525393
==============================================================================
--- logging/log4cxx/trunk/tests/src/main.cpp (original)
+++ logging/log4cxx/trunk/tests/src/main.cpp Tue Apr  3 21:19:28 2007
@@ -36,6 +36,7 @@
 #include <iostream>
 #include <stdexcept>
 #include <log4cxx/basicconfigurator.h>
+#include <locale.h>
 
 #include <log4cxx/log4cxx.h>
 #define LOG4CXX_TEST 1
@@ -60,6 +61,7 @@
 int wmain(int argc, const wchar_t* const * wargv) {
     char** argv = new char*[argc];
     {
+        setlocale(LC_ALL, "");
         for(int i = 0; i < argc; i++) {
             size_t len = wcslen(wargv[i]) + 1;
             argv[i] = new char[len];
@@ -74,6 +76,7 @@
     apr_app_initialize(&argc, (const char* const **) &argv, NULL);
 #else
 int main(int argc, const char* const * argv) {
+        setlocale(LC_ALL, "");
         apr_app_initialize(&argc, &argv, NULL);
 #endif
         CppUnit::TextUi::TestRunner runner;