ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 02:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to soci 3.2

Browse Source
This commit is contained in:
Vinnie Falco
2015-08-03 16:08:25 -07:00
committed by Nik Bougalis
parent c8c8003677
commit c3da2e1f03
6 changed files with 283 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
Builds/VisualStudio2013/RippleD.vcxproj
View File

@@ -86,8 +86,8 @@
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">
<ClCompile>
<PreprocessorDefinitions>HAVE_USLEEP=1;_WIN32_WINNT=0x6000;DEBUG;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_USLEEP=1;SOCI_CXX_C11=1;_WIN32_WINNT=0x6000;DEBUG;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4800;4244;4267;4018</DisableSpecificWarnings>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -123,8 +123,8 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
<ClCompile>
<PreprocessorDefinitions>HAVE_USLEEP=1;_WIN32_WINNT=0x6000;DEBUG;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_USLEEP=1;SOCI_CXX_C11=1;_WIN32_WINNT=0x6000;DEBUG;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4800;4244;4267;4018</DisableSpecificWarnings>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -160,8 +160,8 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">
<ClCompile>
<PreprocessorDefinitions>HAVE_USLEEP=1;_WIN32_WINNT=0x6000;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;NDEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_USLEEP=1;SOCI_CXX_C11=1;_WIN32_WINNT=0x6000;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;NDEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4800;4244;4267;4018</DisableSpecificWarnings>
<ExceptionHandling>Async</ExceptionHandling>
<FloatingPointModel>Precise</FloatingPointModel>
@@ -195,8 +195,8 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
<ClCompile>
<PreprocessorDefinitions>HAVE_USLEEP=1;_WIN32_WINNT=0x6000;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;NDEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_USLEEP=1;SOCI_CXX_C11=1;_WIN32_WINNT=0x6000;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;NDEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\soci\include;..\..\src\soci\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4800;4244;4267;4018</DisableSpecificWarnings>
<ExceptionHandling>Async</ExceptionHandling>
<FloatingPointModel>Precise</FloatingPointModel>
@@ -3869,16 +3869,16 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ClCompile Include="..\..\src\ripple\unity\soci.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ClCompile Include="..\..\src\ripple\unity\soci_ripple.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">True</ExcludedFromBuild>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\soci\include\private;..\..\src\soci\src\core;..\..\src\sqlite;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ClCompile Include="..\..\src\ripple\unity\test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">True</ExcludedFromBuild>
@@ -4644,6 +4644,104 @@
</ClCompile>
<ClInclude Include="..\..\src\snappy\snappy\snappy.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-compiler.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-cpp.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-cstrtod.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-dtocstr.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-exchange-cast.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-mktime.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\backend-loader.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\bind-values.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\blob-exchange.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\blob.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\boost-fusion.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\boost-gregorian-date.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\boost-optional.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\boost-tuple.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\connection-parameters.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\connection-pool.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\error.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\exchange-traits.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\into-type.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\into.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\noreturn.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\once-temp-type.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\prepare-temp-type.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\procedure.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\query_transformation.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\ref-counted-prepare-info.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\ref-counted-statement.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\row-exchange.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\row.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\rowid-exchange.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\rowid.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\rowset.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\session.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\soci-backend.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\soci-platform.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\soci-simple.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\soci.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\sqlite3\soci-sqlite3.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\statement.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\transaction.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\type-conversion-traits.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\type-conversion.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\type-holder.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\type-ptr.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\unsigned-types.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\use-type.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\use.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\values-exchange.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\values.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\blob.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
@@ -4652,6 +4750,9 @@
</ClCompile>
<ClInclude Include="..\..\src\soci\src\backends\sqlite3\common.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\error.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\factory.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
@@ -4661,8 +4762,6 @@
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\session.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\backends\sqlite3\soci-sqlite3.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\standard-into-type.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
@@ -4678,144 +4777,60 @@
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\vector-use-type.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\backend-loader.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\blob-exchange.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\blob.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\blob.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\boost-fusion.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\boost-gregorian-date.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\boost-optional.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\boost-tuple.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\connection-parameters.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\connection-parameters.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\connection-pool.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\connection-pool.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\error.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\error.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\exchange-traits.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\into-type.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\into-type.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\into.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\once-temp-type.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\once-temp-type.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\prepare-temp-type.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\prepare-temp-type.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\procedure.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\procedure.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\query_transformation.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\ref-counted-prepare-info.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\ref-counted-prepare-info.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\ref-counted-statement.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\ref-counted-statement.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\row-exchange.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\row.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\row.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\rowid-exchange.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\rowid.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\rowid.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\rowset.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\session.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\session.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\soci-backend.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\soci-config.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\soci-platform.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\soci-simple.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\soci-simple.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\soci.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\statement.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\statement.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\transaction.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\transaction.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\type-conversion-traits.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\type-conversion.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\type-holder.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\type-ptr.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\unsigned-types.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\use-type.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\use-type.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\use.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\values-exchange.h">
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\values.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\values.h">
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\version.h">
</ClInclude>
<ClInclude Include="..\..\src\sqlite\sqlite.h">
</ClInclude>
<ClCompile Include="..\..\src\sqlite\sqlite.unity.c">

