generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-30 13:47:10 +01:00
Code Issues Projects Releases Wiki Activity

- fix of the Timer fix from rev. 1953

Browse Source 
- improved UTFString definitions
- allow empty Glob (testMatchEmptyPattern() failing)
- fixed SF#3535990: POCO_HAVE_IPv6 without POCO_WIN32_UTF8 conflict
This commit is contained in:
Aleksandar Fabijanic
2012-08-18 21:09:50 +00:00
parent e4baf46d7b
commit 88134859e4
6 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@@ -18,9 +18,9 @@ Release 1.5.0 (2012-08-??)
- fixed SF#3538780: SocketAddress needs operator < function - fixed SF#3538780: SocketAddress needs operator < function
- fixed SF#3538775: Issues building on Fedora/Centos, etc. for AMD64 - fixed SF#3538775: Issues building on Fedora/Centos, etc. for AMD64
- fixed SF#3538786: Use size_t for describing data-blocks in DigestEngine - fixed SF#3538786: Use size_t for describing data-blocks in DigestEngine
- IPAddress bitwise operators (&,|,^,~) - added IPAddress bitwise operators (&,|,^,~)
- IPAddress BinaryReader/Writer << and >> operators - added IPAddress BinaryReader/Writer << and >> operators
- IPAddress force IPv6 always lowercase (RFC 5952) - modified IPAddress to force IPv6 to lowercase (RFC 5952)
- fixed SF#3538785: SMTPClientSession::sendMessage() should take recipient list - fixed SF#3538785: SMTPClientSession::sendMessage() should take recipient list
- added IPAddress::prefixLength() - added IPAddress::prefixLength()
- UTF portability improvements - UTF portability improvements
@@ -28,6 +28,7 @@ Release 1.5.0 (2012-08-??)
- added IPAddress RFC 4291 compatible site-local prefix support - added IPAddress RFC 4291 compatible site-local prefix support
- fixed SF# 3012166: IPv6 patch - fixed SF# 3012166: IPv6 patch
- added SF# 3558085: Add formatter to MACAddress object - added SF# 3558085: Add formatter to MACAddress object
- fixed SF# 3535990: POCO_HAVE_IPv6 without POCO_WIN32_UTF8 conflict
Release 1.4.4 (2012-08-??) Release 1.4.4 (2012-08-??)
========================== ==========================

17
Foundation/include/Poco/UTFString.h
View File

@@ -48,13 +48,19 @@ namespace Poco {
// UTF string types // UTF string types
#ifndef POCO_NO_WSTRING
//#if defined(POCO_ENABLE_CPP11) //TODO //#if defined(POCO_ENABLE_CPP11) //TODO
// typedef char16_t UTF16Char; // typedef char16_t UTF16Char;
// typedef std::u16string UTF16String; // typedef std::u16string UTF16String;
// typedef char32_t UTF32Char; // typedef char32_t UTF32Char;
// typedef std::u32string UTF32String; // typedef std::u32string UTF32String;
//#else //#else
#ifdef POCO_NO_WSTRING
typedef Poco::UInt16 UTF16Char;
typedef std::basic_string<UInt16> UTF16String;
typedef UInt32 UTF32Char;
typedef std::basic_string<UInt32> UTF32String;
#else // POCO_NO_WSTRING
#if defined(POCO_OS_FAMILY_WINDOWS) #if defined(POCO_OS_FAMILY_WINDOWS)
typedef wchar_t UTF16Char; typedef wchar_t UTF16Char;
typedef std::wstring UTF16String; typedef std::wstring UTF16String;
@@ -78,9 +84,8 @@ namespace Poco {
typedef wchar_t UTF32Char; typedef wchar_t UTF32Char;
typedef std::wstring UTF32String; typedef std::wstring UTF32String;
#endif //POCO_OS_FAMILY_WINDOWS #endif //POCO_OS_FAMILY_WINDOWS
//#endif // POCO_ENABLE_CPP11 #endif //POCO_NO_WSTRING
#endif //POCO_NO_WSTRING //#endif // POCO_ENABLE_CPP11
} // namespace Poco } // namespace Poco

1
Foundation/src/Glob.cpp
View File

@@ -49,7 +49,6 @@ namespace Poco {
Glob::Glob(const std::string& pattern, int options) Glob::Glob(const std::string& pattern, int options)
: _pattern(pattern), _options(options) : _pattern(pattern), _options(options)
{ {
poco_assert(!_pattern.empty());
} }

4
Foundation/src/Timer.cpp
View File

@@ -178,7 +178,7 @@ void Timer::run()
sleep = 0; sleep = 0;
break; break;
} }
_nextInvocation += static_cast<Timestamp::TimeVal>(_startInterval)*1000; _nextInvocation += static_cast<Timestamp::TimeVal>(interval)*1000;
++_skipped; ++_skipped;
} }
} }
@@ -210,7 +210,7 @@ void Timer::run()
} }
interval = _periodicInterval; interval = _periodicInterval;
} }
_nextInvocation += static_cast<Timestamp::TimeVal>(_startInterval)*1000; _nextInvocation += static_cast<Timestamp::TimeVal>(interval)*1000;
_skipped = 0; _skipped = 0;
} }
while (interval > 0); while (interval > 0);

2
Foundation/testsuite/src/TimerTest.cpp
View File

@@ -65,7 +65,7 @@ void TimerTest::testTimer()
t.start(tc); t.start(tc);
_event.wait(); _event.wait();
sw.stop(); sw.stop();
assert (sw.elapsed() >= 80000 && sw.elapsed() < 250000); assert (sw.elapsed() >= 80000 && sw.elapsed() < 120000);
sw.restart(); sw.restart();
_event.wait(); _event.wait();
sw.stop(); sw.stop();

12
Net/src/NetworkInterface.cpp
View File

@@ -41,11 +41,11 @@
#include "Poco/RefCountedObject.h" #include "Poco/RefCountedObject.h"
#include "Poco/Format.h" #include "Poco/Format.h"
#if defined(POCO_OS_FAMILY_WINDOWS) #if defined(POCO_OS_FAMILY_WINDOWS)
#if defined(POCO_WIN32_UTF8) #if defined(POCO_WIN32_UTF8)
#include "Poco/UnicodeConverter.h" #include "Poco/UnicodeConverter.h"
#endif #endif
#include <iphlpapi.h> #include <iphlpapi.h>
#include <ipifcons.h> #include <ipifcons.h>
#endif #endif
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
@@ -997,7 +997,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
Poco::UnicodeConverter::toUTF8(pAddress->FriendlyName, displayName); Poco::UnicodeConverter::toUTF8(pAddress->FriendlyName, displayName);
#else #else
char displayNameBuffer[1024]; char displayNameBuffer[1024];
int rc = WideCharToMultiByte(CP_ACP, WC_DEFAULTCHAR, pAddress->FriendlyName, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL); int rc = WideCharToMultiByte(CP_ACP, 0, pAddress->FriendlyName, -1, displayNameBuffer, sizeof(displayNameBuffer), NULL, NULL);
if (rc) displayName = displayNameBuffer; if (rc) displayName = displayNameBuffer;
#endif #endif