generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-15 15:16:49 +02:00
Code Issues Projects Releases Wiki Activity

WinCE fixes

Browse Source
This commit is contained in:
Guenter Obiltschnig
2012-10-15 09:29:26 +00:00
parent dc11b4aa65
commit b6963f0bc9
10 changed files with 157 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
Foundation/Foundation_CE_vs90.vcproj
View File

@@ -577,6 +577,10 @@
RelativePath=".\src\DeflatingStream.cpp" RelativePath=".\src\DeflatingStream.cpp"
> >
</File> </File>
<File
RelativePath=".\src\FIFOBufferStream.cpp"
>
</File>
<File <File
RelativePath=".\src\FileStream.cpp" RelativePath=".\src\FileStream.cpp"
> >
@@ -765,6 +769,10 @@
RelativePath=".\include\Poco\DeflatingStream.h" RelativePath=".\include\Poco\DeflatingStream.h"
> >
</File> </File>
<File
RelativePath=".\include\Poco\FIFOBufferStream.h"
>
</File>
<File <File
RelativePath=".\include\Poco\FileStream.h" RelativePath=".\include\Poco\FileStream.h"
> >
@@ -2934,14 +2942,6 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="Resource Files"
>
<File
RelativePath=".\src\pocomsg.rc"
>
</File>
</Filter>
</Filter> </Filter>
<Filter <Filter
Name="Notifications" Name="Notifications"
@@ -5273,6 +5273,10 @@
RelativePath=".\src\Latin1Encoding.cpp" RelativePath=".\src\Latin1Encoding.cpp"
> >
</File> </File>
<File
RelativePath=".\src\Latin2Encoding.cpp"
>
</File>
<File <File
RelativePath=".\src\Latin9Encoding.cpp" RelativePath=".\src\Latin9Encoding.cpp"
> >
@@ -5309,6 +5313,10 @@
RelativePath=".\src\UTF16Encoding.cpp" RelativePath=".\src\UTF16Encoding.cpp"
> >
</File> </File>
<File
RelativePath=".\src\UTF32Encoding.cpp"
>
</File>
<File <File
RelativePath=".\src\UTF8Encoding.cpp" RelativePath=".\src\UTF8Encoding.cpp"
> >
@@ -5317,6 +5325,14 @@
RelativePath=".\src\UTF8String.cpp" RelativePath=".\src\UTF8String.cpp"
> >
</File> </File>
<File
RelativePath=".\src\Windows1250Encoding.cpp"
>
</File>
<File
RelativePath=".\src\Windows1251Encoding.cpp"
>
</File>
<File <File
RelativePath=".\src\Windows1252Encoding.cpp" RelativePath=".\src\Windows1252Encoding.cpp"
> >
@@ -5337,6 +5353,10 @@
RelativePath=".\include\Poco\Latin1Encoding.h" RelativePath=".\include\Poco\Latin1Encoding.h"
> >
</File> </File>
<File
RelativePath=".\include\Poco\Latin2Encoding.h"
>
</File>
<File <File
RelativePath=".\include\Poco\Latin9Encoding.h" RelativePath=".\include\Poco\Latin9Encoding.h"
> >
@@ -5373,6 +5393,10 @@
RelativePath=".\include\Poco\UTF16Encoding.h" RelativePath=".\include\Poco\UTF16Encoding.h"
> >
</File> </File>
<File
RelativePath=".\include\Poco\UTF32Encoding.h"
>
</File>
<File <File
RelativePath=".\include\Poco\UTF8Encoding.h" RelativePath=".\include\Poco\UTF8Encoding.h"
> >
@@ -5381,6 +5405,14 @@
RelativePath=".\include\Poco\UTF8String.h" RelativePath=".\include\Poco\UTF8String.h"
> >
</File> </File>
<File
RelativePath=".\include\Poco\Windows1250Encoding.h"
>
</File>
<File
RelativePath=".\include\Poco\Windows1251Encoding.h"
>
</File>
<File <File
RelativePath=".\include\Poco\Windows1252Encoding.h" RelativePath=".\include\Poco\Windows1252Encoding.h"
> >
@@ -5905,14 +5937,6 @@
RelativePath=".\src\Debugger.cpp" RelativePath=".\src\Debugger.cpp"
> >
</File> </File>
<File
RelativePath=".\src\DynamicAny.cpp"
>
</File>
<File
RelativePath=".\src\DynamicAnyHolder.cpp"
>
</File>
<File <File
RelativePath=".\src\Environment.cpp" RelativePath=".\src\Environment.cpp"
> >
@@ -6489,6 +6513,10 @@
RelativePath=".\include\Poco\Any.h" RelativePath=".\include\Poco\Any.h"
> >
</File> </File>
<File
RelativePath=".\include\Poco\Array.h"
>
</File>
<File <File
RelativePath=".\include\Poco\AtomicCounter.h" RelativePath=".\include\Poco\AtomicCounter.h"
> >
@@ -6525,14 +6553,6 @@
RelativePath=".\include\Poco\Debugger.h" RelativePath=".\include\Poco\Debugger.h"
> >
</File> </File>
<File
RelativePath=".\include\Poco\DynamicAny.h"
>
</File>
<File
RelativePath=".\include\Poco\DynamicAnyHolder.h"
>
</File>
<File <File
RelativePath=".\include\Poco\DynamicFactory.h" RelativePath=".\include\Poco\DynamicFactory.h"
> >
@@ -6637,6 +6657,10 @@
RelativePath=".\include\Poco\NumericString.h" RelativePath=".\include\Poco\NumericString.h"
> >
</File> </File>
<File
RelativePath=".\include\Poco\ObjectPool.h"
>
</File>
<File <File
RelativePath=".\include\Poco\Platform.h" RelativePath=".\include\Poco\Platform.h"
> >
@@ -6693,6 +6717,10 @@
RelativePath=".\include\Poco\UnWindows.h" RelativePath=".\include\Poco\UnWindows.h"
> >
</File> </File>
<File
RelativePath=".\include\Poco\UTFString.h"
>
</File>
<File <File
RelativePath=".\include\Poco\Version.h" RelativePath=".\include\Poco\Version.h"
> >
@@ -6703,42 +6731,42 @@
</File> </File>
</Filter> </Filter>
</Filter> </Filter>
<File <Filter
RelativePath="..\DLLVersion.rc" Name="Dynamic"
> >
<FileConfiguration <Filter
Name="debug_static_mt|Digi JumpStart (ARMV4I)" Name="Header Files"
ExcludedFromBuild="true"
> >
<Tool <File
Name="VCResourceCompilerTool" RelativePath=".\include\Poco\Dynamic\Pair.h"
/> >
</FileConfiguration> </File>
<FileConfiguration <File
Name="release_static_mt|Digi JumpStart (ARMV4I)" RelativePath=".\include\Poco\Dynamic\Struct.h"
ExcludedFromBuild="true" >
</File>
<File
RelativePath=".\include\Poco\Dynamic\Var.h"
>
</File>
<File
RelativePath=".\include\Poco\Dynamic\VarHolder.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
> >
<Tool <File
Name="VCResourceCompilerTool" RelativePath=".\src\Var.cpp"
/> >
</FileConfiguration> </File>
<FileConfiguration <File
Name="debug_static_md|Digi JumpStart (ARMV4I)" RelativePath=".\src\VarHolder.cpp"
ExcludedFromBuild="true" >
> </File>
<Tool </Filter>
Name="VCResourceCompilerTool" </Filter>
/>
</FileConfiguration>
<FileConfiguration
Name="release_static_md|Digi JumpStart (ARMV4I)"
ExcludedFromBuild="true"
>
<Tool
Name="VCResourceCompilerTool"
/>
</FileConfiguration>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

