Permalink
Browse files

Sync with upstream.

  • Loading branch information...
2 parents 9cdfd46 + 560908b commit 61056901f6f1bbf6614e2ea9ff28ee94f6a9488c @pprindeville committed Dec 12, 2012
Showing with 10,217 additions and 1,963 deletions.
  1. +16 −1 .gitignore
  2. +21 −0 CHANGELOG
  3. +7 −2 CMakeLists.txt
  4. +4 −0 CONTRIBUTORS
  5. +12 −2 CppParser/include/Poco/CppParser/CppToken.h
  6. +27 −7 CppParser/include/Poco/CppParser/Function.h
  7. +21 −2 CppParser/include/Poco/CppParser/Struct.h
  8. +11 −1 CppParser/src/CppToken.cpp
  9. +31 −1 CppParser/src/Function.cpp
  10. +44 −13 CppParser/src/Parser.cpp
  11. +8 −2 CppParser/src/Utility.cpp
  12. +3 −0 CppUnit/CppUnit_vs110.sln
  13. +3 −4 Crypto/CMakeLists.txt
  14. +60 −0 Crypto/Crypto_vs110.sln
  15. +120 −91 Crypto/Crypto_vs110.vcxproj
  16. +60 −0 Crypto/Crypto_x64_vs110.sln
  17. +104 −74 Crypto/testsuite/TestSuite_vs110.vcxproj
  18. +1 −2 Data/CMakeLists.txt
  19. +1 −2 Data/MySQL/CMakeLists.txt
  20. +1 −1 Data/MySQL/testsuite/src/SQLExecutor.cpp
  21. +1 −2 Data/ODBC/CMakeLists.txt
  22. +1 −1 Data/ODBC/src/SessionImpl.cpp
  23. +4 −1 Data/ODBC/testsuite/Makefile
  24. +1 −1 Data/ODBC/testsuite/src/SQLExecutor.cpp
  25. +2 −3 Data/SQLite/CMakeLists.txt
  26. +2 −0 Data/SQLite/include/Poco/Data/SQLite/Extractor.h
  27. +2 −0 Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h
  28. +11 −0 Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h
  29. +29 −6 Data/SQLite/src/SQLiteStatementImpl.cpp
  30. +9 −1 Data/SQLite/src/SessionImpl.cpp
  31. +39 −1 Data/SQLite/testsuite/src/SQLiteTest.cpp
  32. +1 −0 Data/SQLite/testsuite/src/SQLiteTest.h
  33. +1 −1 Data/include/Poco/Data/Extraction.h
  34. +2 −0 Data/include/Poco/Data/LOB.h
  35. +2 −0 Data/include/Poco/Data/RowIterator.h
  36. +2 −0 Data/include/Poco/Data/Session.h
  37. +2 −0 Data/include/Poco/Data/Statement.h
  38. +242 −247 Data/include/Poco/Data/TypeHandler.h
  39. +5 −3 Data/samples/RecordSet/src/RecordSet.cpp
  40. +7 −5 Data/samples/RowFormatter/src/RowFormatter.cpp
  41. +30 −13 Data/samples/TypeHandler/src/TypeHandler.cpp
  42. +2 −3 Foundation/CMakeLists.txt
  43. +20 −0 Foundation/Foundation_CE_vs90.vcproj
  44. +5 −0 Foundation/Foundation_vs100.vcxproj
  45. +15 −0 Foundation/Foundation_vs100.vcxproj.filters
  46. +5 −0 Foundation/Foundation_vs110.vcxproj
  47. +15 −0 Foundation/Foundation_vs110.vcxproj.filters
  48. +15 −0 Foundation/Foundation_vs71.vcproj
  49. +20 −0 Foundation/Foundation_vs80.vcproj
  50. +20 −0 Foundation/Foundation_vs90.vcproj
  51. +5 −0 Foundation/Foundation_x64_vs100.vcxproj
  52. +15 −0 Foundation/Foundation_x64_vs100.vcxproj.filters
  53. +5 −0 Foundation/Foundation_x64_vs110.vcxproj
  54. +15 −0 Foundation/Foundation_x64_vs110.vcxproj.filters
  55. +20 −0 Foundation/Foundation_x64_vs90.vcproj
  56. +3 −2 Foundation/Makefile
  57. +126 −0 Foundation/include/Poco/Base32Decoder.h
  58. +132 −0 Foundation/include/Poco/Base32Encoder.h
  59. +2 −3 Foundation/include/Poco/Buffer.h
  60. +7 −1 Foundation/include/Poco/Config.h
  61. +19 −19 Foundation/include/Poco/Dynamic/VarHolder.h
  62. +4 −2 Foundation/include/Poco/ExpireStrategy.h
  63. +4 −4 Foundation/include/Poco/FileChannel.h
  64. +6 −0 Foundation/include/Poco/HashMap.h
  65. +88 −62 Foundation/include/Poco/NumberFormatter.h
  66. +323 −132 Foundation/include/Poco/NumericString.h
  67. +23 −2 Foundation/include/Poco/PatternFormatter.h
  68. +2 −12 Foundation/include/Poco/Platform.h
  69. +24 −0 Foundation/include/Poco/Platform_POSIX.h
  70. +113 −5 Foundation/include/Poco/String.h
  71. +3 −1 Foundation/include/Poco/URI.h
  72. +182 −0 Foundation/src/Base32Decoder.cpp
  73. +224 −0 Foundation/src/Base32Encoder.cpp
  74. +21 −2 Foundation/src/FileChannel.cpp
  75. +130 −158 Foundation/src/NumberFormatter.cpp
  76. +1 −2 Foundation/src/NumberParser.cpp
  77. +225 −0 Foundation/src/NumericString.cpp
  78. +107 −50 Foundation/src/PatternFormatter.cpp
  79. +41 −0 Foundation/src/String.cpp
  80. +6 −2 Foundation/src/URI.cpp
  81. +640 −0 Foundation/src/bignum-dtoa.cc
  82. +84 −0 Foundation/src/bignum-dtoa.h
  83. +764 −0 Foundation/src/bignum.cc
  84. +145 −0 Foundation/src/bignum.h
  85. +175 −0 Foundation/src/cached-powers.cc
  86. +64 −0 Foundation/src/cached-powers.h
  87. +57 −0 Foundation/src/diy-fp.cc
  88. +118 −0 Foundation/src/diy-fp.h
  89. +889 −0 Foundation/src/double-conversion.cc
  90. +536 −0 Foundation/src/double-conversion.h
  91. +664 −0 Foundation/src/fast-dtoa.cc
  92. +88 −0 Foundation/src/fast-dtoa.h
  93. +402 −0 Foundation/src/fixed-dtoa.cc
  94. +56 −0 Foundation/src/fixed-dtoa.h
  95. +398 −0 Foundation/src/ieee.h
  96. +554 −0 Foundation/src/strtod.cc
  97. +45 −0 Foundation/src/strtod.h
  98. +313 −0 Foundation/src/utils.h
  99. +2 −2 Foundation/testsuite/Makefile-Driver
  100. +8 −0 Foundation/testsuite/TestSuite_CE_vs90.vcproj
  101. +3 −0 Foundation/testsuite/TestSuite_vs100.vcxproj
  102. +6 −0 Foundation/testsuite/TestSuite_vs100.vcxproj.filters
  103. +2 −0 Foundation/testsuite/TestSuite_vs110.vcxproj
  104. +6 −0 Foundation/testsuite/TestSuite_vs110.vcxproj.filters
  105. +6 −0 Foundation/testsuite/TestSuite_vs71.vcproj
  106. +8 −0 Foundation/testsuite/TestSuite_vs80.vcproj
  107. +8 −0 Foundation/testsuite/TestSuite_vs90.vcproj
  108. +2 −0 Foundation/testsuite/TestSuite_x64_vs100.vcxproj
  109. +6 −0 Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters
  110. +2 −0 Foundation/testsuite/TestSuite_x64_vs110.vcxproj
  111. +6 −0 Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters
  112. +8 −0 Foundation/testsuite/TestSuite_x64_vs90.vcproj
  113. +204 −0 Foundation/testsuite/src/Base32Test.cpp
  114. +62 −0 Foundation/testsuite/src/Base32Test.h
  115. +1 −0 Foundation/testsuite/src/HashMapTest.cpp
  116. +92 −21 Foundation/testsuite/src/NumberFormatterTest.cpp
  117. +1 −0 Foundation/testsuite/src/NumberFormatterTest.h
  118. +1 −0 Foundation/testsuite/src/NumberParserTest.cpp
  119. +15 −0 Foundation/testsuite/src/PatternFormatterTest.cpp
  120. +2 −0 Foundation/testsuite/src/StreamsTestSuite.cpp
  121. +448 −79 Foundation/testsuite/src/StringTest.cpp
  122. +6 −1 Foundation/testsuite/src/StringTest.h
  123. +21 −0 Foundation/testsuite/src/URITest.cpp
  124. +1 −0 Foundation/testsuite/src/URITest.h
  125. +1 −2 JSON/CMakeLists.txt
  126. +15 −23 JSON/include/Poco/JSON/Array.h
  127. +9 −10 JSON/include/Poco/JSON/Object.h
  128. +12 −1 JSON/src/Array.cpp
  129. +11 −1 JSON/src/Stringifier.cpp
  130. +52 −1 JSON/testsuite/src/JSONTest.cpp
  131. +2 −0 JSON/testsuite/src/JSONTest.h
  132. +2 −4 Net/CMakeLists.txt
  133. +2 −0 Net/include/Poco/Net/ICMPv4PacketImpl.h
  134. +8 −5 Net/include/Poco/Net/NetworkInterface.h
  135. +8 −4 Net/include/Poco/Net/SocketAddress.h
  136. +1 −1 Net/include/Poco/Net/SocketConnector.h
  137. +1 −1 Net/samples/EchoServer/src/EchoServer.cpp
  138. +23 −0 Net/src/NetworkInterface.cpp
  139. +11 −3 Net/src/SMTPChannel.cpp
  140. +6 −0 Net/src/SocketAddress.cpp
  141. +18 −3 Net/testsuite/src/NetworkInterfaceTest.cpp
  142. +1 −2 NetSSL_OpenSSL/CMakeLists.txt
  143. +2 −3 PDF/CMakeLists.txt
  144. +11 −3 PocoDoc/src/DocWriter.cpp
  145. +1 −2 Util/CMakeLists.txt
  146. +7 −0 Util/include/Poco/Util/JSONConfiguration.h
  147. +3 −0 Util/include/Poco/Util/ServerApplication.h
  148. +7 −0 Util/include/Poco/Util/XMLConfiguration.h
  149. +12 −0 Util/src/Application.cpp
  150. +7 −0 Util/src/JSONConfiguration.cpp
  151. +6 −2 Util/src/ServerApplication.cpp
  152. +7 −0 Util/src/XMLConfiguration.cpp
  153. +1 −2 XML/CMakeLists.txt
  154. +0 −829 XML/testsuite/rss.xml
  155. +1 −2 Zip/CMakeLists.txt
  156. +1 −1 build/config/Darwin-clang
  157. +73 −0 build/config/OpenPandora
  158. +1 −1 build/config/iPhone
  159. +2 −2 configure
  160. +30 −0 doc/Acknowledgements.html