291
Builds/VisualStudio2013/RippleD.vcxproj.filters
View File

@@ -529,6 +529,18 @@
<Filter Include="soci">
<UniqueIdentifier>{E5334950-60C3-CE41-4DD7-535029F143F7}</UniqueIdentifier>
</Filter>
<Filter Include="soci\include">
<UniqueIdentifier>{326BC235-4389-131A-EFCF-B54C652509F1}</UniqueIdentifier>
</Filter>
<Filter Include="soci\include\private">
<UniqueIdentifier>{95BB48F7-02FF-05FA-0112-506B0BB188FE}</UniqueIdentifier>
</Filter>
<Filter Include="soci\include\soci">
<UniqueIdentifier>{227F15C2-FEEE-AFD6-835C-989647DBEBE2}</UniqueIdentifier>
</Filter>
<Filter Include="soci\include\soci\sqlite3">
<UniqueIdentifier>{AEF95E82-C569-5213-CEFC-7546DD7CDD77}</UniqueIdentifier>
</Filter>
<Filter Include="soci\src">
<UniqueIdentifier>{5A1D8022-39F2-67E1-FFBE-EA7D5BF9FBDB}</UniqueIdentifier>
</Filter>
@@ -5481,6 +5493,153 @@
<ClInclude Include="..\..\src\snappy\snappy\snappy.h">
<Filter>snappy\snappy</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-compiler.h">
<Filter>soci\include\private</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-cpp.h">
<Filter>soci\include\private</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-cstrtod.h">
<Filter>soci\include\private</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-dtocstr.h">
<Filter>soci\include\private</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-exchange-cast.h">
<Filter>soci\include\private</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\private\soci-mktime.h">
<Filter>soci\include\private</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\backend-loader.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\bind-values.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\blob-exchange.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\blob.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\boost-fusion.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\boost-gregorian-date.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\boost-optional.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\boost-tuple.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\connection-parameters.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\connection-pool.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\error.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\exchange-traits.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\into-type.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\into.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\noreturn.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\once-temp-type.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\prepare-temp-type.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\procedure.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\query_transformation.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\ref-counted-prepare-info.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\ref-counted-statement.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\row-exchange.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\row.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\rowid-exchange.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\rowid.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\rowset.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\session.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\soci-backend.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\soci-platform.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\soci-simple.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\soci.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\sqlite3\soci-sqlite3.h">
<Filter>soci\include\soci\sqlite3</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\statement.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\transaction.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\type-conversion-traits.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\type-conversion.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\type-holder.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\type-ptr.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\unsigned-types.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\use-type.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\use.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\values-exchange.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\include\soci\values.h">
<Filter>soci\include\soci</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\blob.cpp">
<Filter>soci\src\backends\sqlite3</Filter>
</ClCompile>
@@ -5490,6 +5649,9 @@
<ClInclude Include="..\..\src\soci\src\backends\sqlite3\common.h">
<Filter>soci\src\backends\sqlite3</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\error.cpp">
<Filter>soci\src\backends\sqlite3</Filter>
</ClCompile>
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\factory.cpp">
<Filter>soci\src\backends\sqlite3</Filter>
</ClCompile>
@@ -5499,9 +5661,6 @@
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\session.cpp">
<Filter>soci\src\backends\sqlite3</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\backends\sqlite3\soci-sqlite3.h">
<Filter>soci\src\backends\sqlite3</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\standard-into-type.cpp">
<Filter>soci\src\backends\sqlite3</Filter>
</ClCompile>
@@ -5517,186 +5676,60 @@
<ClCompile Include="..\..\src\soci\src\backends\sqlite3\vector-use-type.cpp">
<Filter>soci\src\backends\sqlite3</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\backend-loader.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\blob-exchange.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\blob.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\blob.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\boost-fusion.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\boost-gregorian-date.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\boost-optional.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\boost-tuple.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\connection-parameters.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\connection-parameters.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\connection-pool.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\connection-pool.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\error.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\error.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\exchange-traits.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\into-type.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\into-type.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\into.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\once-temp-type.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\once-temp-type.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\prepare-temp-type.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\prepare-temp-type.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\procedure.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\procedure.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\query_transformation.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\ref-counted-prepare-info.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\ref-counted-prepare-info.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\ref-counted-statement.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\ref-counted-statement.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\row-exchange.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\row.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\row.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\rowid-exchange.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\rowid.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\rowid.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\rowset.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\session.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\session.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\soci-backend.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\soci-config.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\soci-platform.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\soci-simple.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\soci-simple.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\soci.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\statement.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\statement.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\transaction.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\transaction.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\type-conversion-traits.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\type-conversion.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\type-holder.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\type-ptr.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\unsigned-types.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\use-type.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\use-type.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\use.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\values-exchange.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClCompile Include="..\..\src\soci\src\core\values.cpp">
<Filter>soci\src\core</Filter>
</ClCompile>
<ClInclude Include="..\..\src\soci\src\core\values.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\soci\src\core\version.h">
<Filter>soci\src\core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\sqlite\sqlite.h">
<Filter>sqlite</Filter>
</ClInclude>