7
Foundation/include/Poco/Config.h
View File

@@ -43,7 +43,6 @@
// Define to enable Windows Unicode (UTF-8) support // Define to enable Windows Unicode (UTF-8) support
#define POCO_WIN32_UTF8 #define POCO_WIN32_UTF8
// Define to enable C++11 support // Define to enable C++11 support
//#define POCO_ENABLE_CPP11 //#define POCO_ENABLE_CPP11
@@ -132,4 +131,10 @@
// #define POCO_NET_NO_IPv6 // #define POCO_NET_NO_IPv6
// Windows CE has no locale support
#if defined(_WIN32_WCE)
#define POCO_NO_LOCALE
#endif
#endif // Foundation_Config_INCLUDED #endif // Foundation_Config_INCLUDED

2
Foundation/include/Poco/NumericString.h
View File

@@ -50,7 +50,9 @@
#endif #endif
#include <limits> #include <limits>
#include <cmath> #include <cmath>
#if !defined(POCO_NO_LOCALE)
#include <locale> #include <locale>
#endif
namespace Poco { namespace Poco {

4
Foundation/include/Poco/zconf.h
View File

@@ -421,7 +421,9 @@ typedef uLong FAR uLongf;
#ifdef STDC #ifdef STDC
# ifndef Z_SOLO # ifndef Z_SOLO
# include <sys/types.h> /* for off_t */ # ifndef _WIN32_WCE
# include <sys/types.h> /* for off_t */
# endif
# endif # endif
#endif #endif

4
Foundation/src/gzguts.h
View File

@@ -32,7 +32,9 @@
#endif #endif
#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32) #if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
# include <io.h> # if !defined(_WIN32_WCE)
# include <io.h>
# endif
#endif #endif
#ifdef NO_DEFLATE /* for compatibility with old definition */ #ifdef NO_DEFLATE /* for compatibility with old definition */

4
Foundation/src/zconf.h
View File

@@ -421,7 +421,9 @@ typedef uLong FAR uLongf;
#ifdef STDC #ifdef STDC
# ifndef Z_SOLO # ifndef Z_SOLO
# include <sys/types.h> /* for off_t */ # ifndef _WIN32_WCE
# include <sys/types.h> /* for off_t */
# endif
# endif # endif
#endif #endif

53
Foundation/testsuite/TestSuite_CE_vs90.vcproj
View File

@@ -590,6 +590,10 @@
RelativePath=".\src\AnyTest.cpp" RelativePath=".\src\AnyTest.cpp"
> >
</File> </File>
<File
RelativePath=".\src\ArrayTest.cpp"
>
</File>
<File <File
RelativePath=".\src\AutoPtrTest.cpp" RelativePath=".\src\AutoPtrTest.cpp"
> >
@@ -610,10 +614,6 @@
RelativePath=".\src\CoreTestSuite.cpp" RelativePath=".\src\CoreTestSuite.cpp"
> >
</File> </File>
<File
RelativePath=".\src\DynamicAnyTest.cpp"
>
</File>
<File <File
RelativePath=".\src\DynamicFactoryTest.cpp" RelativePath=".\src\DynamicFactoryTest.cpp"
> >
@@ -649,6 +649,7 @@
<File <File
RelativePath=".\src\ObjectPoolTest.cpp" RelativePath=".\src\ObjectPoolTest.cpp"
> >
</File>
<File <File
RelativePath=".\src\RegularExpressionTest.cpp" RelativePath=".\src\RegularExpressionTest.cpp"
> >
@@ -681,6 +682,10 @@
RelativePath=".\src\AnyTest.h" RelativePath=".\src\AnyTest.h"
> >
</File> </File>
<File
RelativePath=".\src\ArrayTest.h"
>
</File>
<File <File
RelativePath=".\src\AutoPtrTest.h" RelativePath=".\src\AutoPtrTest.h"
> >
@@ -701,10 +706,6 @@
RelativePath=".\src\CoreTestSuite.h" RelativePath=".\src\CoreTestSuite.h"
> >
</File> </File>
<File
RelativePath=".\src\DynamicAnyTest.h"
>
</File>
<File <File
RelativePath=".\src\DynamicFactoryTest.h" RelativePath=".\src\DynamicFactoryTest.h"
> >
@@ -785,6 +786,10 @@
RelativePath=".\src\CountingStreamTest.cpp" RelativePath=".\src\CountingStreamTest.cpp"
> >
</File> </File>
<File
RelativePath=".\src\FIFOBufferStreamTest.cpp"
>
</File>
<File <File
RelativePath=".\src\FileStreamTest.cpp" RelativePath=".\src\FileStreamTest.cpp"
> >
@@ -841,6 +846,10 @@
RelativePath=".\src\CountingStreamTest.h" RelativePath=".\src\CountingStreamTest.h"
> >
</File> </File>
<File
RelativePath=".\src\FIFOBufferStreamTest.h"
>
</File>
<File <File
RelativePath=".\src\FileStreamTest.h" RelativePath=".\src\FileStreamTest.h"
> >
@@ -1835,6 +1844,34 @@
</File> </File>
</Filter> </Filter>
</Filter> </Filter>
<Filter
Name="Dynamic"
>
<Filter
Name="Header Files"
>
<File
RelativePath=".\src\DynamicTestSuite.h"
>
</File>
<File
RelativePath=".\src\VarTest.h"
>
</File>
</Filter>
<Filter
Name="Source Files"
>
<File
RelativePath=".\src\DynamicTestSuite.cpp"
>
</File>
<File
RelativePath=".\src\VarTest.cpp"
>
</File>
</Filter>
</Filter>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

3
Foundation/testsuite/src/PathTest.cpp
View File

@@ -42,7 +42,6 @@
using Poco::Path; using Poco::Path;
using Poco::PathSyntaxException; using Poco::PathSyntaxException;
using Poco::Random;
using Poco::Environment; using Poco::Environment;
@@ -1458,7 +1457,7 @@ void PathTest::testAbsolute()
void PathTest::testRobustness() void PathTest::testRobustness()
{ {
Random r; Poco::Random r;
for (int i = 0; i < 256; ++i) for (int i = 0; i < 256; ++i)
{ {
int len = r.next(1024); int len = r.next(1024);

15
Foundation/testsuite/src/RandomTest.cpp
View File

@@ -38,7 +38,6 @@
#include <cmath> #include <cmath>
using Poco::Random;
using Poco::UInt32; using Poco::UInt32;
@@ -54,8 +53,8 @@ RandomTest::~RandomTest()
void RandomTest::testSequence1() void RandomTest::testSequence1()
{ {
Random rnd1; Poco::Random rnd1;
Random rnd2; Poco::Random rnd2;
rnd1.seed(12345); rnd1.seed(12345);
rnd2.seed(12345); rnd2.seed(12345);
for (int i = 0; i < 100; ++i) for (int i = 0; i < 100; ++i)
@@ -67,8 +66,8 @@ void RandomTest::testSequence1()
void RandomTest::testSequence2() void RandomTest::testSequence2()
{ {
Random rnd1; Poco::Random rnd1;
Random rnd2; Poco::Random rnd2;
rnd1.seed(12345); rnd1.seed(12345);
rnd2.seed(54321); rnd2.seed(54321);
@@ -87,7 +86,7 @@ void RandomTest::testSequence2()
void RandomTest::testDistribution1() void RandomTest::testDistribution1()
{ {
Random rnd; Poco::Random rnd;
rnd.seed(123456); rnd.seed(123456);
const int n = 11; const int n = 11;
int d[n] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; int d[n] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -104,7 +103,7 @@ void RandomTest::testDistribution1()
void RandomTest::testDistribution2() void RandomTest::testDistribution2()
{ {
Random rnd; Poco::Random rnd;
rnd.seed(); rnd.seed();
const int n = 101; const int n = 101;
std::vector<int> d(n, 0); std::vector<int> d(n, 0);
@@ -127,7 +126,7 @@ void RandomTest::testDistribution2()
void RandomTest::testDistribution3() void RandomTest::testDistribution3()
{ {
Random rnd; Poco::Random rnd;
rnd.seed(); rnd.seed();
const int n = 101; const int n = 101;
std::vector<int> d(n, 0); std::vector<int> d(n, 0);

4
Foundation/testsuite/src/TuplesTest.cpp
View File

@@ -557,8 +557,8 @@ void TuplesTest::testTupleOrder()
void TuplesTest::testMemOverhead() void TuplesTest::testMemOverhead()
{ {
Tuple<short> small(0); Tuple<short> smallOne(0);
int sz = sizeof(small); int sz = sizeof(smallOne);
assert (sz == 4 || sz == 8); //depending on architecture and alignment assert (sz == 4 || sz == 8); //depending on architecture and alignment
Tuple<long> notSoSmall(0); Tuple<long> notSoSmall(0);
sz = sizeof(notSoSmall); sz = sizeof(notSoSmall);