From 8e958f685fc4f864a85190fa4a6058dc8be57465 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Sat, 12 Oct 2024 13:42:39 -0500 Subject: [PATCH] 2808 data nullable (#4729) * chore(CppUnit): disable MSVC secure warning * chore(Data): regenerate VS projects * chore(DataTest): regenerate VS projects * chore(Data/testsuite): regenerate VS projects * chore(DataTest): fix VS90 project * fix(ODBC): Failed to insert Poco::Nullable< Poco::Data::Date> data into MSSQL using ODBC #2808 * chore(Foundation): add Trace to VS project * chore(Trace): add Trace VS projects #4692 * fix: g++ and clang build #2808 --- CppUnit/CppUnit.progen | 2 +- CppUnit/CppUnit_vs160.vcxproj | 38 +- CppUnit/CppUnit_vs160.vcxproj.filters | 4 +- CppUnit/CppUnit_vs170.vcxproj | 56 +- CppUnit/CppUnit_vs170.vcxproj.filters | 4 +- Data/DataTest/DataTest_VS90.vcproj | 4 +- Data/DataTest/DataTest_vs160.vcxproj | 6 +- Data/DataTest/DataTest_vs160.vcxproj.filters | 8 +- Data/DataTest/DataTest_vs170.vcxproj | 114 +- Data/DataTest/DataTest_vs170.vcxproj.filters | 8 +- .../include/Poco/Data/Test/SQLExecutor.h | 91 ++ Data/DataTest/src/SQLExecutor.cpp | 57 +- Data/Data_vs160.vcxproj | 2 +- Data/Data_vs160.vcxproj.filters | 54 +- Data/Data_vs170.sln | 276 +++-- Data/Data_vs170.vcxproj | 2 +- Data/Data_vs170.vcxproj.filters | 42 +- Data/ODBC/src/Binder.cpp | 4 +- Data/ODBC/testsuite/src/ODBCDB2Test.cpp | 2 +- Data/ODBC/testsuite/src/ODBCMySQLTest.cpp | 2 +- Data/ODBC/testsuite/src/ODBCOracleTest.cpp | 2 +- .../ODBC/testsuite/src/ODBCPostgreSQLTest.cpp | 2 +- Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp | 2 +- Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp | 2 +- Data/src/SQLChannel.cpp | 2 +- Data/testsuite/TestSuite_vs160.vcxproj | 2 +- .../testsuite/TestSuite_vs160.vcxproj.filters | 34 +- Data/testsuite/TestSuite_vs170.vcxproj | 2 +- .../testsuite/TestSuite_vs170.vcxproj.filters | 34 +- Foundation/Foundation_vs170.vcxproj | 6 +- Foundation/include/Poco/Foundation.h | 1 - Foundation/src/DateTimeParser.cpp | 10 +- Foundation/src/Exception.cpp | 1 + Trace/Trace.progen | 9 +- Trace/Trace_vs160.sln | 61 ++ Trace/Trace_vs160.vcxproj | 686 ++++++++++++ Trace/Trace_vs160.vcxproj.filters | 99 ++ Trace/Trace_vs170.sln | 85 ++ Trace/Trace_vs170.vcxproj | 972 ++++++++++++++++++ Trace/Trace_vs170.vcxproj.filters | 99 ++ Trace/Trace_vs90.sln | 7 +- Trace/Trace_vs90.vcproj | 108 +- 42 files changed, 2579 insertions(+), 423 deletions(-) create mode 100644 Trace/Trace_vs160.sln create mode 100644 Trace/Trace_vs160.vcxproj create mode 100644 Trace/Trace_vs160.vcxproj.filters create mode 100644 Trace/Trace_vs170.sln create mode 100644 Trace/Trace_vs170.vcxproj create mode 100644 Trace/Trace_vs170.vcxproj.filters diff --git a/CppUnit/CppUnit.progen b/CppUnit/CppUnit.progen index 33490e445..19173f2cd 100644 --- a/CppUnit/CppUnit.progen +++ b/CppUnit/CppUnit.progen @@ -8,7 +8,7 @@ vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj vc.project.compiler.include = ..\\Foundation\\include -vc.project.compiler.defines = POCO_NO_AUTOMATIC_LIBS +vc.project.compiler.defines = POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} diff --git a/CppUnit/CppUnit_vs160.vcxproj b/CppUnit/CppUnit_vs160.vcxproj index 4d8d488c6..2cf37bcf9 100644 --- a/CppUnit/CppUnit_vs160.vcxproj +++ b/CppUnit/CppUnit_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34714.143 + <_ProjectFileVersion>17.0.35219.272 CppUnitd CppUnitmdd CppUnitmtd @@ -228,7 +228,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;CppUnit_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -241,6 +241,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -264,7 +265,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;CppUnit_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -276,6 +277,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -296,7 +298,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -309,6 +311,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -325,7 +328,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -337,6 +340,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -349,7 +353,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -362,6 +366,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -378,7 +383,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -390,6 +395,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -402,7 +408,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;CppUnit_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -415,6 +421,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -438,7 +445,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;CppUnit_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -450,6 +457,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -470,7 +478,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -483,6 +491,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -499,7 +508,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -511,6 +520,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -523,7 +533,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -536,6 +546,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,7 +563,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -564,6 +575,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/CppUnit/CppUnit_vs160.vcxproj.filters b/CppUnit/CppUnit_vs160.vcxproj.filters index ea17c6c57..d1921ec55 100644 --- a/CppUnit/CppUnit_vs160.vcxproj.filters +++ b/CppUnit/CppUnit_vs160.vcxproj.filters @@ -2,11 +2,11 @@ - {d26d49c5-abe0-4fa7-9212-01a9f91404f9} + {9beab11d-aaa4-43ab-9a78-27ecd0f5ee3b} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {7314a021-5b19-417e-b039-2767327077e0} + {65dc31cf-b4c3-4132-b692-724c0019a6bf} *.h diff --git a/CppUnit/CppUnit_vs170.vcxproj b/CppUnit/CppUnit_vs170.vcxproj index 39aae5352..174917814 100644 --- a/CppUnit/CppUnit_vs170.vcxproj +++ b/CppUnit/CppUnit_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34714.143 + <_ProjectFileVersion>17.0.35219.272 CppUnitA64d CppUnitmdd CppUnitmtd @@ -332,7 +332,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;CppUnit_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -345,6 +345,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -368,7 +369,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;CppUnit_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -380,6 +381,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -400,7 +402,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -413,6 +415,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -429,7 +432,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -441,6 +444,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -453,7 +457,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -466,6 +470,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -482,7 +487,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -494,6 +499,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -506,7 +512,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;CppUnit_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -519,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -542,7 +549,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;CppUnit_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -554,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -574,7 +582,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -587,6 +595,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -603,7 +612,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -615,6 +624,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -627,7 +637,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -640,6 +650,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -656,7 +667,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -668,6 +679,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -680,7 +692,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;CppUnit_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -693,6 +705,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -716,7 +729,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;CppUnit_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -728,6 +741,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -748,7 +762,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -761,6 +775,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -777,7 +792,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded false @@ -789,6 +804,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -801,7 +817,7 @@ Disabled .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -814,6 +830,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -830,7 +847,7 @@ Speed true .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -842,6 +859,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/CppUnit/CppUnit_vs170.vcxproj.filters b/CppUnit/CppUnit_vs170.vcxproj.filters index 5721767f9..9b367c885 100644 --- a/CppUnit/CppUnit_vs170.vcxproj.filters +++ b/CppUnit/CppUnit_vs170.vcxproj.filters @@ -2,11 +2,11 @@ - {8d6cbac2-5575-4090-8ee0-a6a7d2782231} + {cf2652e2-90a2-4050-8d88-c14d3d3faabf} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {77346dfd-097e-4acc-bcb5-7c44c0c69f8a} + {96a8d8b6-4ddf-43f1-9b99-4b62e3d59d0d} *.h diff --git a/Data/DataTest/DataTest_VS90.vcproj b/Data/DataTest/DataTest_VS90.vcproj index 8571af679..70d85e691 100644 --- a/Data/DataTest/DataTest_VS90.vcproj +++ b/Data/DataTest/DataTest_VS90.vcproj @@ -497,11 +497,11 @@ Name="Header Files" > diff --git a/Data/DataTest/DataTest_vs160.vcxproj b/Data/DataTest/DataTest_vs160.vcxproj index fae676f2a..5f9e662ba 100644 --- a/Data/DataTest/DataTest_vs160.vcxproj +++ b/Data/DataTest/DataTest_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34714.143 + <_ProjectFileVersion>17.0.35219.272 PocoDataTestd PocoDataTestmdd PocoDataTestmtd @@ -585,8 +585,8 @@ - - + + diff --git a/Data/DataTest/DataTest_vs160.vcxproj.filters b/Data/DataTest/DataTest_vs160.vcxproj.filters index e5a4bfe7c..919c5dcad 100644 --- a/Data/DataTest/DataTest_vs160.vcxproj.filters +++ b/Data/DataTest/DataTest_vs160.vcxproj.filters @@ -2,17 +2,17 @@ - {8d9a4482-80ee-4508-8c18-9ee12221523b} + {4c24d70b-68a3-46b9-b53b-12df1bd2c68a} - {7c9c33b5-8f07-4ab1-b37a-b1849384cf3c} + {adb15fe4-732e-4d82-80f0-c0f9f34e25cf} - + Header Files - + Header Files diff --git a/Data/DataTest/DataTest_vs170.vcxproj b/Data/DataTest/DataTest_vs170.vcxproj index 9a5b71589..1c265af37 100644 --- a/Data/DataTest/DataTest_vs170.vcxproj +++ b/Data/DataTest/DataTest_vs170.vcxproj @@ -1,4 +1,4 @@ - + @@ -77,11 +77,11 @@ 17.0 DataTest - {240E83C3-368D-11DB-9FBC-00123FC423B5} + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F} DataTest Win32Proj - + StaticLibrary MultiByte @@ -172,65 +172,65 @@ MultiByte v143 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - <_ProjectFileVersion>17.0.34714.143 + <_ProjectFileVersion>17.0.35219.272 PocoDataTestA64d PocoDataTestmdd PocoDataTestmtd @@ -340,7 +340,7 @@ true true true - + Level3 ProgramDatabase Default @@ -376,9 +376,9 @@ true true true - + Level3 - + Default $(OutDir)$(TargetName).pdb /Zc:__cplusplus %(AdditionalOptions) @@ -410,7 +410,7 @@ true true true - + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase @@ -439,9 +439,9 @@ true true true - + Level3 - + Default $(OutDir)$(TargetName).pdb /Zc:__cplusplus %(AdditionalOptions) @@ -465,7 +465,7 @@ true true true - + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase @@ -494,9 +494,9 @@ true true true - + Level3 - + Default $(OutDir)$(TargetName).pdb /Zc:__cplusplus %(AdditionalOptions) @@ -520,7 +520,7 @@ true true true - + Level3 ProgramDatabase Default @@ -556,9 +556,9 @@ true true true - + Level3 - + Default $(OutDir)$(TargetName).pdb /Zc:__cplusplus %(AdditionalOptions) @@ -590,7 +590,7 @@ true true true - + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase @@ -619,9 +619,9 @@ true true true - + Level3 - + Default $(OutDir)$(TargetName).pdb /Zc:__cplusplus %(AdditionalOptions) @@ -645,7 +645,7 @@ true true true - + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase @@ -674,10 +674,10 @@ true true true - + $(OutDir)$(TargetName).pdb Level3 - + Default /Zc:__cplusplus %(AdditionalOptions) true @@ -700,7 +700,7 @@ true true true - + Level3 ProgramDatabase Default @@ -736,9 +736,9 @@ true true true - + Level3 - + Default $(OutDir)$(TargetName).pdb /Zc:__cplusplus %(AdditionalOptions) @@ -770,7 +770,7 @@ true true true - + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase @@ -799,9 +799,9 @@ true true true - + Level3 - + Default $(OutDir)$(TargetName).pdb /Zc:__cplusplus %(AdditionalOptions) @@ -825,7 +825,7 @@ true true true - + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase @@ -854,9 +854,9 @@ true true true - + Level3 - + Default $(OutDir)$(TargetName).pdb /Zc:__cplusplus %(AdditionalOptions) @@ -869,8 +869,8 @@ - - + + @@ -895,6 +895,6 @@ true - - - + + + \ No newline at end of file diff --git a/Data/DataTest/DataTest_vs170.vcxproj.filters b/Data/DataTest/DataTest_vs170.vcxproj.filters index 6debb9652..c245b7e0b 100644 --- a/Data/DataTest/DataTest_vs170.vcxproj.filters +++ b/Data/DataTest/DataTest_vs170.vcxproj.filters @@ -2,17 +2,17 @@ - {422bbf81-665a-45b8-bd32-73251a6783a1} + {804045e5-ed96-4b48-b9db-8687814a4798} - {8351a3e7-3a32-4af5-ba6e-22ee2badf83f} + {660c64c6-2fb1-40a5-af4b-7de9d4b4b0b4} - + Header Files - + Header Files diff --git a/Data/DataTest/include/Poco/Data/Test/SQLExecutor.h b/Data/DataTest/include/Poco/Data/Test/SQLExecutor.h index e557b717d..3977629c5 100644 --- a/Data/DataTest/include/Poco/Data/Test/SQLExecutor.h +++ b/Data/DataTest/include/Poco/Data/Test/SQLExecutor.h @@ -19,9 +19,11 @@ #include "Poco/Data/Session.h" #include "Poco/Data/BulkExtraction.h" #include "Poco/Data/BulkBinding.h" +#include "Poco/Data/RecordSet.h" #include "Poco/Exception.h" #include +using namespace Poco::Data::Keywords; namespace Poco { namespace Data { @@ -267,6 +269,95 @@ public: void sessionTransactionNoAutoCommit(const std::string& connector, const std::string& connect); void transaction(const std::string& connector, const std::string& connect, bool readUncommitted = true); void transactor(); + + template + void nullableImpl(const std::string& emptyName) + { + std::string sql = "DELETE FROM NullableTest"; + try { session() << sql, now; } + catch (DataException& ce) + { + std::cout << ce.displayText() << std::endl; + failmsg(Poco::format("nullableImpl<%s>():\n%s", + std::string(typeid(T).name()), sql)); + } + + const std::string fields = Poco::format("EmptyString, EmptyInteger, EmptyFloat, %s", emptyName); + Poco::Nullable ni; + Poco::Nullable nf; + Poco::Nullable ns; + Poco::Nullable ndt; + + assertTrue(ni.isNull()); + assertTrue(nf.isNull()); + assertTrue(ns.isNull()); + assertTrue(ndt.isNull()); + + sql = Poco::format("INSERT INTO NullableTest (%s) VALUES (?,?,?,?)", fields); + try { session() << sql, use(ns), use(ni), use(nf), use(ndt), now; } + catch (DataException& ce) + { + std::cout << ce.displayText() << std::endl; + failmsg(Poco::format("nullableImpl<%s>():\n%s", + std::string(typeid(T).name()), sql)); + } + + Nullable i = 1; + Nullable f = 1.5; + Nullable s = std::string("abc"); + Nullable d = T(); + + assertTrue(!i.isNull()); + assertTrue(!f.isNull()); + assertTrue(!s.isNull()); + assertTrue(!d.isNull()); + + sql = Poco::format("SELECT %s FROM NullableTest", fields); + try { session() << sql, into(s), into(i), into(f), into(d), now; } + catch (DataException& ce) + { + std::cout << ce.displayText() << std::endl; + failmsg(Poco::format("nullableImpl<%s>():\n%s", + std::string(typeid(T).name()), sql)); + } + + assertTrue(i.isNull()); + assertTrue(f.isNull()); + assertTrue(s.isNull()); + assertTrue(d.isNull()); + + sql = "SELECT * FROM NullableTest"; + Poco::Data::RecordSet rs(session(), sql); + + rs.moveFirst(); + assertTrue(rs.isNull("EmptyString")); + assertTrue(rs.isNull("EmptyInteger")); + assertTrue(rs.isNull("EmptyFloat")); + assertTrue(rs.isNull(emptyName)); + + Poco::Dynamic::Var di = 1; + Poco::Dynamic::Var df = 1.5; + Poco::Dynamic::Var ds = "abc"; + Poco::Dynamic::Var dd = T(); + + assertTrue(!di.isEmpty()); + assertTrue(!df.isEmpty()); + assertTrue(!ds.isEmpty()); + assertTrue(!dd.isEmpty()); + + try { session() << sql, into(ds), into(di), into(df), into(dd), now; } + catch (DataException& ce) + { + std::cout << ce.displayText() << std::endl; + failmsg(Poco::format("nullableImpl<%s>():\n%s", + std::string(typeid(T).name()), sql)); + } + + assertTrue(di.isEmpty()); + assertTrue(df.isEmpty()); + assertTrue(ds.isEmpty()); + assertTrue(dd.isEmpty()); + } void nullable(); void unicode(const std::string& dbConnString); diff --git a/Data/DataTest/src/SQLExecutor.cpp b/Data/DataTest/src/SQLExecutor.cpp index c8455217a..8741bddda 100644 --- a/Data/DataTest/src/SQLExecutor.cpp +++ b/Data/DataTest/src/SQLExecutor.cpp @@ -32,7 +32,6 @@ #include "Poco/Data/Session.h" #include "Poco/Data/SessionPool.h" #include "Poco/Data/StatementImpl.h" -#include "Poco/Data/RecordSet.h" #include "Poco/Data/RowIterator.h" #include "Poco/Data/RowFilter.h" #include "Poco/Data/BulkExtraction.h" @@ -46,7 +45,6 @@ #include -using namespace Poco::Data::Keywords; using Poco::Data::Session; using Poco::Data::SessionPool; using Poco::Data::Statement; @@ -4276,49 +4274,8 @@ void SQLExecutor::transactor() void SQLExecutor::nullable() { - try { session() << "INSERT INTO NullableTest VALUES(NULL, NULL, NULL, NULL)", now; } catch(DataException& ce){ std::cout << ce.displayText() << std::endl; fail ("nullable()", __LINE__, __FILE__); } - - Nullable i = 1; - Nullable f = 1.5; - Nullable s = std::string("abc"); - Nullable d = DateTime(); - - assertTrue (!i.isNull()); - assertTrue (!f.isNull()); - assertTrue (!s.isNull()); - assertTrue (!d.isNull()); - - session() << "SELECT EmptyString, EmptyInteger, EmptyFloat, EmptyDateTime FROM NullableTest", into(s), into(i), into(f), into(d), now; - - assertTrue (i.isNull()); - assertTrue (f.isNull()); - assertTrue (s.isNull()); - assertTrue (d.isNull()); - - RecordSet rs(session(), "SELECT * FROM NullableTest"); - - rs.moveFirst(); - assertTrue (rs.isNull("EmptyString")); - assertTrue (rs.isNull("EmptyInteger")); - assertTrue (rs.isNull("EmptyFloat")); - assertTrue (rs.isNull("EmptyDateTime")); - - Var di = 1; - Var df = 1.5; - Var ds = "abc"; - Var dd = DateTime(); - - assertTrue (!di.isEmpty()); - assertTrue (!df.isEmpty()); - assertTrue (!ds.isEmpty()); - assertTrue (!dd.isEmpty()); - - Statement stmt = (session() << "SELECT EmptyString, EmptyInteger, EmptyFloat, EmptyDateTime FROM NullableTest", into(ds), into(di), into(df), into(dd), now); - - assertTrue (di.isEmpty()); - assertTrue (df.isEmpty()); - assertTrue (ds.isEmpty()); - assertTrue (dd.isEmpty()); + nullableImpl("EmptyDate"s); + nullableImpl("EmptyDateTime"s); } @@ -4334,17 +4291,14 @@ void SQLExecutor::reconnect() try { session() << formatSQL("INSERT INTO Person VALUES (?,?,?,?)"), use(lastName), use(firstName), use(address), use(age), now; } catch(DataException& ce) { - std::cout << ce.displayText() << std::endl; - fail (__func__, __LINE__, __FILE__); + failmsg (ce.displayText()); } - count = 0; try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(DataException& ce) { - std::cout << ce.displayText() << std::endl; - fail (__func__, __LINE__, __FILE__); + failmsg(ce.displayText()); } assertTrue (count == 1); @@ -4364,8 +4318,7 @@ void SQLExecutor::reconnect() try { session() << "SELECT Age FROM Person", into(count), now; } catch(DataException& ce) { - std::cout << ce.displayText() << std::endl; - fail (__func__, __LINE__, __FILE__); + failmsg (ce.displayText()); } assertTrue (count == age); diff --git a/Data/Data_vs160.vcxproj b/Data/Data_vs160.vcxproj index 1201bee99..c283efae8 100644 --- a/Data/Data_vs160.vcxproj +++ b/Data/Data_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34714.143 + <_ProjectFileVersion>17.0.35219.272 PocoDatad PocoDatamdd PocoDatamtd diff --git a/Data/Data_vs160.vcxproj.filters b/Data/Data_vs160.vcxproj.filters index ecb0ba345..946cf7d67 100644 --- a/Data/Data_vs160.vcxproj.filters +++ b/Data/Data_vs160.vcxproj.filters @@ -2,67 +2,67 @@ - {528aa50f-2040-4550-bb1a-e8714fa9e397} + {13cdb277-4024-43e6-b61d-850cb1f6289a} - {ad859e9e-0eb9-43f8-a8f5-46e40630bbe7} + {58aa0803-64a6-432f-8946-62a02cb4aa74} - {1b17b706-c5c0-4dc1-bf63-f7ef7f4d6f69} + {3492d446-bd67-4dba-ad6a-a1cb29ccc07b} - {c162007a-cc64-4388-903d-1e86428c2449} + {ac0271b8-ddbd-4952-bd4b-6a1019cb7714} - {8f0285fa-4c51-4941-a970-f720c50fa100} + {b9d0ae80-9adb-4b35-9bfb-f970c3647cb2} - {9374e43a-a816-4530-b3fc-b8236fb88302} + {16f87310-b1c0-4a75-8a12-4f82506bbde4} - {518bce3c-a0a1-4715-a630-34d968495d85} + {944a68eb-1297-42e7-a298-fb9ac7178836} - {c029af04-a280-487f-904b-702940f02cda} + {a98bafcc-a8d8-4757-8422-80080761f44c} - {31d2afcb-32c4-446a-9078-79d84555ea13} + {d7d17f9a-f213-4b67-9df3-484c2e187728} - {545b20d2-411f-446c-93e3-478851e03ee5} + {61e2747a-9c72-4c4a-b7ba-24126e3411af} - {d2329333-2f82-4149-9aac-134d30277a1d} + {0217d651-6191-48c3-82e6-41b5a24a4318} - {36da5f1b-3021-41e5-8af2-f8b2df8a7a10} + {38eeb228-c619-4df9-9adf-fded0eda3bb7} - {efc50c45-ad85-488f-99fb-d06b2d6b2e7e} + {9f4206d0-dfa7-4561-9a52-5947d1f5c5ca} - {8a7eafa2-d108-44b4-8469-21f58dc0e7df} + {f3687b9d-dc99-4e06-a1f2-7b5993de76fe} - {80a2415c-de8f-4b17-9c32-cc544b83184e} + {76e15c6d-163c-4f93-ba42-1c5161ebfb43} - {b8f31c65-0883-476e-a46d-37cfd728ddf6} + {93532806-9031-43a7-8ace-ee7911514476} - {fed9d069-6ac9-4d17-a1b2-ad65815281ac} + {5469a702-dc98-4b93-8704-e0a0e5550950} - {10ce6ab5-17db-47d2-b757-bdc9309dce35} + {40a0912d-c1cd-4115-8656-f9188e298d2f} - {4581a021-1fd2-4433-9efa-ed26fcd86446} + {1999d77b-6688-4140-8302-5bc088b936a9} - {349c54c3-6280-4a4c-9945-b477a5c1c1c9} + {5cd2e3b6-ca4e-4995-9f8f-b2833e171ec6} - {6ac96d97-b274-4012-9746-c1d76d9853cb} + {25afefcd-48b2-461e-8ed5-722373568902} @@ -180,9 +180,6 @@ DataCore\Header Files - - DataCore\Header Files - DataCore\Header Files @@ -297,6 +294,9 @@ Logging\Header Files + + Logging\Header Files + @@ -374,9 +374,6 @@ DataCore\Source Files - - DataCore\Source Files - DataCore\Source Files @@ -440,6 +437,9 @@ Logging\Source Files + + Logging\Source Files + diff --git a/Data/Data_vs170.sln b/Data/Data_vs170.sln index 6bb60c326..3faf2ac3b 100644 --- a/Data/Data_vs170.sln +++ b/Data/Data_vs170.sln @@ -1,5 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 +VisualStudioVersion = 17.11.35303.130 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_vs170.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs170.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" @@ -7,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataTest", "DataTest\DataTest_vs170.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataTest", "DataTest\DataTest_vs170.vcxproj", "{69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}" ProjectSection(ProjectDependencies) = postProject {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} {1813A463-E349-4FEA-8A8E-4A41E41C0DC7} = {1813A463-E349-4FEA-8A8E-4A41E41C0DC7} @@ -16,187 +18,169 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|ARM64 = debug_shared|ARM64 - release_shared|ARM64 = release_shared|ARM64 - debug_static_mt|ARM64 = debug_static_mt|ARM64 - release_static_mt|ARM64 = release_static_mt|ARM64 - debug_static_md|ARM64 = debug_static_md|ARM64 - release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - release_static_md|Win32 = release_static_md|Win32 debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 + debug_static_md|ARM64 = debug_static_md|ARM64 + debug_static_md|Win32 = debug_static_md|Win32 debug_static_md|x64 = debug_static_md|x64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + debug_static_mt|Win32 = debug_static_mt|Win32 + debug_static_mt|x64 = debug_static_mt|x64 + release_shared|ARM64 = release_shared|ARM64 + release_shared|Win32 = release_shared|Win32 + release_shared|x64 = release_shared|x64 + release_static_md|ARM64 = release_static_md|ARM64 + release_static_md|Win32 = release_static_md|Win32 release_static_md|x64 = release_static_md|x64 + release_static_mt|ARM64 = release_static_mt|ARM64 + release_static_mt|Win32 = release_static_mt|Win32 + release_static_mt|x64 = release_static_mt|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.Build.0 = release_shared|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|ARM64.Build.0 = release_shared|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Build.0 = debug_shared|Win32 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Build.0 = release_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.ActiveCfg = debug_shared|x64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Build.0 = debug_shared|x64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.ActiveCfg = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Build.0 = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Deploy.0 = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Build.0 = debug_static_md|x64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Build.0 = release_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.ActiveCfg = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Build.0 = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Deploy.0 = release_shared|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.ActiveCfg = release_static_md|x64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Build.0 = release_static_md|x64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.Build.0 = release_shared|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 - {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_shared|x64.Build.0 = debug_shared|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_shared|Win32.Build.0 = release_shared|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_shared|x64.ActiveCfg = release_shared|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_shared|x64.Build.0 = release_shared|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_md|x64.Build.0 = release_static_md|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {69F3FD2C-EDBF-4ECD-9584-F82DF531D39F}.release_static_mt|x64.Build.0 = release_static_mt|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/Data_vs170.vcxproj b/Data/Data_vs170.vcxproj index 57940d43a..3eb5d7865 100644 --- a/Data/Data_vs170.vcxproj +++ b/Data/Data_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34714.143 + <_ProjectFileVersion>17.0.35219.272 PocoDataA64d PocoDatamdd PocoDatamtd diff --git a/Data/Data_vs170.vcxproj.filters b/Data/Data_vs170.vcxproj.filters index e3de1552a..f3a340fb2 100644 --- a/Data/Data_vs170.vcxproj.filters +++ b/Data/Data_vs170.vcxproj.filters @@ -2,67 +2,67 @@ - {a99a8840-8abb-4ead-b884-e9448b217938} + {03e6376f-c118-45f4-9f20-3612e7728001} - {07ed166c-bff5-472f-ae5a-0bbf4bca23a5} + {440e4b7a-87ab-4263-a8c0-19272c6ccfb7} - {0a3369a4-0535-4016-a241-3f8a35f9dde1} + {634f1d37-f736-46ff-8a80-1f2e1a195871} - {4720c5de-1df4-4868-97b0-85dadbf54ae0} + {1294ec22-156c-439c-b351-66784dd402d6} - {3d34c960-25c4-415d-9fdc-47a26158cd3b} + {8e6f687c-a49c-49d9-9cab-b19cc49009a3} - {3ecd6aa2-6f21-45a2-b228-585e93a5ee54} + {d7d54add-ee79-4b7b-ab8e-2bc9c28982f3} - {693a3aab-c204-4bfc-99c7-835095ad71c2} + {089c6295-dec5-4507-850c-2315dad6e9b1} - {c444424e-b19c-4470-9e6d-d762b4afd387} + {68200ef0-ce6b-4ca0-a13f-725d141214b8} - {7f620fc7-4c53-4d38-9a13-949a0bfe6a0d} + {e0fd72ce-5804-422a-a215-49cc8a3f3aba} - {2a8d714e-2399-415e-8997-ec2e0cb32857} + {95e1479a-bc5b-4703-846e-e90508666677} - {fbb9a005-c715-4a69-8beb-78ba9e6dd66e} + {28b90395-0403-48e6-93d2-96f8096e3f68} - {5e3877cb-2d0e-4bdf-a442-3e0b01a8f636} + {ca473abc-d9d3-4ff7-9382-d5d156f255f7} - {7ee7ed4e-9d9d-4ee8-a78f-85afdba1cb56} + {228a37e9-050e-46a7-9228-6bdcdc80658f} - {a0f79fdf-3eba-4b6f-aa28-f5674b3958f0} + {ed970e03-ab7b-4535-9c41-cd135b3a4e8a} - {e6b4b310-43aa-4cb7-9b76-99fe989f8b3b} + {fa725084-8e59-403d-a21e-95b2c199fe38} - {166811fe-bbdd-48d6-8d0d-2b65790ca667} + {bf4f56b0-2c24-4115-ac05-4c0e44519f78} - {86ae6af4-a272-46df-ba81-3efd821de785} + {ad2c62f1-7420-45db-b949-a566b80396d5} - {19fcc5b0-d962-4d7d-8143-5b23fd56e47d} + {120fea73-a928-4d6a-b689-43c1e9c2904a} - {e5daf827-3d59-4831-a6d6-32561c72816d} + {14ef5d23-44c3-447e-b793-a11aacf76e90} - {6b600afe-6a9f-41c5-9d4b-026152a0235f} + {5839ed33-06dc-4284-a2a8-7f0d610ab241} - {b0f57e4a-5a7f-4c32-9f16-e29c3a73be40} + {b12c636a-40ae-428c-a099-7672de7140c3} diff --git a/Data/ODBC/src/Binder.cpp b/Data/ODBC/src/Binder.cpp index e0fbe80ca..1d7d411dd 100644 --- a/Data/ODBC/src/Binder.cpp +++ b/Data/ODBC/src/Binder.cpp @@ -378,8 +378,8 @@ void Binder::bind(std::size_t pos, const NullData& val, Direction dir) if (Utility::isError(SQLBindParameter(_rStmt, (SQLUSMALLINT) pos + 1, SQL_PARAM_INPUT, - SQL_C_STINYINT, - Utility::sqlDataType(SQL_C_STINYINT), + SQL_C_CHAR, + Utility::sqlDataType(SQL_C_CHAR), colSize, decDigits, 0, diff --git a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp index f6c766904..109989354 100644 --- a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp +++ b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp @@ -422,7 +422,7 @@ void ODBCDB2Test::dropObject(const std::string& type, const std::string& name) void ODBCDB2Test::recreateNullableTable() { dropObject("TABLE", "NullableTest"); - try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat FLOAT NULL , EmptyDateTime TIMESTAMP NULL)", now; } + try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat FLOAT NULL, EmptyDateTime TIMESTAMP NULL, EmptyDate DATE NULL)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()"); } } diff --git a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp index 0acdf8e4d..f85821270 100644 --- a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp @@ -251,7 +251,7 @@ void ODBCMySQLTest::dropObject(const std::string& type, const std::string& name) void ODBCMySQLTest::recreateNullableTable() { dropObject("TABLE", "NullableTest"); - try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat FLOAT NULL , EmptyDateTime TIMESTAMP NULL)", now; } + try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat FLOAT NULL, EmptyDateTime TIMESTAMP NULL, EmptyDate DATE NULL)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()"); } } diff --git a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp index 99b9e5b3c..db7f4d2b1 100644 --- a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp @@ -754,7 +754,7 @@ void ODBCOracleTest::dropObject(const std::string& type, const std::string& name void ODBCOracleTest::recreateNullableTable() { dropObject("TABLE", "NullableTest"); - try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR2(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat NUMBER NULL , EmptyDateTime TIMESTAMP NULL)", now; } + try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR2(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat NUMBER NULL, EmptyDateTime TIMESTAMP NULL, EmptyDate DATE NULL)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()", __LINE__, __FILE__); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()", __LINE__, __FILE__); } } diff --git a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp index ad018accd..2d5316735 100644 --- a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp @@ -389,7 +389,7 @@ void ODBCPostgreSQLTest::dropObject(const std::string& type, const std::string& void ODBCPostgreSQLTest::recreateNullableTable() { dropObject("TABLE", "NullableTest"); - try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat FLOAT NULL , EmptyDateTime TIMESTAMP NULL)", now; } + try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat FLOAT NULL, EmptyDateTime TIMESTAMP NULL, EmptyDate DATE NULL)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()"); } } diff --git a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp index 1639cc148..14f60f788 100644 --- a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp @@ -753,7 +753,7 @@ void ODBCSQLServerTest::dropObject(const std::string& type, const std::string& n void ODBCSQLServerTest::recreateNullableTable() { dropObject("TABLE", "NullableTest"); - try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat FLOAT NULL , EmptyDateTime DATETIME NULL)", now; } + try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat FLOAT NULL, EmptyDateTime DATETIME NULL, EmptyDate DATE NULL)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()"); } } diff --git a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp index f57ab1da2..92ada607a 100644 --- a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp @@ -168,7 +168,7 @@ void ODBCSQLiteTest::dropObject(const std::string& type, const std::string& name void ODBCSQLiteTest::recreateNullableTable() { dropObject("TABLE", "NullableTest"); - try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat REAL NULL , EmptyDateTime TIMESTAMP NULL)", now; } + try { *_pSession << "CREATE TABLE NullableTest (EmptyString VARCHAR(30) NULL, EmptyInteger INTEGER NULL, EmptyFloat REAL NULL, EmptyDateTime TIMESTAMP NULL, EmptyDate DATE NULL)", now; } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()"); } catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()"); } } diff --git a/Data/src/SQLChannel.cpp b/Data/src/SQLChannel.cpp index 59181c45d..34a747f78 100644 --- a/Data/src/SQLChannel.cpp +++ b/Data/src/SQLChannel.cpp @@ -605,7 +605,7 @@ void SQLChannel::setProperty(const std::string& name, const std::string& value) } else if (name == PROP_ASYNC) { - // no-op + // no-op, deprecated } else if (name == PROP_TIMEOUT) { diff --git a/Data/testsuite/TestSuite_vs160.vcxproj b/Data/testsuite/TestSuite_vs160.vcxproj index a941a505f..52e0177e3 100644 --- a/Data/testsuite/TestSuite_vs160.vcxproj +++ b/Data/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34714.143 + <_ProjectFileVersion>17.0.35219.272 TestSuited TestSuited TestSuited diff --git a/Data/testsuite/TestSuite_vs160.vcxproj.filters b/Data/testsuite/TestSuite_vs160.vcxproj.filters index b8d9e8e00..3518bb636 100644 --- a/Data/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,55 +2,55 @@ - {fbf94003-99cf-49af-a92b-f2203326d38a} + {c1089f69-1043-46ef-9a00-ca6538d4f0af} - {e88351a3-0cf3-46e4-8be8-36154b696fa8} + {26a02d46-7fba-44b2-b1ac-8a1e19a073c4} - {6fb34629-6222-424f-bbca-35c7a77945dc} + {01ee9592-fca5-4909-befe-31d926ebeca8} - {00cab4a2-3abd-4862-8483-ea34b0f8153e} + {4d669438-6cba-4c27-90c7-961ea4ed908e} - {39fdfd80-5b89-4caf-98c4-652044a3211f} + {fcad3329-3729-40aa-9e0d-a237f75f6333} - {396c521c-3463-48a4-831e-e74aba10080b} + {a478a2a9-2c1e-4308-81db-34ad56e7a980} - {c869530d-1fb7-4c49-974e-cab406223baa} + {fa79beed-f637-4579-88c1-efde6e913341} - {1bece5c5-85df-408a-b815-59115b978297} + {d2d0e655-5070-474b-bec5-d9ac2543abf0} - {233064e3-27a7-40b4-9d62-f30d971c1bbc} + {fef35d9e-e7c4-46d7-8620-577b5fee2ce2} - {31b1992c-5bbb-45d0-8816-20eb4296d7fd} + {cf6ef217-908b-452f-bdf0-11a117b4bdf5} - {5136aaed-e528-4aaa-b42e-21334f086909} + {146ec7bc-e9af-4a5a-b65a-8c049a722dbb} - {61ae3d3b-59da-48e2-80d7-c4d2c269ebde} + {2fff623a-1b1c-4683-ac59-68fca2698695} - {f60a00fa-177a-48e2-9cf4-92a8622be1f8} + {11c356d1-b2a5-4a03-9ebc-a4f205e1406d} - {ae1958e0-2771-4853-bc59-801258318d1a} + {f1a49a06-f61a-4b29-8560-47e87e04752a} - {27ba5569-bfa2-4539-b7a8-77b76ce6bf0d} + {f56c1956-a2a2-4b72-977a-8e0b39f0fe01} - {8180550c-e44c-4f20-b180-1be953bed513} + {2326e29d-7732-4249-ac04-d1125bf33723} - {6300bbab-378c-4672-aa62-b07ee9454b7b} + {c5b6a9f7-6e2b-4344-b52f-4809d88c41f8} diff --git a/Data/testsuite/TestSuite_vs170.vcxproj b/Data/testsuite/TestSuite_vs170.vcxproj index d93f857c9..fde437b49 100644 --- a/Data/testsuite/TestSuite_vs170.vcxproj +++ b/Data/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34714.143 + <_ProjectFileVersion>17.0.35219.272 TestSuited TestSuited TestSuited diff --git a/Data/testsuite/TestSuite_vs170.vcxproj.filters b/Data/testsuite/TestSuite_vs170.vcxproj.filters index f7186e5db..4bef38246 100644 --- a/Data/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,55 +2,55 @@ - {09879f5e-9a27-4ca5-8bdf-2caf922d0aa2} + {bb0ebd55-d979-4f1d-9d6b-5f1a9d864a8b} - {578b459b-f730-4ace-9089-7535ba4ffdd3} + {a6f623c2-a4da-42e2-b704-78f4c1c77a7b} - {7e56f300-3692-43c0-9c62-07c2fc611aa5} + {a5d404c7-0bb1-4fa7-bc82-82e54bb087b1} - {81342c6d-8f9c-42e0-9bb7-c1ea3228d822} + {8a7863be-a397-442a-a54e-5bf053df800e} - {d742d34f-b267-4ac2-8881-d303429b66db} + {e9728fe9-496b-4624-844b-337a744d8846} - {85c1ce22-860f-4537-bafe-e3aa4c8760be} + {61e6b530-24da-4292-9369-53bd835f38a5} - {ce058e4f-5f84-4fd3-b9a6-22a35b9bcd29} + {5f5c6bb2-c1ff-4ed5-866f-2744d524d664} - {e65c754a-782e-44f1-8f9e-d45486188c5e} + {a20dfe8f-4446-455b-a8f5-aa183d7f17c3} - {0c834c25-96c5-453e-be27-b7e392205027} + {52fd1b8e-0088-4d38-b15e-bc6a6b9bc5e6} - {a0843fcc-9709-4394-bb18-dad407a391a9} + {51a8a862-ba67-4982-a425-2d9e7d49b7f0} - {8cf6846e-95ac-4296-8dc5-29233513e8cf} + {13aa08f0-9f2c-4941-ac91-be8486060574} - {13983d13-cd4b-4673-9cbe-3b7ce5ee1efc} + {ea874104-4a73-4420-ab97-5633094b57cc} - {3a37dae5-c757-4617-bbd6-bcdc0d865f10} + {7a11bbe2-6f3f-46c7-b1ab-a0a6bdac4811} - {fc84313c-4094-4adc-9078-4ea7b626ddf4} + {f04238e3-44d2-49b0-86dc-1d4c8065c60f} - {7d4ed969-8c74-4301-947a-5d8e7a8fc0d0} + {683934ab-f76e-4db9-9848-7a199fd61919} - {9ba3fa0b-3c87-416a-a3cd-f9c8711c9b91} + {10d4c442-4da3-4140-aeca-cbf9c75a0cd2} - {31c7f857-d18f-496c-bf11-7f07e185f2c1} + {d64bc269-033e-47af-8196-489c595c5daf} diff --git a/Foundation/Foundation_vs170.vcxproj b/Foundation/Foundation_vs170.vcxproj index 58905dbfe..4491d060f 100644 --- a/Foundation/Foundation_vs170.vcxproj +++ b/Foundation/Foundation_vs170.vcxproj @@ -325,7 +325,7 @@ Disabled - .\include;%(AdditionalIncludeDirectories) + .\include;..\Trace\include;..\Trace\include\Poco\Trace;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;UTF8PROC_STATIC;%(PreprocessorDefinitions) true false @@ -359,7 +359,7 @@ Disabled - .\include;%(AdditionalIncludeDirectories) + .\include;..\Trace\include;..\Trace\include\Poco\Trace;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;UTF8PROC_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -392,7 +392,7 @@ Disabled - .\include;%(AdditionalIncludeDirectories) + .\include;..\Trace\include;..\Trace\include\Poco\Trace;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;Foundation_EXPORTS;UTF8PROC_STATIC;%(PreprocessorDefinitions) true EnableFastChecks diff --git a/Foundation/include/Poco/Foundation.h b/Foundation/include/Poco/Foundation.h index 852758759..9f51c4754 100644 --- a/Foundation/include/Poco/Foundation.h +++ b/Foundation/include/Poco/Foundation.h @@ -159,5 +159,4 @@ using LineNumber = decltype(__LINE__); #include "Poco/Types.h" - #endif // Foundation_Foundation_INCLUDED diff --git a/Foundation/src/DateTimeParser.cpp b/Foundation/src/DateTimeParser.cpp index 25afa54b4..8da6e2562 100644 --- a/Foundation/src/DateTimeParser.cpp +++ b/Foundation/src/DateTimeParser.cpp @@ -66,7 +66,7 @@ namespace { { return std::stoi(number); } - catch(const std::exception& e) + catch(const std::exception&) { throw Poco::SyntaxException("Invalid DateTimeString: " + dtStr + ", invalid number: " + number); } @@ -111,7 +111,7 @@ void DateTimeParser::parse(const std::string& fmt, const std::string& dtStr, Dat { return std::stoi(number); } - catch(const std::exception& e) + catch(const std::exception&) { throw SyntaxException("Invalid DateTimeString: " + dtStr + ", invalid number: " + number); } @@ -143,7 +143,7 @@ void DateTimeParser::parse(const std::string& fmt, const std::string& dtStr, Dat { result = std::stoi(number); } - catch(const std::exception& e) + catch(const std::exception&) { throw SyntaxException("Invalid DateTimeString: " + dtStr + ", invalid number: " + number); } @@ -448,7 +448,7 @@ int DateTimeParser::parseTZD(std::string::const_iterator& it, const std::string: { hours = parseNumberN("", it, end, 2); } - catch(const SyntaxException& e) + catch(const SyntaxException&) { throw SyntaxException("Timezone invalid number: hours"); } @@ -461,7 +461,7 @@ int DateTimeParser::parseTZD(std::string::const_iterator& it, const std::string: { minutes = parseNumberN("", it, end, 2); } - catch(const SyntaxException& e) + catch(const SyntaxException&) { throw SyntaxException("Timezone invalid number: minutes"); } diff --git a/Foundation/src/Exception.cpp b/Foundation/src/Exception.cpp index d42203fb9..660b773fe 100644 --- a/Foundation/src/Exception.cpp +++ b/Foundation/src/Exception.cpp @@ -17,6 +17,7 @@ #ifdef POCO_ENABLE_TRACE #include #include "cpptrace/cpptrace.hpp" +#include "Poco/Trace/Trace.h" #endif diff --git a/Trace/Trace.progen b/Trace/Trace.progen index c67b37823..de32b40f8 100644 --- a/Trace/Trace.progen +++ b/Trace/Trace.progen @@ -7,11 +7,12 @@ vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = ..\\Foundation\\include -vc.project.compiler.defines = -vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS +vc.project.compiler.include = .\\include\\Poco\\Trace +vc.project.compiler.defines = CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX +vc.project.compiler.defines.static = CPPTRACE_STATIC_DEFINE +vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS;cpptrace_lib_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.additionalOptions = /Zc:__cplusplus +vc.project.linker.dependencies.Win32 = dbghelp.lib vc.solution.create = true -vc.solution.include = testsuite\\TestSuite diff --git a/Trace/Trace_vs160.sln b/Trace/Trace_vs160.sln new file mode 100644 index 000000000..b3d1b650b --- /dev/null +++ b/Trace/Trace_vs160.sln @@ -0,0 +1,61 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Trace", "Trace_vs160.vcxproj", "{D025A708-F30A-379F-928A-27D2581B2803}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|Win32.Build.0 = release_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|x64.Build.0 = debug_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|x64.ActiveCfg = release_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|x64.Build.0 = release_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|x64.Deploy.0 = release_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|x64.Build.0 = release_static_md|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Trace/Trace_vs160.vcxproj b/Trace/Trace_vs160.vcxproj new file mode 100644 index 000000000..e0125f47f --- /dev/null +++ b/Trace/Trace_vs160.vcxproj @@ -0,0 +1,686 @@ + + + + + debug_shared + Win32 + + + debug_shared + x64 + + + debug_static_md + Win32 + + + debug_static_md + x64 + + + debug_static_mt + Win32 + + + debug_static_mt + x64 + + + release_shared + Win32 + + + release_shared + x64 + + + release_static_md + Win32 + + + release_static_md + x64 + + + release_static_mt + Win32 + + + release_static_mt + x64 + + + + 17.0 + Trace + {D025A708-F30A-379F-928A-27D2581B2803} + Trace + Win32Proj + + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + DynamicLibrary + MultiByte + v142 + + + DynamicLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + StaticLibrary + MultiByte + v142 + + + DynamicLibrary + MultiByte + v142 + + + DynamicLibrary + MultiByte + v142 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>17.0.35219.272 + PocoTraced + PocoTracemdd + PocoTracemtd + PocoTrace + PocoTracemd + PocoTracemt + PocoTrace64d + PocoTracemdd + PocoTracemtd + PocoTrace64 + PocoTracemd + PocoTracemt + + + ..\bin\ + obj\Trace\$(Configuration)\ + true + + + ..\bin\ + obj\Trace\$(Configuration)\ + false + + + ..\lib\ + obj\Trace\$(Configuration)\ + + + ..\lib\ + obj\Trace\$(Configuration)\ + + + ..\lib\ + obj\Trace\$(Configuration)\ + + + ..\lib\ + obj\Trace\$(Configuration)\ + + + ..\bin64\ + obj64\Trace\$(Configuration)\ + true + + + ..\bin64\ + obj64\Trace\$(Configuration)\ + false + + + ..\lib64\ + obj64\Trace\$(Configuration)\ + + + ..\lib64\ + obj64\Trace\$(Configuration)\ + + + ..\lib64\ + obj64\Trace\$(Configuration)\ + + + ..\lib64\ + obj64\Trace\$(Configuration)\ + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;Trace_EXPORTS;cpptrace_lib_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\bin\PocoTraced.dll + true + true + $(OutDir)$(TargetName).pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoTraced.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;Trace_EXPORTS;cpptrace_lib_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\bin\PocoTrace.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoTrace.lib + MachineX86 + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + ProgramDatabase + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib\PocoTracemtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib\PocoTracemt.lib + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + ProgramDatabase + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib\PocoTracemdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\lib\PocoTracemd.lib + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;Trace_EXPORTS;cpptrace_lib_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\bin64\PocoTrace64d.dll + true + true + $(OutDir)$(TargetName).pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoTraced.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;Trace_EXPORTS;cpptrace_lib_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\bin64\PocoTrace64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoTrace.lib + MachineX64 + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + ProgramDatabase + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib64\PocoTracemtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib64\PocoTracemt.lib + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + ProgramDatabase + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib64\PocoTracemdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib64\PocoTracemd.lib + + + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + + + + + + + + + + + + + + + + + + diff --git a/Trace/Trace_vs160.vcxproj.filters b/Trace/Trace_vs160.vcxproj.filters new file mode 100644 index 000000000..38b3327ac --- /dev/null +++ b/Trace/Trace_vs160.vcxproj.filters @@ -0,0 +1,99 @@ + + + + + {a14aaa13-add4-4b58-981f-85f5e99b0507} + + + {21b68dae-70c1-4f26-8a7e-789d663ab800} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Trace/Trace_vs170.sln b/Trace/Trace_vs170.sln new file mode 100644 index 000000000..93a530b62 --- /dev/null +++ b/Trace/Trace_vs170.sln @@ -0,0 +1,85 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Trace", "Trace_vs170.vcxproj", "{D025A708-F30A-379F-928A-27D2581B2803}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|ARM64 = debug_shared|ARM64 + release_shared|ARM64 = release_shared|ARM64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + release_static_mt|ARM64 = release_static_mt|ARM64 + debug_static_md|ARM64 = debug_static_md|ARM64 + release_static_md|ARM64 = release_static_md|ARM64 + debug_shared|Win32 = debug_shared|Win32 + release_shared|Win32 = release_shared|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 + debug_shared|x64 = debug_shared|x64 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|Win32.Build.0 = release_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|x64.Build.0 = debug_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|x64.ActiveCfg = release_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|x64.Build.0 = release_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_shared|x64.Deploy.0 = release_shared|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|x64.Build.0 = release_static_md|x64 + {D025A708-F30A-379F-928A-27D2581B2803}.release_static_md|x64.Deploy.0 = release_static_md|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Trace/Trace_vs170.vcxproj b/Trace/Trace_vs170.vcxproj new file mode 100644 index 000000000..4246728d5 --- /dev/null +++ b/Trace/Trace_vs170.vcxproj @@ -0,0 +1,972 @@ + + + + + debug_shared + ARM64 + + + debug_shared + Win32 + + + debug_shared + x64 + + + debug_static_md + ARM64 + + + debug_static_md + Win32 + + + debug_static_md + x64 + + + debug_static_mt + ARM64 + + + debug_static_mt + Win32 + + + debug_static_mt + x64 + + + release_shared + ARM64 + + + release_shared + Win32 + + + release_shared + x64 + + + release_static_md + ARM64 + + + release_static_md + Win32 + + + release_static_md + x64 + + + release_static_mt + ARM64 + + + release_static_mt + Win32 + + + release_static_mt + x64 + + + + 17.0 + Trace + {D025A708-F30A-379F-928A-27D2581B2803} + Trace + Win32Proj + + + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + DynamicLibrary + MultiByte + v143 + + + DynamicLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + DynamicLibrary + MultiByte + v143 + + + DynamicLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + DynamicLibrary + MultiByte + v143 + + + DynamicLibrary + MultiByte + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>17.0.35219.272 + PocoTraceA64d + PocoTracemdd + PocoTracemtd + PocoTraceA64 + PocoTracemd + PocoTracemt + PocoTraced + PocoTracemdd + PocoTracemtd + PocoTrace + PocoTracemd + PocoTracemt + PocoTrace64d + PocoTracemdd + PocoTracemtd + PocoTrace64 + PocoTracemd + PocoTracemt + + + ..\binA64\ + objA64\Trace\$(Configuration)\ + true + + + ..\binA64\ + objA64\Trace\$(Configuration)\ + false + + + ..\libA64\ + objA64\Trace\$(Configuration)\ + + + ..\libA64\ + objA64\Trace\$(Configuration)\ + + + ..\libA64\ + objA64\Trace\$(Configuration)\ + + + ..\libA64\ + objA64\Trace\$(Configuration)\ + + + ..\bin\ + obj\Trace\$(Configuration)\ + true + + + ..\bin\ + obj\Trace\$(Configuration)\ + false + + + ..\lib\ + obj\Trace\$(Configuration)\ + + + ..\lib\ + obj\Trace\$(Configuration)\ + + + ..\lib\ + obj\Trace\$(Configuration)\ + + + ..\lib\ + obj\Trace\$(Configuration)\ + + + ..\bin64\ + obj64\Trace\$(Configuration)\ + true + + + ..\bin64\ + obj64\Trace\$(Configuration)\ + false + + + ..\lib64\ + obj64\Trace\$(Configuration)\ + + + ..\lib64\ + obj64\Trace\$(Configuration)\ + + + ..\lib64\ + obj64\Trace\$(Configuration)\ + + + ..\lib64\ + obj64\Trace\$(Configuration)\ + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;Trace_EXPORTS;cpptrace_lib_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\binA64\PocoTraceA64d.dll + true + true + $(OutDir)$(TargetName).pdb + ..\libA64;%(AdditionalLibraryDirectories) + Console + ..\libA64\PocoTraced.lib + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;Trace_EXPORTS;cpptrace_lib_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\binA64\PocoTraceA64.dll + true + false + ..\libA64;%(AdditionalLibraryDirectories) + Console + true + true + ..\libA64\PocoTrace.lib + MachineARM64 + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + ProgramDatabase + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\libA64\PocoTracemtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\libA64\PocoTracemt.lib + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + ProgramDatabase + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\libA64\PocoTracemdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\libA64\PocoTracemd.lib + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;Trace_EXPORTS;cpptrace_lib_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\bin\PocoTraced.dll + true + true + $(OutDir)$(TargetName).pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoTraced.lib + MachineX86 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;Trace_EXPORTS;cpptrace_lib_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\bin\PocoTrace.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoTrace.lib + MachineX86 + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + ProgramDatabase + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib\PocoTracemtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib\PocoTracemt.lib + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + ProgramDatabase + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib\PocoTracemdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\lib\PocoTracemd.lib + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;Trace_EXPORTS;cpptrace_lib_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\bin64\PocoTrace64d.dll + true + true + $(OutDir)$(TargetName).pdb + ..\lib64;%(AdditionalLibraryDirectories) + Console + ..\lib64\PocoTraced.lib + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;Trace_EXPORTS;cpptrace_lib_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + dbghelp.lib;%(AdditionalDependencies) + ..\bin64\PocoTrace64.dll + true + false + ..\lib64;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib64\PocoTrace.lib + MachineX64 + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + ProgramDatabase + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib64\PocoTracemtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib64\PocoTracemt.lib + + + + + Disabled + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + $(OutDir)$(TargetName).pdb + Level3 + ProgramDatabase + Default + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib64\PocoTracemdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;.\include\Poco\Trace;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;CPPTRACE_GET_SYMBOLS_WITH_DBGHELP;CPPTRACE_UNWIND_WITH_DBGHELP;CPPTRACE_DEMANGLE_WITH_WINAPI;NOMINMAX;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ..\lib64\PocoTracemd.lib + + + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + true + stdcpp17 + stdc11 + + + + + + + + + + + + + + + + + + + + diff --git a/Trace/Trace_vs170.vcxproj.filters b/Trace/Trace_vs170.vcxproj.filters new file mode 100644 index 000000000..9dd6724b3 --- /dev/null +++ b/Trace/Trace_vs170.vcxproj.filters @@ -0,0 +1,99 @@ + + + + + {526232f7-34f1-4fbc-9cac-9168e5209649} + + + {5623fdac-d9b3-43b6-8165-3b662f22f9b0} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Trace/Trace_vs90.sln b/Trace/Trace_vs90.sln index 6ed2fc75e..912af6ec9 100644 --- a/Trace/Trace_vs90.sln +++ b/Trace/Trace_vs90.sln @@ -1,11 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSON", "JSON_vs90.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs90.vcproj", "{96CF3103-E49E-3F5E-A11D-6DBCDA043053}" - ProjectSection(ProjectDependencies) = postProject - {0E7FE914-0690-3EB4-9119-93A97CC97741} = {0E7FE914-0690-3EB4-9119-93A97CC97741} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Trace", "Trace_vs90.vcproj", "{0E7FE914-0690-3EB4-9119-93A97CC97741}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Trace/Trace_vs90.vcproj b/Trace/Trace_vs90.vcproj index 471b77dbf..13eb41db3 100644 --- a/Trace/Trace_vs90.vcproj +++ b/Trace/Trace_vs90.vcproj @@ -497,11 +497,67 @@ Name="Source Files" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -509,11 +565,55 @@ Name="Header Files" > + + + + + + + + + + + + + + + + + + + + + +