latest changes from main rep

CHANGELOG

@@ -1,6 +1,6 @@
 This is the changelog file for the POCO C++ Libraries.
 
-Release 1.3-20070501 (2007-05-01)
+Release 1.3-20070504 (2007-05-04)
 =================================
 
 - added HashMap, HashSet classes
@@ -77,6 +77,12 @@ Release 1.3-20070501 (2007-05-01)
   (see http://www.appinf.com/poco/wiki/tiki-view_forum_thread.php?comments_parentId=343&forumId=6)
 - robustness improvements to ActiveMethod - removed the opportunity for memory leaks in 
   case something goes while invoking the method
+- made C library usage more C++-like - use C++ headers (e.g. <cstring>) instead of 
+  C ones (<string.h>). Also, use C library functions in std namespace.
+- added Unicode and UTF8String for improved Unicode support.
+  The Unicode class can be used to obtain the Unicode properties of a character.
+  The UTF8 class provides case insensitive comparison and case conversion
+  for UTF-8 encoded strings.
 
 
 Release 1.2.9 (2007-02-26)
@@ -723,4 +729,4 @@ building the libraries.
 
 
 --
-$Id: //poco/Main/dist/CHANGELOG#55 $
+$Id: //poco/Main/dist/CHANGELOG#56 $

Util/src/IniFileConfiguration.cpp

@@ -1,7 +1,7 @@
 //
 // IniFileConfiguration.cpp
 //
-// $Id: //poco/Main/Util/src/IniFileConfiguration.cpp#8 $
+// $Id: //poco/Main/Util/src/IniFileConfiguration.cpp#9 $
 //
 // Library: Util
 // Package: Configuration
@@ -39,7 +39,7 @@
 #include "Poco/String.h"
 #include "Poco/Path.h"
 #include "Poco/FileStream.h"
-#include <locale>
+#include <cctype>
 #include <set>
 
 
@@ -148,10 +148,9 @@ bool IniFileConfiguration::ICompare::operator () (const std::string& s1, const s
 void IniFileConfiguration::parseLine(std::istream& istr)
 {
 	static const int eof = std::char_traits<char>::eof(); 
-	std::locale loc;
 
 	int c = istr.get();
-	while (c != eof && isspace((char) c, loc)) c = istr.get();
+	while (c != eof && std::isspace((char) c)) c = istr.get();
 	if (c != eof)
 	{
 		if (c == ';')

Util/src/PropertyFileConfiguration.cpp

@@ -1,7 +1,7 @@
 //
 // PropertyFileConfiguration.cpp
 //
-// $Id: //poco/Main/Util/src/PropertyFileConfiguration.cpp#8 $
+// $Id: //poco/Main/Util/src/PropertyFileConfiguration.cpp#9 $
 //
 // Library: Util
 // Package: Configuration
@@ -39,7 +39,7 @@
 #include "Poco/String.h"
 #include "Poco/Path.h"
 #include "Poco/FileStream.h"
-#include <locale>
+#include <cctype>
 
 
 using Poco::trim;
@@ -120,10 +120,9 @@ void PropertyFileConfiguration::save(const std::string& path) const
 void PropertyFileConfiguration::parseLine(std::istream& istr)
 {
 	static const int eof = std::char_traits<char>::eof(); 
-	std::locale loc;
 
 	int c = istr.get();
-	while (c != eof && isspace((char) c, loc)) c = istr.get();
+	while (c != eof && std::isspace((char) c)) c = istr.get();
 	if (c != eof)
 	{
 		if (c == '#' || c == '!')

Util/src/ServerApplication.cpp

@@ -1,7 +1,7 @@
 //
 // ServerApplication.cpp
 //
-// $Id: //poco/Main/Util/src/ServerApplication.cpp#20 $
+// $Id: //poco/Main/Util/src/ServerApplication.cpp#21 $
 //
 // Library: Util
 // Package: Application
@@ -51,7 +51,7 @@
 #elif defined(POCO_OS_FAMILY_WINDOWS)
 #include "Poco/Util/WinService.h"
 #include <windows.h>
-#include <string.h>
+#include <cstring>
 #endif
 #if defined(POCO_WIN32_UTF8)
 #include "Poco/UnicodeConverter.h"
@@ -80,7 +80,7 @@ ServerApplication::ServerApplication()
 {
 #if defined(POCO_OS_FAMILY_WINDOWS)
 	_action = SRV_RUN;
-	memset(&_serviceStatus, 0, sizeof(_serviceStatus));
+	std::memset(&_serviceStatus, 0, sizeof(_serviceStatus));
 #endif
 }
 

Util/testsuite/src/LoggingConfiguratorTest.cpp

@@ -1,7 +1,7 @@
 //
 // LoggingConfiguratorTest.cpp
 //
-// $Id: //poco/Main/Util/testsuite/src/LoggingConfiguratorTest.cpp#5 $
+// $Id: //poco/Main/Util/testsuite/src/LoggingConfiguratorTest.cpp#6 $
 //
 // Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
 // and Contributors.
@@ -37,6 +37,9 @@
 #include "Poco/Util/PropertyFileConfiguration.h"
 #include "Poco/LoggingRegistry.h"
 #include "Poco/ConsoleChannel.h"
+#if defined(_WIN32)
+#include "Poco/WindowsConsoleChannel.h"
+#endif
 #include "Poco/FileChannel.h"
 #include "Poco/SplitterChannel.h"
 #include "Poco/FormattingChannel.h"
@@ -108,7 +111,11 @@ void LoggingConfiguratorTest::testConfigurator()
 	assert (root.getLevel() == Message::PRIO_WARNING);
 	FormattingChannel* pFC = dynamic_cast<FormattingChannel*>(root.getChannel());
 	assertNotNull (pFC);
+#if defined(_WIN32)
+	assertNotNull (dynamic_cast<Poco::WindowsConsoleChannel*>(pFC->getChannel()));
+#else
 	assertNotNull (dynamic_cast<ConsoleChannel*>(pFC->getChannel()));
+#endif
 	assertNotNull (dynamic_cast<PatternFormatter*>(pFC->getFormatter()));
 	assert (static_cast<PatternFormatter*>(pFC->getFormatter())->getProperty("pattern") == "%s-[%p] %t");
 	

XML/src/ParserEngine.cpp

@@ -1,7 +1,7 @@
 //
 // ParserEngine.cpp
 //
-// $Id: //poco/Main/XML/src/ParserEngine.cpp#14 $
+// $Id: //poco/Main/XML/src/ParserEngine.cpp#15 $
 //
 // Library: XML
 // Package: XML
@@ -49,7 +49,7 @@
 #include "Poco/SAX/LocatorImpl.h"
 #include "Poco/SAX/SAXException.h"
 #include "Poco/URI.h"
-#include <string.h>
+#include <cstring>
 
 
 using Poco::URI;
@@ -728,10 +728,10 @@ void ParserEngine::handleComment(void* userData, const XML_Char* data)
 
 #if defined(XML_UNICODE_WCHAR_T)
 	if (pThis->_pLexicalHandler)
-		pThis->_pLexicalHandler->comment(data, 0, (int) wcslen(data));
+		pThis->_pLexicalHandler->comment(data, 0, (int) std::wcslen(data));
 #else
 	if (pThis->_pLexicalHandler)
-		pThis->_pLexicalHandler->comment(data, 0, (int) strlen(data));
+		pThis->_pLexicalHandler->comment(data, 0, (int) std::strlen(data));
 #endif
 }