View
@@ -14,6 +14,20 @@
*.a
*.d
+# Make #
+########
+config.build
+config.make
+
+# CMake #
+########
+cmake_install.cmake
+cmake_uninstall.cmake
+CMakeFiles
+CMakeCache.txt
+CPackConfig.cmake
+CPackSourceConfig.cmake
+
# Packages #
############
# it's better to unpack these files and commit the raw source
@@ -29,10 +43,11 @@
# Logs and databases #
######################
-*.log
+*.log*
*.sqlite
*.db
test*.txt
+XML/testsuite/rss.xml
# OS generated files #
######################
View
@@ -1,5 +1,26 @@
This is the changelog file for the POCO C++ Libraries.
+Release 1.5.0 (2012-12-17)
+==========================
+- using double-conversion library for floating-point numeric/string conversions
+- added Poco::istring (case-insensitive string) and Poco::isubstr
+- improved SQLite execute() return (affected rows) value
+- added SQLite sys.dual (in-memory system table)
+- applied SF Patch #120: The ExpireLRUCache does not compile with a tuple as key on Visual Studio 2010
+- fixed SF Bug #599: JSON::Array and JSON::Object size() member can implicitly lose precision
+- fixed SF Bug #602: iterating database table rows not correct if no data in table
+- fixed SF Bug #603: count() is missing in HashMap
+- fixed GH #23: JSON::Object::stringify throw BadCastException
+- fixed GH #16: NetworkInterface::firstAddress() should not throw on unconfigured interfaces
+- Android compile/build support (by Rangel Reale)
+- TypeHandler::prepare() now takes const-reference
+- fixed GH #27: Poco::URI::decode() doesn't properly handle '+'
+- fixed GH #31: JSON implementation bug
+- fixed SF #597: Configure script ignores cflags
+- fixed SF #593: Poco 1.5.0 on FreeBSD: cannot find -ldl
+- added SF #542: SocketAddress() needs port-only constructor
+- fixed SF #215: Wrong return type in SocketConnector.h
+- applied SF Patch #97: fix c++0x / clang++ bugs
Release 1.5.0 (2012-10-14)
==========================
View
@@ -50,10 +50,10 @@ endif ()
# * MinSizeRel (CMAKE_C_FLAGS_MINSIZEREL or CMAKE_CXX_FLAGS_MINSIZEREL)
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
message(STATUS "Debug output enabled")
- set(LIB_EXT "d" CACHE STRING "Set debug library postfix" FORCE)
+ set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Set debug library postfix" FORCE)
else ()
message(STATUS "Optimized output enabled")
- set(LIB_EXT "" CACHE STRING "Set debug library postfix" FORCE)
+ set(CMAKE_DEBUG_POSTFIX "" CACHE STRING "Set debug library postfix" FORCE)
endif ()
option(ENABLE_TESTS
@@ -144,6 +144,11 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
add_definitions( -D_BSD_SOURCE -library=stlport4)
endif (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
+# iOS
+if (IOS)
+ add_definitions( -DPOCO_HAVE_IPv6 -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_STAT64 -DPOCO_NO_SHAREDLIBS -DPOCO_NO_NET_IFTYPES )
+endif(IOS)
+
IF (ENABLE_TESTS)
add_subdirectory(CppUnit)
ENDIF ()
View
@@ -24,6 +24,10 @@ Marian Krivos
Franky Braem
Philip Prindeville
Anton Yabchinskiy
+Rangel Reale
+Fabrizio Duhem
+Patrick White
+Mike Naquin
--
$Id$
@@ -1,7 +1,7 @@
//
// CppToken.h
//
-// $Id: //poco/1.4/CppParser/include/Poco/CppParser/CppToken.h#1 $
+// $Id: //poco/1.4/CppParser/include/Poco/CppParser/CppToken.h#2 $
//
// Library: CppParser
// Package: CppParser
@@ -134,7 +134,9 @@ class CppParser_API IdentifierToken: public CppToken
public:
enum Keywords
{
- KW_AND = 1,
+ KW_ALIGNAS = 1,
+ KW_ALIGNOF,
+ KW_AND,
KW_AND_EQ,
KW_ASM,
KW_AUTO,
@@ -145,11 +147,15 @@ class CppParser_API IdentifierToken: public CppToken
KW_CASE,
KW_CATCH,
KW_CHAR,
+ KW_CHAR_16T,
+ KW_CHAR_32T,
KW_CLASS,
KW_COMPL,
KW_CONST,
+ KW_CONSTEXPR,
KW_CONST_CAST,
KW_CONTINUE,
+ KW_DECLTYPE,
KW_DEFAULT,
KW_DELETE,
KW_DO,
@@ -172,8 +178,10 @@ class CppParser_API IdentifierToken: public CppToken
KW_MUTABLE,
KW_NAMESPACE,
KW_NEW,
+ KW_NOEXCEPT,
KW_NOT,
KW_NOT_EQ,
+ KW_NULLPTR,
KW_OPERATOR,
KW_OR,
KW_OR_EQ,
@@ -187,11 +195,13 @@ class CppParser_API IdentifierToken: public CppToken
KW_SIGNED,
KW_SIZEOF,
KW_STATIC,
+ KW_STATIC_ASSERT,
KW_STATIC_CAST,
KW_STRUCT,
KW_SWITCH,
KW_TEMPLATE,
KW_THIS,
+ KW_THREAD_LOCAL,
KW_THROW,
KW_TRUE,
KW_TRY,
@@ -1,7 +1,7 @@
//
// Function.h
//
-// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Function.h#1 $
+// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Function.h#2 $
//
// Library: CppParser
// Package: SymbolTable
@@ -58,12 +58,17 @@ class CppParser_API Function: public Decl
public:
enum Flags
{
- FN_STATIC = 1, /// The function is static.
- FN_VIRTUAL = 2, /// The function is virtual.
- FN_INLINE = 4, /// The function is inline.
- FN_CONST = 8, /// The function is const.
- FN_TEMPLATE = 16, /// The function is a template.
- FN_PURE_VIRTUAL = 32 /// The function is pure virtual.
+ FN_STATIC = 1, /// The function is static.
+ FN_VIRTUAL = 2, /// The function is virtual.
+ FN_INLINE = 4, /// The function is inline.
+ FN_CONST = 8, /// The function is const.
+ FN_TEMPLATE = 16, /// The function is a template.
+ FN_PURE_VIRTUAL = 32, /// The function is pure virtual.
+ FN_FINAL = 64, /// The function is final.
+ FN_OVERRIDE = 128, /// The function is override.
+ FN_NOEXCEPT = 256, /// The function is noexcept.
+ FN_DEFAULT = 512, /// The function is default.
+ FN_DELETE = 1024 /// The function has been deleted.
};
typedef std::vector<Parameter*> Parameters;
@@ -94,6 +99,21 @@ class CppParser_API Function: public Decl
void makePureVirtual();
/// Sets the FN_PURE_VIRTUAL flag.
+
+ void makeFinal();
+ /// Sets the FN_FINAL flag.
+
+ void makeOverride();
+ /// Sets the FN_OVERRIDE flag.
+
+ void makeNoexcept();
+ /// Sets the FN_NOEXCEPT flag.
+
+ void makeDefault();
+ /// Sets the FN_DEFAULT flag.
+
+ void makeDelete();
+ /// Sets the FN_DELETE flag.
int flags() const;
/// Returns the function's flags.
@@ -1,7 +1,7 @@
//
// Struct.h
//
-// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Struct.h#1 $
+// $Id: //poco/1.4/CppParser/include/Poco/CppParser/Struct.h#2 $
//
// Library: CppParser
// Package: SymbolTable
@@ -61,7 +61,8 @@ class CppParser_API Struct: public NameSpace
{
FN_TEMPLATE = 1,
FN_INLINE = 2, // when the whole class is inlined in a c++ file
- FN_TEMPLATE_SPECIALIZATION = 4
+ FN_TEMPLATE_SPECIALIZATION = 4,
+ FN_FINAL = 8
};
struct Base
@@ -115,10 +116,16 @@ class CppParser_API Struct: public NameSpace
void makeInline();
/// Changes the class to a inline class, i.e. definition and implementation are hidden in a cpp file.
+
+ void makeFinal();
+ /// Makes the class final.
bool isInline() const;
/// Returns true if the complete class is inlined in a cpp file.
+ bool isFinal() const;
+ /// Returns true if the class is final.
+
void constructors(Functions& functions) const;
/// Returns all constructors, sorted by their parameter count.
@@ -190,12 +197,24 @@ inline void Struct::makeInline()
}
+inline void Struct::makeFinal()
+{
+ _flags |= FN_FINAL;
+}
+
+
inline bool Struct::isInline() const
{
return (_flags & FN_INLINE) != 0;
}
+inline bool Struct::isFinal() const
+{
+ return (_flags & FN_FINAL) != 0;
+}
+
+
inline bool Struct::isDerived() const
{
return !_bases.empty();
View
@@ -1,7 +1,7 @@
//
// CppToken.cpp
//
-// $Id: //poco/1.4/CppParser/src/CppToken.cpp#2 $
+// $Id: //poco/1.4/CppParser/src/CppToken.cpp#3 $
//
// Library: CppParser
// Package: CppParser
@@ -254,6 +254,8 @@ int OperatorToken::asInteger() const
IdentifierToken::IdentifierToken()
{
int i = 1;
+ _kwMap["alignas"] = i++;
+ _kwMap["alignof"] = i++;
_kwMap["and"] = i++;
_kwMap["and_eq"] = i++;
_kwMap["asm"] = i++;
@@ -265,11 +267,15 @@ IdentifierToken::IdentifierToken()
_kwMap["case"] = i++;
_kwMap["catch"] = i++;
_kwMap["char"] = i++;
+ _kwMap["char16_t"] = i++;
+ _kwMap["char32_t"] = i++;
_kwMap["class"] = i++;
_kwMap["compl"] = i++;
_kwMap["const"] = i++;
+ _kwMap["constexpr"] = i++;
_kwMap["const_cast"] = i++;
_kwMap["continue"] = i++;
+ _kwMap["decltype"] = i++;
_kwMap["default"] = i++;
_kwMap["delete"] = i++;
_kwMap["do"] = i++;
@@ -292,8 +298,10 @@ IdentifierToken::IdentifierToken()
_kwMap["mutable"] = i++;
_kwMap["namespace"] = i++;
_kwMap["new"] = i++;
+ _kwMap["noexcept"] = i++;
_kwMap["not"] = i++;
_kwMap["not_eq"] = i++;
+ _kwMap["nullptr"] = i++;
_kwMap["operator"] = i++;
_kwMap["or"] = i++;
_kwMap["or_eq"] = i++;
@@ -307,11 +315,13 @@ IdentifierToken::IdentifierToken()
_kwMap["signed"] = i++;
_kwMap["sizeof"] = i++;
_kwMap["static"] = i++;
+ _kwMap["static_assert"] = i++;
_kwMap["static_cast"] = i++;
_kwMap["struct"] = i++;
_kwMap["switch"] = i++;
_kwMap["template"] = i++;
_kwMap["this"] = i++;
+ _kwMap["thread_local"] = i++;
_kwMap["throw"] = i++;
_kwMap["true"] = i++;
_kwMap["try"] = i++;
View
@@ -1,7 +1,7 @@
//
// Function.cpp
//
-// $Id: //poco/1.4/CppParser/src/Function.cpp#1 $
+// $Id: //poco/1.4/CppParser/src/Function.cpp#2 $
//
// Library: CppParser
// Package: SymbolTable
@@ -128,6 +128,36 @@ void Function::makePureVirtual()
}
+void Function::makeFinal()
+{
+ _flags |= FN_FINAL;
+}
+
+
+void Function::makeOverride()
+{
+ _flags |= FN_OVERRIDE;
+}
+
+
+void Function::makeNoexcept()
+{
+ _flags |= FN_NOEXCEPT;
+}
+
+
+void Function::makeDefault()
+{
+ _flags |= FN_DEFAULT;
+}
+
+
+void Function::makeDelete()
+{
+ _flags |= FN_DELETE;
+}
+
+
bool Function::isConstructor() const
{
return name() == nameSpace()->name();
Oops, something went wrong.

0 comments on commit 6105690

Please sign in to comment.