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

merge dev and resolve conflicts

Browse Source
This commit is contained in:
Alex Fabijanic
2016-03-11 20:57:28 -08:00
parent d63c8afbb8 d49ea8a51b
commit 2a80322ecb
16 changed files with 65 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Foundation/CMakeLists.txt
View File

@@ -111,14 +111,14 @@ endif(ANDROID)
# TODO: Why is this here?
add_definitions( -DPCRE_STATIC)
# For SetAffinity
# For POSIX threads on Unix
if(UNIX AND NOT APPLE)
# We still need pthreads on Unix
set(SYSLIBS ${SYSLIBS} ${CMAKE_THREAD_LIBS_INIT})
INCLUDE (CheckFunctionExists)
INCLUDE (CheckCXXSourceCompiles)
INCLUDE (CheckLibraryExists)
CHECK_LIBRARY_EXISTS(pthread pthread_setaffinity_np "pthread.h" HAVE_PTHREAD_SETAFFINITY_NP)
#set(CMAKE_EXTRA_INCLUDE_FILES pthread.h)
#CHECK_FUNCTION_EXISTS(pthread_setaffinity_np HAVE_PTHREAD_SETAFFINITY_NP)
if(NOT HAVE_PTHREAD_SETAFFINITY_NP)
message(STATUS "Platform has not PTHREAD_SETAFFINITY_NP")
else(HAVE_PTHREAD_SETAFFINITY_NP)

2
Foundation/include/Poco/Dynamic/Pair.h
View File

@@ -98,7 +98,7 @@ public:
std::string toString()
{
std::string str;
Var(*this).convert<std::string>(str);
Var(*this).template convert<std::string>(str);
return str;
}

12
Foundation/testsuite/src/UnicodeConverterTest.cpp
View File

@@ -20,13 +20,6 @@
#include "Poco/UTFString.h"
using Poco::UnicodeConverter;
using Poco::UTF16Char;
using Poco::UTF16String;
using Poco::UTF32Char;
using Poco::UTF32String;
UnicodeConverterTest::UnicodeConverterTest(const std::string& rName): CppUnit::TestCase(rName)
{
}
@@ -39,14 +32,13 @@ UnicodeConverterTest::~UnicodeConverterTest()
void UnicodeConverterTest::testUTF16()
{
runTests<UTF16String>();
runTests<Poco::UTF16String>();
}
void UnicodeConverterTest::testUTF32()
{
runTests<UTF32String>();
runTests<Poco::UTF32String>();
}