3
SConstruct
View File

@@ -266,6 +266,7 @@ def config_base(env):
'OPENSSL_NO_SSL2'
,'DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER'
,{'HAVE_USLEEP' : '1'}
,{'SOCI_CXX_C11' : '1'}
])
try:
@@ -553,6 +554,7 @@ base.Append(CPPPATH=[
os.path.join('src', 'beast'),
os.path.join(build_dir, 'proto'),
os.path.join('src','soci','src'),
os.path.join('src','soci','include'),
])
base.Decider('MD5-timestamp')
@@ -634,6 +636,7 @@ def get_soci_sources(style):
result = []
cpp_path = [
'src/soci/src/core',
'src/soci/include/private',
'src/sqlite', ]
append_sources(result,
'src/ripple/unity/soci.cpp',

2
src/ripple/core/SociDB.h
View File

@@ -32,7 +32,7 @@
#include <ripple/core/JobQueue.h>
#include <beast/threads/Thread.h>
#define SOCI_USE_BOOST
#include <core/soci.h>
#include <soci/soci.h>
#include <string>
#include <cstdint>
#include <vector>

2
src/ripple/core/impl/SociDB.cpp
View File

@@ -23,7 +23,7 @@
#include <ripple/core/SociDB.h>
#include <ripple/core/Config.h>
#include <beast/cxx14/memory.h> // <memory>
#include <backends/sqlite3/soci-sqlite3.h>
#include <soci/sqlite3/soci-sqlite3.h>
#include <boost/filesystem.hpp>
namespace ripple {

1
src/ripple/unity/soci.cpp
View File

@@ -38,6 +38,7 @@
#include <core/values.cpp>
#include <backends/sqlite3/common.cpp>
#include <backends/sqlite3/error.cpp>
#include <backends/sqlite3/factory.cpp>
#include <backends/sqlite3/row-id.cpp>
#include <backends/sqlite3/session.cpp>