diff --git a/ActiveRecord/ActiveRecord_vs170.vcxproj b/ActiveRecord/ActiveRecord_vs170.vcxproj index cc4b70f39..6637aae27 100644 --- a/ActiveRecord/ActiveRecord_vs170.vcxproj +++ b/ActiveRecord/ActiveRecord_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoActiveRecordA64d PocoActiveRecordmdd PocoActiveRecordmtd @@ -346,6 +346,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\binA64\PocoActiveRecordA64d.dll @@ -379,6 +381,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\binA64\PocoActiveRecordA64.dll @@ -410,6 +414,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\libA64\PocoActiveRecordmtd.lib @@ -436,6 +442,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\libA64\PocoActiveRecordmt.lib @@ -459,6 +467,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\libA64\PocoActiveRecordmdd.lib @@ -485,6 +495,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\libA64\PocoActiveRecordmd.lib @@ -508,6 +520,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin\PocoActiveRecordd.dll @@ -541,6 +555,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin\PocoActiveRecord.dll @@ -572,6 +588,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoActiveRecordmtd.lib @@ -598,6 +616,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib\PocoActiveRecordmt.lib @@ -621,6 +641,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoActiveRecordmdd.lib @@ -647,6 +669,8 @@ Default true + stdcpp17 + stdc11 ..\lib\PocoActiveRecordmd.lib @@ -670,6 +694,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin64\PocoActiveRecord64d.dll @@ -703,6 +729,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin64\PocoActiveRecord64.dll @@ -734,6 +762,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoActiveRecordmtd.lib @@ -760,6 +790,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib64\PocoActiveRecordmt.lib @@ -783,6 +815,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoActiveRecordmdd.lib @@ -809,6 +843,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib64\PocoActiveRecordmd.lib @@ -825,15 +861,23 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/ActiveRecord/ActiveRecord_vs170.vcxproj.filters b/ActiveRecord/ActiveRecord_vs170.vcxproj.filters index 4d935e8dc..73cd1f48a 100644 --- a/ActiveRecord/ActiveRecord_vs170.vcxproj.filters +++ b/ActiveRecord/ActiveRecord_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {73c14701-9a05-4ff0-ad45-6a014639a69e} + {2abfaee0-49a0-4b66-9ad7-04a203cfc8cb} - {163f196a-9202-45e4-80aa-20307db240a7} + {70b1a521-93e8-4228-ae59-baa5f0e57675} - {15a3b1af-8e8c-4aff-bb0f-04c75fcc1610} + {6b444098-e516-439f-aaf8-266510aa8702} diff --git a/ActiveRecord/Compiler/Compiler_vs170.vcxproj b/ActiveRecord/Compiler/Compiler_vs170.vcxproj index eee21df90..6601a94d2 100644 --- a/ActiveRecord/Compiler/Compiler_vs170.vcxproj +++ b/ActiveRecord/Compiler/Compiler_vs170.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -75,6 +75,7 @@ + 17.0 Compiler {84DD1CB5-4735-478A-B48E-5E4858F0E831} Compiler @@ -229,7 +230,7 @@ - <_ProjectFileVersion>16.0.33423.256 + <_ProjectFileVersion>17.0.34322.80 poco-arcd poco-arcd poco-arcd @@ -355,14 +356,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 - binA64\poco-arcd.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\poco-arcd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -386,7 +390,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 binA64\poco-arc.exe @@ -414,7 +421,10 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -422,7 +432,7 @@ ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\poco-arcd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -446,7 +456,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -475,7 +488,10 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -483,7 +499,7 @@ ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\poco-arcd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -507,11 +523,14 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - binA64\static_md\poco-arc.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -536,14 +555,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 bin\poco-arcd.exe ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\poco-arcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -567,7 +589,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 bin\poco-arc.exe @@ -595,7 +620,10 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -603,7 +631,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\poco-arcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -627,7 +655,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -656,7 +687,10 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -664,7 +698,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\poco-arcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -688,7 +722,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -717,14 +754,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 bin64\poco-arcd.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\poco-arcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -748,7 +788,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 bin64\poco-arc.exe @@ -776,7 +819,10 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -784,7 +830,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\poco-arcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -808,7 +854,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -837,7 +886,10 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -845,7 +897,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\poco-arcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -869,7 +921,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -885,18 +940,28 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/ActiveRecord/Compiler/Compiler_vs170.vcxproj.filters b/ActiveRecord/Compiler/Compiler_vs170.vcxproj.filters index 26f02379a..bda25bf21 100644 --- a/ActiveRecord/Compiler/Compiler_vs170.vcxproj.filters +++ b/ActiveRecord/Compiler/Compiler_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {8696c7e6-f237-4b80-85b6-deff68bb7313} + {7f2913e1-102b-4ce6-a4b2-f99c8e3a38cd} - {809f78f0-73d1-44df-992c-7aa5a1b3392b} + {9edf2033-52b6-4c16-a062-2b35e3cefb3c} diff --git a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj index f7df61046..7fae30584 100644 --- a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj +++ b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 TestSuited TestSuited TestSuited @@ -358,6 +358,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitd.lib;%(AdditionalDependencies) @@ -391,6 +393,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnit.lib;%(AdditionalDependencies) @@ -421,6 +425,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -454,6 +460,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -484,6 +492,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -517,6 +527,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -547,6 +559,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitd.lib;%(AdditionalDependencies) @@ -580,6 +594,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnit.lib;%(AdditionalDependencies) @@ -610,6 +626,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -643,6 +661,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -673,6 +693,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -706,6 +728,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -736,6 +760,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitd.lib;%(AdditionalDependencies) @@ -769,6 +795,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnit.lib;%(AdditionalDependencies) @@ -799,6 +827,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -832,6 +862,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -862,6 +894,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -895,6 +929,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -910,18 +946,28 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj.filters b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj.filters index 7b9a51f7d..395638527 100644 --- a/ActiveRecord/testsuite/TestSuite_vs170.vcxproj.filters +++ b/ActiveRecord/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,16 +2,16 @@ - {441842f8-5906-4eba-8622-ce2adb220b2c} + {40b247c9-e15e-4d60-abc1-cf9c1cb2f66e} - {d9408da8-d459-41c9-a781-65c0f5434c36} + {1a029e91-d286-42b9-8a58-c4a09641a8ae} - {b89d1d90-8f75-4b8e-a5f5-70f76b1f6831} + {73651c18-d9ec-4a46-b4d9-3f28ae384bb3} - {7f27626c-1bc5-4720-8115-2e140a2110f3} + {8382d412-0a64-4d8c-ad1e-befe17f70b65} diff --git a/CppParser/CppParser_vs170.vcxproj b/CppParser/CppParser_vs170.vcxproj index 9dfabac9b..398da6b04 100644 --- a/CppParser/CppParser_vs170.vcxproj +++ b/CppParser/CppParser_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoCppParserA64d PocoCppParsermdd PocoCppParsermtd @@ -344,13 +344,16 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\binA64\PocoCppParserA64d.dll true true - ..\binA64\PocoCppParserA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoCppParserd.lib @@ -376,7 +379,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\binA64\PocoCppParserA64.dll @@ -403,11 +409,13 @@ true true - ..\libA64\PocoCppParsermtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\libA64\PocoCppParsermtd.lib @@ -432,7 +440,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\libA64\PocoCppParsermt.lib @@ -451,11 +462,13 @@ true true - ..\libA64\PocoCppParsermdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\libA64\PocoCppParsermdd.lib @@ -480,7 +493,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\libA64\PocoCppParsermd.lib @@ -502,13 +518,16 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin\PocoCppParserd.dll true true - ..\bin\PocoCppParserd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoCppParserd.lib @@ -534,7 +553,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin\PocoCppParser.dll @@ -561,11 +583,13 @@ true true - ..\lib\PocoCppParsermtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoCppParsermtd.lib @@ -590,7 +614,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib\PocoCppParsermt.lib @@ -609,11 +636,13 @@ true true - ..\lib\PocoCppParsermdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoCppParsermdd.lib @@ -635,11 +664,13 @@ true true - ..\lib\PocoCppParsermd.pdb + $(OutDir)$(TargetName).pdb Level3 Default true + stdcpp17 + stdc11 ..\lib\PocoCppParsermd.lib @@ -661,13 +692,16 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin64\PocoCppParser64d.dll true true - ..\bin64\PocoCppParser64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoCppParserd.lib @@ -693,7 +727,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin64\PocoCppParser64.dll @@ -720,11 +757,13 @@ true true - ..\lib64\PocoCppParsermtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoCppParsermtd.lib @@ -749,7 +788,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib64\PocoCppParsermt.lib @@ -768,11 +810,13 @@ true true - ..\lib64\PocoCppParsermdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoCppParsermdd.lib @@ -797,7 +841,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib64\PocoCppParsermd.lib @@ -826,54 +873,88 @@ 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 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/CppParser/CppParser_vs170.vcxproj.filters b/CppParser/CppParser_vs170.vcxproj.filters index 81ba36469..cd9562122 100644 --- a/CppParser/CppParser_vs170.vcxproj.filters +++ b/CppParser/CppParser_vs170.vcxproj.filters @@ -2,31 +2,31 @@ - {803680d7-8697-4833-ac76-c0b035a48327} + {22a4c008-4a23-452a-a12a-0f6595ae1200} - {6a32a7ae-3ba1-4d1b-a430-369514733719} + {2e3628cf-e59b-487e-97d3-46b28b5da8bb} - {d26b3bc1-6ae7-43a8-b70a-7b92124b85ba} + {0ecc68a2-22c2-49af-a1fa-5a79c770e52c} - {d733f192-ef00-4438-9249-ed2f61cda759} + {975cd316-19e5-4786-aef8-112ead31879b} - {835f5859-0043-4810-b49f-569906e74133} + {7f74c210-2a9e-45b7-9fb1-748934d57b22} - {d2110c01-94b4-49f3-af2c-e902c90a3b01} + {f605c7cb-1238-4ceb-a104-d0d0e63dd7b3} - {f2afc2af-bcb9-4800-8ec3-7c4cdd55f76c} + {315aef06-cd6e-4d01-8d73-5e1dbff488fd} - {ceac8a5a-7b87-4cad-8be7-1578e4516e01} + {f5c52f93-e8ca-4de7-b0ce-c7fb7a0ad50f} - {b152b378-58a8-4c41-8bcf-f6d1a1a247b9} + {2bf7e8a4-f378-436f-b321-4b7ec8b9fe1d} diff --git a/CppUnit/CppUnit_vs170.vcxproj b/CppUnit/CppUnit_vs170.vcxproj index d135a2314..ac2aa93eb 100644 --- a/CppUnit/CppUnit_vs170.vcxproj +++ b/CppUnit/CppUnit_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 CppUnitA64d CppUnitmdd CppUnitmtd @@ -346,6 +346,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\binA64\CppUnitA64d.dll @@ -379,6 +381,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\binA64\CppUnitA64.dll @@ -410,6 +414,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\libA64\CppUnitmtd.lib @@ -436,6 +442,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\libA64\CppUnitmt.lib @@ -459,6 +467,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\libA64\CppUnitmdd.lib @@ -485,6 +495,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\libA64\CppUnitmd.lib @@ -508,6 +520,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin\CppUnitd.dll @@ -541,6 +555,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin\CppUnit.dll @@ -572,6 +588,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\CppUnitmtd.lib @@ -598,6 +616,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib\CppUnitmt.lib @@ -621,6 +641,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\CppUnitmdd.lib @@ -647,6 +669,8 @@ Default true + stdcpp17 + stdc11 ..\lib\CppUnitmd.lib @@ -670,6 +694,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin64\CppUnit64d.dll @@ -703,6 +729,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin64\CppUnit64.dll @@ -734,6 +762,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\CppUnitmtd.lib @@ -760,6 +790,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib64\CppUnitmt.lib @@ -783,6 +815,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\CppUnitmdd.lib @@ -809,6 +843,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib64\CppUnitmd.lib @@ -817,27 +853,43 @@ 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/CppUnit/CppUnit_vs170.vcxproj.filters b/CppUnit/CppUnit_vs170.vcxproj.filters index 03c16c4ec..f6e5b32f1 100644 --- a/CppUnit/CppUnit_vs170.vcxproj.filters +++ b/CppUnit/CppUnit_vs170.vcxproj.filters @@ -2,11 +2,11 @@ - {84e2f454-350e-4e2b-8bfd-f3cbbb62f23c} + {c81826ae-391d-40d2-ad57-7d8ed59ba862} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {e32858e2-8161-4416-aa5b-e230b409f24b} + {6baa3333-3a56-45c4-a3a4-6774d2121132} *.h diff --git a/Crypto/Crypto_vs170.vcxproj b/Crypto/Crypto_vs170.vcxproj index ca4d885d4..e84fc6059 100644 --- a/Crypto/Crypto_vs170.vcxproj +++ b/Crypto/Crypto_vs170.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -75,6 +75,7 @@ + 17.0 Crypto {EEEE7259-32E9-4D56-B023-C733940AB2A0} Crypto @@ -229,7 +230,7 @@ - <_ProjectFileVersion>16.0.32629.160 + <_ProjectFileVersion>17.0.34322.80 PocoCryptoA64d PocoCryptomdd PocoCryptomtd @@ -343,14 +344,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\binA64\PocoCryptoA64d.dll true true - ..\binA64\PocoCryptoA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoCryptod.lib @@ -376,7 +380,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -404,11 +411,13 @@ true true - ..\libA64\PocoCryptomtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\libA64\PocoCryptomtd.lib @@ -433,7 +442,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\libA64\PocoCryptomt.lib @@ -452,11 +464,13 @@ true true - ..\libA64\PocoCryptomdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\libA64\PocoCryptomdd.lib @@ -481,7 +495,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\libA64\PocoCryptomd.lib @@ -503,14 +520,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoCryptod.dll true true - ..\bin\PocoCryptod.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoCryptod.lib @@ -536,7 +556,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -564,11 +587,13 @@ true true - ..\lib\PocoCryptomtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoCryptomtd.lib @@ -593,7 +618,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib\PocoCryptomt.lib @@ -612,11 +640,13 @@ true true - ..\lib\PocoCryptomdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoCryptomdd.lib @@ -638,11 +668,13 @@ true true - ..\lib\PocoCryptomd.pdb + $(OutDir)$(TargetName).pdb Level3 Default true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -665,14 +697,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoCrypto64d.dll true true - ..\bin64\PocoCrypto64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoCryptod.lib @@ -698,7 +733,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -726,11 +764,13 @@ true true - ..\lib64\PocoCryptomtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoCryptomtd.lib @@ -755,7 +795,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib64\PocoCryptomt.lib @@ -774,11 +817,13 @@ true true - ..\lib64\PocoCryptomdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoCryptomdd.lib @@ -803,7 +848,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib64\PocoCryptomd.lib @@ -839,75 +887,123 @@ 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 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/Crypto/Crypto_vs170.vcxproj.filters b/Crypto/Crypto_vs170.vcxproj.filters index 151ae5735..8dd164639 100644 --- a/Crypto/Crypto_vs170.vcxproj.filters +++ b/Crypto/Crypto_vs170.vcxproj.filters @@ -2,58 +2,58 @@ - {956bb6d7-1946-4d8e-a988-6f840553f433} + {e4c49a27-04d0-4ddc-8795-f17c70e2b7e7} - {ac7c9562-5031-4fd3-bf00-58ee2afd58f1} + {c152364e-4636-4536-9d1f-ceb02dffa264} - {bc2c461a-a460-43c5-9dda-e1ac05590b4a} + {9510091e-4f8d-499b-92a6-be553d45316b} - {6f66dac0-646c-425e-98f9-0443b14bea15} + {fbfd0876-4670-4def-a529-7cf8923c2961} - {3cd7a042-61b8-4430-88a3-96de91011504} + {5b21093d-d3b4-4291-b47f-ece9f024ddd8} - {5480a739-70e8-4989-9388-858bc73745bf} + {d9423ed6-d9b6-4ecb-b6b8-9322d6c3f995} - {10a1798e-fd19-4a4b-a4fa-078316b35b4a} + {129cbfa3-8e47-4cdd-a614-6df3e4fb0408} - {948b072b-d50b-4e17-bed4-3bae8345be51} + {572de956-2613-47de-9629-80a415067e58} - {984e69ae-d972-430f-84ad-885ce648930e} + {4b330ecf-7831-4b3f-8e7b-f3b028ba97b0} - {c4a637d7-9aad-4d1b-b9ce-b00a3a9bf47c} + {b213e21e-b970-4e41-897f-af8f064c1926} - {ef263eac-80d3-4c1a-abee-af439456b293} + {912e16ae-3f1e-4087-8ada-0b1a7d45f6c4} - {2af1dbe7-277e-4ab3-b8ad-255c4cf4f3ac} + {dddf49b9-d285-46ad-9aed-0bd977e67caf} - {8d350d20-818d-4e10-8a87-6df008441927} + {1eb34481-278c-49c3-a4e8-6e6733e0a06d} - {a6bd57e4-6d39-4a42-aa3d-4b1ad9e262fa} + {b181d31d-7aa8-4436-9353-a420cca61fbf} - {1c3b1b7c-2a2b-4eba-bc22-cedfdcc12b48} + {12de2d74-9477-43ae-b3d8-4a94001b6eb1} - {a692dced-8e66-4531-9567-6b57a3f9d89f} + {c0df7136-ad12-4fdc-bda1-73a46c627a4c} - {d6b09c46-8d74-4ab2-99b0-31923c880bed} + {b6cdd172-33a7-448b-85e5-c9982b77c53e} - {b0414365-c964-4c45-a80e-8539c5fe0b5b} + {384218a8-372e-47a7-b7f2-2ce7f7be1860} diff --git a/Data/Data.progen b/Data/Data.progen index 1ea8c123d..353b1af13 100644 --- a/Data/Data.progen +++ b/Data/Data.progen @@ -16,6 +16,6 @@ vc.project.compiler.defines = vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS;SQLParser_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 = /bigobj /std:c++17 /Zc:__cplusplus +vc.project.compiler.additionalOptions = /bigobj /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite,testsuite\\DataTest\\DataTest diff --git a/Data/Data_NO_SQL_PARSER.progen b/Data/Data_NO_SQL_PARSER.progen index 4b7376b7b..2359d3907 100644 --- a/Data/Data_NO_SQL_PARSER.progen +++ b/Data/Data_NO_SQL_PARSER.progen @@ -12,6 +12,6 @@ vc.project.compiler.defines = 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} -vc.project.compiler.additionalOptions = /bigobj /std:c++17 /Zc:__cplusplus +vc.project.compiler.additionalOptions = /bigobj /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Data/Data_vs170.vcxproj b/Data/Data_vs170.vcxproj index b7db546f3..9f5a2d888 100644 --- a/Data/Data_vs170.vcxproj +++ b/Data/Data_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDataA64d PocoDatamdd PocoDatamtd @@ -345,8 +345,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoDataA64d.dll @@ -379,8 +381,10 @@ Default $(OutDir)$(TargetName).pdb - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoDataA64.dll @@ -411,8 +415,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoDatamtd.lib @@ -438,8 +444,10 @@ Default $(OutDir)$(TargetName).pdb - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoDatamt.lib @@ -462,8 +470,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoDatamdd.lib @@ -489,8 +499,10 @@ Default $(OutDir)$(TargetName).pdb - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoDatamd.lib @@ -513,8 +525,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoDatad.dll @@ -547,8 +561,10 @@ Default $(OutDir)$(TargetName).pdb - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoData.dll @@ -579,8 +595,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoDatamtd.lib @@ -606,8 +624,10 @@ Default $(OutDir)$(TargetName).pdb - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoDatamt.lib @@ -630,8 +650,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoDatamdd.lib @@ -657,8 +679,10 @@ Level3 Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoDatamd.lib @@ -681,8 +705,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoData64d.dll @@ -715,8 +741,10 @@ Default $(OutDir)$(TargetName).pdb - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoData64.dll @@ -747,8 +775,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoDatamtd.lib @@ -774,8 +804,10 @@ Default $(OutDir)$(TargetName).pdb - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoDatamt.lib @@ -798,8 +830,10 @@ Level3 ProgramDatabase Default - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoDatamdd.lib @@ -825,8 +859,10 @@ Default $(OutDir)$(TargetName).pdb - /bigobj /std:c++17 /Zc:__cplusplus %(AdditionalOptions) + /bigobj /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoDatamd.lib @@ -914,144 +950,238 @@ 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 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 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 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Data/Data_vs170.vcxproj.filters b/Data/Data_vs170.vcxproj.filters index 200b28d92..274357ea5 100644 --- a/Data/Data_vs170.vcxproj.filters +++ b/Data/Data_vs170.vcxproj.filters @@ -2,67 +2,67 @@ - {17dee3c5-eff8-4413-8538-35cde2b4b148} + {ed293173-38e4-456c-8b1b-fbb4edb534a2} - {b47de74d-a006-494a-92ca-14bb740b6a8f} + {09512048-b662-4412-9d66-9278f5127b64} - {2fae20d2-553e-4d22-a054-7bdcaf5cfa18} + {e5a0ae46-4dcb-44ee-ad87-6c29296fdb75} - {8e430176-5758-4f18-a0a1-a2e47cd5d20a} + {3ab0b097-7c41-423d-a520-9955c13afd07} - {f46d9d0c-aaad-4c18-b335-aa902649086a} + {fb8ac504-99e9-4c9f-acf9-cd7e199ccbb8} - {a2f2316a-c2ec-45b6-bfb5-9c7ea4bf8406} + {96d47a24-bbc7-4503-98f1-722cb7e6c525} - {396b1821-ed93-4c83-884c-d60497a66f11} + {722167c1-e2c8-4893-bf49-f06a56e4475a} - {77bc6a77-c249-4be3-80b3-86841c7b6297} + {0fd0e46c-2c11-4305-bf67-4e39819f3600} - {c74693c2-b89b-4615-ba48-44ef418f9ab6} + {52fb64cd-2a53-461c-8056-ee3178aac103} - {6fadb32c-ee06-4f9e-937e-28203e2504d1} + {7ba52d24-1fb2-465f-8937-71c5f1c2aeef} - {3c5d1163-2067-4363-abf6-dc040e3613cc} + {8d74d8c7-dae7-4a18-858f-09bcf7f09f1b} - {15321502-9c36-49f6-a094-90a9de888c41} + {8f9442dc-d276-42ed-829a-3112f876419b} - {4f383c22-b278-40e9-bb9a-b25fd0db10a3} + {57e26b75-95c1-4d32-8239-7a303d573048} - {f037c038-fa66-4ea9-ab1e-187aac6f52ce} + {f7ab1f90-c32d-4108-9cba-3a380c12af48} - {fda6c009-20d7-4eb4-a9be-fbb1d578d166} + {70937b86-7f9e-42eb-a1cb-532959b076b3} - {5e4a847f-8c8d-40f0-aa79-03b211bd5ac9} + {426b95e7-0f6b-4a2e-8227-5d1f2a96c38b} - {dd5133dc-82db-4f2a-92f6-91dba81a222b} + {59e3d7d8-f310-4e86-a84e-9e5648e238f8} - {8d7c5808-50f5-4790-b35c-77350ea2b16c} + {8b87b125-d1e5-4037-85fa-2edd7d77e940} - {6fe708ec-ec55-4aeb-9be3-2b1aa30f3cb1} + {307ff9fb-35fa-4c93-a388-e4072672006d} - {c8f1ad0b-aede-43b8-9b01-ad4cbf24f45b} + {7137d8b1-eeb5-4fee-b080-d7c87dc42a43} - {6845af31-0048-47ba-96f7-48baed099606} + {55caa527-40a5-4ee1-a9f2-58b13550166f} diff --git a/Data/MySQL/MySQL_vs170.vcxproj b/Data/MySQL/MySQL_vs170.vcxproj index abb5d2eb7..146c91962 100644 --- a/Data/MySQL/MySQL_vs170.vcxproj +++ b/Data/MySQL/MySQL_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDataMySQLA64d PocoDataMySQLmdd PocoDataMySQLmtd @@ -346,6 +346,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\binA64\PocoDataMySQLA64d.dll @@ -379,6 +381,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\binA64\PocoDataMySQLA64.dll @@ -410,6 +414,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\libA64\PocoDataMySQLmtd.lib @@ -436,6 +442,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\libA64\PocoDataMySQLmt.lib @@ -459,6 +467,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\libA64\PocoDataMySQLmdd.lib @@ -485,6 +495,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\libA64\PocoDataMySQLmd.lib @@ -508,6 +520,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\bin\PocoDataMySQLd.dll @@ -541,6 +555,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\bin\PocoDataMySQL.dll @@ -572,6 +588,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataMySQLmtd.lib @@ -598,6 +616,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\lib\PocoDataMySQLmt.lib @@ -621,6 +641,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataMySQLmdd.lib @@ -647,6 +669,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataMySQLmd.lib @@ -670,6 +694,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\bin64\PocoDataMySQL64d.dll @@ -703,6 +729,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\bin64\PocoDataMySQL64.dll @@ -734,6 +762,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataMySQLmtd.lib @@ -760,6 +790,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\lib64\PocoDataMySQLmt.lib @@ -783,6 +815,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataMySQLmdd.lib @@ -809,6 +843,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\lib64\PocoDataMySQLmd.lib @@ -817,33 +853,53 @@ 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/Data/ODBC/ODBC_vs170.vcxproj b/Data/ODBC/ODBC_vs170.vcxproj index 267f337ab..45ad082c3 100644 --- a/Data/ODBC/ODBC_vs170.vcxproj +++ b/Data/ODBC/ODBC_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDataODBCA64d PocoDataODBCmdd PocoDataODBCmtd @@ -346,6 +346,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -380,6 +382,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -412,6 +416,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\libA64\PocoDataODBCmtd.lib @@ -438,6 +444,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\libA64\PocoDataODBCmt.lib @@ -461,6 +469,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\libA64\PocoDataODBCmdd.lib @@ -487,6 +497,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\libA64\PocoDataODBCmd.lib @@ -510,6 +522,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -544,6 +558,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -576,6 +592,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataODBCmtd.lib @@ -602,6 +620,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\lib\PocoDataODBCmt.lib @@ -625,6 +645,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataODBCmdd.lib @@ -651,6 +673,8 @@ Default true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -675,6 +699,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -709,6 +735,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -741,6 +769,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataODBCmtd.lib @@ -767,6 +797,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\lib64\PocoDataODBCmt.lib @@ -790,6 +822,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataODBCmdd.lib @@ -816,6 +850,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\lib64\PocoDataODBCmd.lib @@ -846,42 +882,68 @@ 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 @@ -903,6 +965,8 @@ true true true + stdcpp17 + stdc11 true @@ -924,9 +988,13 @@ true true true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Data/ODBC/ODBC_vs170.vcxproj.filters b/Data/ODBC/ODBC_vs170.vcxproj.filters index ca60a96bd..2a6a08180 100644 --- a/Data/ODBC/ODBC_vs170.vcxproj.filters +++ b/Data/ODBC/ODBC_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {f34e7de5-7ef8-4dd2-b62f-7a06b6a35a67} + {e7e58a10-6d53-4be9-a342-62628c6feb5f} - {65266e55-5683-4419-9976-d381eb3a37b1} + {efd7c933-a42d-4f50-9f6a-c8444bf44c93} - {0217b02a-6b9b-47ee-963c-837798f77fe9} + {398266a3-c6d5-4987-8910-a35da55d401e} diff --git a/Data/ODBC/include/Poco/Data/ODBC/Binder.h b/Data/ODBC/include/Poco/Data/ODBC/Binder.h index 0b34295fc..fb03be086 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Binder.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Binder.h @@ -394,6 +394,7 @@ private: { SQLINTEGER colSize = 0; SQLSMALLINT decDigits = 0; + getColSizeAndPrecision(pos, cDataType, colSize, decDigits); _lengthIndicator.push_back(0); diff --git a/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h b/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h index a753fed8f..b07d450a7 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h +++ b/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h @@ -20,6 +20,7 @@ #include "Poco/Data/ODBC/ODBC.h" #include "Poco/Data/ODBC/EnvironmentHandle.h" +#include "Poco/Data/ODBC/Error.h" #ifdef POCO_OS_FAMILY_WINDOWS #include #endif @@ -33,16 +34,23 @@ namespace ODBC { class SessionImpl; class ODBC_API ConnectionHandle -/// ODBC connection handle class + /// ODBC connection handle class { public: - ConnectionHandle(const std::string& connectString = "", SQLULEN timeout = 5); + static const std::string UNSUPPORTED_SQLSTATE; + static const std::string GEN_ERR_SQLSTATE; + static const std::string CANT_SET_ATTR_SQLSTATE; + + ConnectionHandle(const std::string& connectString = "", SQLULEN loginTimeout = 0, SQLULEN timeout = 0); /// Creates the ConnectionHandle. + /// + /// NOTE: some drivers/DBMS do not distinguish between login and connection timeouts, + /// and setting one timeout overwrites the other. ~ConnectionHandle(); /// Creates the ConnectionHandle. - bool connect(const std::string& connectString = "", SQLULEN timeout = 5); + bool connect(const std::string& connectString = "", SQLULEN loginTimeout = 0, SQLULEN timeout = 0); /// Connects the handle to the database. bool disconnect(); @@ -51,12 +59,20 @@ public: bool isConnected() const; /// Returns true if connected. - void setTimeout(SQLULEN timeout); + void setTimeout(int timeout); /// Sets the connection timeout in seconds. int getTimeout() const; /// Returns the connection timeout in seconds. + void setLoginTimeout(SQLULEN timeout); + /// Sets the login timeout in seconds. + /// Must be called before the connection attempt. + + int getLoginTimeout() const; + /// Returns the login timeout in seconds. + /// Must be called before the connection attempt. + const SQLHDBC& handle() const; /// Returns const reference to handle; @@ -83,6 +99,26 @@ private: void free(); /// Frees the connection handle. + void setTimeoutImpl(SQLULEN timeout, SQLINTEGER attribute); + /// Sets the timeout for the attribute. + + int getTimeoutImpl(SQLINTEGER attribute) const; + /// Returns the timeout for the attribute. + + void setTimeouts(SQLULEN loginTimeout, SQLULEN timeout); + + bool isUnsupported(const ConnectionError& e) const; + /// Returns true if SQLSTATE is "HYC000" + /// (Optional feature not implemented) + + bool isGenError(const ConnectionError& e) const; + /// Returns true if SQLSTATE is "HY000" + /// (General error) + + bool cantSetAttr(const ConnectionError& e) const; + /// Returns true if SQLSTATE is "HY011" + /// (Can't set attribute) + ConnectionHandle(const ConnectionHandle&); const ConnectionHandle& operator=(const ConnectionHandle&); @@ -136,6 +172,30 @@ inline SQLHDBC& ConnectionHandle::handle() } +inline void ConnectionHandle::setTimeout(int timeout) +{ + setTimeoutImpl(static_cast(timeout), SQL_ATTR_CONNECTION_TIMEOUT); +} + + +inline int ConnectionHandle::getTimeout() const +{ + return getTimeoutImpl(SQL_ATTR_CONNECTION_TIMEOUT); +} + + +inline void ConnectionHandle::setLoginTimeout(SQLULEN timeout) +{ + setTimeoutImpl(timeout, SQL_ATTR_LOGIN_TIMEOUT); +} + + +inline int ConnectionHandle::getLoginTimeout() const +{ + return getTimeoutImpl(SQL_ATTR_LOGIN_TIMEOUT); +} + + } } } // namespace Poco::Data::ODBC diff --git a/Data/ODBC/include/Poco/Data/ODBC/Preparator.h b/Data/ODBC/include/Poco/Data/ODBC/Preparator.h index aa6ebc769..6b351f8fb 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Preparator.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Preparator.h @@ -25,6 +25,7 @@ #include "Poco/Data/AbstractPreparator.h" #include "Poco/Data/Constants.h" #include "Poco/Data/LOB.h" +#include "Poco/Types.h" #include "Poco/Any.h" #include "Poco/DynamicAny.h" #include "Poco/DateTime.h" @@ -895,7 +896,7 @@ inline void Preparator::prepare(std::size_t pos, const long&) inline void Preparator::prepare(std::size_t pos, const unsigned long&) { - prepareFixedSize(pos, SQL_C_SLONG); + prepareFixedSize(pos, SQL_C_ULONG); } diff --git a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h index 0e3e9479f..06b2f8126 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h +++ b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h @@ -161,6 +161,14 @@ public: int maxStatementLength() const; /// Returns maximum length of SQL statement allowed by driver. + void setLoginTimeout(const std::string&, const Poco::Any& value); + /// Sets the timeout (in seconds) for the session login. + /// Value must be of type (unsigned) int. + /// It must be set prior to logging in. + + Poco::Any getLoginTimeout(const std::string&) const; + /// Returns the timeout (in seconds) for the session login. + void setQueryTimeout(const std::string&, const Poco::Any& value); /// Sets the timeout (in seconds) for queries. /// Value must be of type int. @@ -312,6 +320,12 @@ inline bool SessionImpl::isTransactionIsolation(Poco::UInt32 ti) const } +inline Poco::Any SessionImpl::getLoginTimeout(const std::string&) const +{ + return _db.getLoginTimeout(); +} + + inline void SessionImpl::setQueryTimeout(const std::string&, const Poco::Any& value) { _queryTimeout = Poco::AnyCast(value); diff --git a/Data/ODBC/src/Binder.cpp b/Data/ODBC/src/Binder.cpp index c3729af1c..36ed66961 100644 --- a/Data/ODBC/src/Binder.cpp +++ b/Data/ODBC/src/Binder.cpp @@ -510,6 +510,7 @@ void Binder::getColSizeAndPrecision(std::size_t pos, SQLSMALLINT& decDigits, std::size_t actualSize) { + SQLSMALLINT sqlDataType = Utility::sqlDataType(cDataType); colSize = 0; decDigits = 0; @@ -522,6 +523,9 @@ void Binder::getColSizeAndPrecision(std::size_t pos, bool foundPrec(false); foundSize = _pTypeInfo->tryGetInfo(cDataType, "COLUMN_SIZE", tmp); if (foundSize) colSize = tmp; + else foundSize = _pTypeInfo->tryGetInfo(sqlDataType, "COLUMN_SIZE", tmp); + if (foundSize) colSize = tmp; + if (actualSize > colSize) { throw LengthExceededException(Poco::format("Error binding column %z size=%z, max size=%ld)", @@ -529,6 +533,8 @@ void Binder::getColSizeAndPrecision(std::size_t pos, } foundPrec = _pTypeInfo->tryGetInfo(cDataType, "MAXIMUM_SCALE", tmp); if (foundPrec) decDigits = tmp; + else foundPrec = _pTypeInfo->tryGetInfo(sqlDataType, "MAXIMUM_SCALE", tmp); + if (foundPrec) decDigits = tmp; if (foundSize && foundPrec) return; diff --git a/Data/ODBC/src/ConnectionHandle.cpp b/Data/ODBC/src/ConnectionHandle.cpp index f66550c72..4d1ce7cbb 100644 --- a/Data/ODBC/src/ConnectionHandle.cpp +++ b/Data/ODBC/src/ConnectionHandle.cpp @@ -24,12 +24,18 @@ namespace Data { namespace ODBC { -ConnectionHandle::ConnectionHandle(const std::string& connectString, SQLULEN timeout): _pEnvironment(nullptr), +const std::string ConnectionHandle::UNSUPPORTED_SQLSTATE = "HYC00"; +const std::string ConnectionHandle::GEN_ERR_SQLSTATE = "HY000"; +const std::string ConnectionHandle::CANT_SET_ATTR_SQLSTATE = "HY011"; + + +ConnectionHandle::ConnectionHandle(const std::string& connectString, SQLULEN loginTimeout, SQLULEN timeout): + _pEnvironment(nullptr), _hdbc(SQL_NULL_HDBC), _connectString(connectString) { alloc(); - setTimeout(timeout); + setTimeouts(loginTimeout, timeout); } @@ -76,7 +82,29 @@ void ConnectionHandle::free() } -bool ConnectionHandle::connect(const std::string& connectString, SQLULEN timeout) +void ConnectionHandle::setTimeouts(SQLULEN loginTimeout, SQLULEN timeout) +{ + if (loginTimeout) + { + try + { + setLoginTimeout(loginTimeout); + } + catch(const NotSupportedException&) {} + } + + if (timeout) + { + try + { + setTimeout(timeout); + } + catch(const NotSupportedException&) {} + } +} + + +bool ConnectionHandle::connect(const std::string& connectString, SQLULEN loginTimeout, SQLULEN timeout) { if (isConnected()) throw Poco::InvalidAccessException("ODBC: connection already established."); @@ -91,6 +119,9 @@ bool ConnectionHandle::connect(const std::string& connectString, SQLULEN timeout SQLSMALLINT result; if (!_pEnvironment) alloc(); + + setTimeouts(loginTimeout, timeout); + if (Utility::isError(Poco::Data::ODBC::SQLDriverConnect(_hdbc , NULL ,(SQLCHAR*) _connectString.c_str() @@ -100,12 +131,28 @@ bool ConnectionHandle::connect(const std::string& connectString, SQLULEN timeout , &result , SQL_DRIVER_NOPROMPT))) { - disconnect(); ConnectionError err(_hdbc); + disconnect(); throw ConnectionFailedException(err.toString()); } - return _hdbc != SQL_NULL_HDBC;; + try + { + // Setting timeouts before connection is valid by standard (as it makes sense for login timeout), + // but not all drivers comply, so we have to check and try again after succesful connection. + // Furthermore, it appears that Oracle has only one timeout, so it is not possible to have + // different login and connection timeouts. Last but not least, some ODBC drivers (eg. DataDirect + // for Oracle) flat out refuse to set login timeout and return error - that's why these calls + // are wrapped in try/catch and silently ignore errors. + if (getTimeout() != timeout) + setTimeout(timeout); + if (getLoginTimeout() != loginTimeout) + setLoginTimeout(loginTimeout); + } + catch(NotSupportedException&){} + catch(InvalidAccessException&){} + + return _hdbc != SQL_NULL_HDBC; } @@ -120,38 +167,107 @@ bool ConnectionHandle::disconnect() } -void ConnectionHandle::setTimeout(SQLULEN timeout) +void ConnectionHandle::setTimeoutImpl(SQLULEN timeout, SQLINTEGER attribute) { - if (Utility::isError(SQLSetConnectAttr(_hdbc, SQL_ATTR_LOGIN_TIMEOUT, (SQLPOINTER) timeout, 0))) + if (attribute != SQL_ATTR_LOGIN_TIMEOUT && attribute != SQL_ATTR_CONNECTION_TIMEOUT) + throw InvalidArgumentException(Poco::format("ODBC::ConnectionHandle::setTimeoutImpl(%d)", attribute)); + + if (Utility::isError(SQLSetConnectAttr(_hdbc, attribute, (SQLPOINTER) timeout, 0))) { ConnectionError e(_hdbc); + std::string name; + switch (attribute) + { + case SQL_ATTR_LOGIN_TIMEOUT: + name = "LOGIN"s; + break; + case SQL_ATTR_CONNECTION_TIMEOUT: + name = "CONNECTION"s; + break; + default: + break; + } + + if (isUnsupported(e)) + throw NotSupportedException(Poco::format("ConnectionHandle::setTimeoutImpl(%s)", name)); + else if (isGenError(e) || cantSetAttr(e)) + throw InvalidAccessException(Poco::format("ConnectionHandle::setTimeoutImpl(%s)", name)); + throw ConnectionFailedException(e.toString()); } } -int ConnectionHandle::getTimeout() const +int ConnectionHandle::getTimeoutImpl(SQLINTEGER attribute) const { - SQLULEN timeout = 0; - if (Utility::isError(SQLGetConnectAttr(_hdbc, SQL_ATTR_LOGIN_TIMEOUT, &timeout, 0, 0))) + SQLUINTEGER timeout = 0; + if (Utility::isError(SQLGetConnectAttr(_hdbc, attribute, &timeout, sizeof(timeout), 0))) { ConnectionError e(_hdbc); + if (isUnsupported(e)) + throw NotSupportedException("ConnectionHandle::getTimeoutImpl(%s)"); + throw ConnectionFailedException(e.toString()); } return static_cast(timeout); } +bool ConnectionHandle::isUnsupported(const ConnectionError& e) const +{ + const ConnectionDiagnostics& cd = e.diagnostics(); + int diagRecs = cd.count(); + for (int i = 0; i < diagRecs; ++i) + { + if (cd.sqlState(i) == UNSUPPORTED_SQLSTATE) + { + return true; + } + } + return false; +} + + +bool ConnectionHandle::isGenError(const ConnectionError& e) const +{ + const ConnectionDiagnostics& cd = e.diagnostics(); + int diagRecs = cd.count(); + for (int i = 0; i < diagRecs; ++i) + { + if (cd.sqlState(i) == GEN_ERR_SQLSTATE) + { + return true; + } + } + return false; +} + + +bool ConnectionHandle::cantSetAttr(const ConnectionError& e) const +{ + const ConnectionDiagnostics& cd = e.diagnostics(); + int diagRecs = cd.count(); + for (int i = 0; i < diagRecs; ++i) + { + if (cd.sqlState(i) == CANT_SET_ATTR_SQLSTATE) + { + return true; + } + } + return false; +} + + bool ConnectionHandle::isConnected() const { if (!*this) return false; - SQLULEN value = 0; + SQLINTEGER value = -1; if (Utility::isError(Poco::Data::ODBC::SQLGetConnectAttr(_hdbc, SQL_ATTR_CONNECTION_DEAD, &value, - 0, + sizeof(value), 0))) return false; return (SQL_CD_FALSE == value); diff --git a/Data/ODBC/src/Extractor.cpp b/Data/ODBC/src/Extractor.cpp index ccdac9339..e9393b7d0 100644 --- a/Data/ODBC/src/Extractor.cpp +++ b/Data/ODBC/src/Extractor.cpp @@ -721,7 +721,7 @@ bool Extractor::extract(std::size_t pos, std::string& val) else ret = extractBoundImpl(pos, result); transcode(result, val); - + } return ret; diff --git a/Data/ODBC/src/SessionImpl.cpp b/Data/ODBC/src/SessionImpl.cpp index 563b9b6f2..dac7d082e 100644 --- a/Data/ODBC/src/SessionImpl.cpp +++ b/Data/ODBC/src/SessionImpl.cpp @@ -123,6 +123,10 @@ void SessionImpl::addFeatures() &SessionImpl::setMaxFieldSize, &SessionImpl::getMaxFieldSize); + addProperty("loginTimeout", + &SessionImpl::setLoginTimeout, + &SessionImpl::getLoginTimeout); + addProperty("queryTimeout", &SessionImpl::setQueryTimeout, &SessionImpl::getQueryTimeout); @@ -153,9 +157,7 @@ void SessionImpl::open(const std::string& connect) if (connectionString().empty()) throw InvalidArgumentException("SessionImpl::open(): Connection string empty"); - SQLULEN tout = static_cast(getLoginTimeout()); - - if (_db.connect(connectionString(), tout)) + if (_db.connect(connectionString())) { setProperty("handle", _db.handle()); @@ -245,26 +247,30 @@ inline Poco::Any SessionImpl::getCursorUse(const std::string&) const void SessionImpl::setConnectionTimeout(std::size_t timeout) { - SQLUINTEGER value = static_cast(timeout); - - checkError(Poco::Data::ODBC::SQLSetConnectAttr(_db, - SQL_ATTR_CONNECTION_TIMEOUT, - &value, - SQL_IS_UINTEGER), "Failed to set connection timeout."); + SQLULEN value = static_cast(timeout); + _db.setTimeout(value); } std::size_t SessionImpl::getConnectionTimeout() const { - SQLULEN value = 0; + return _db.getTimeout(); +} - checkError(Poco::Data::ODBC::SQLGetConnectAttr(_db, - SQL_ATTR_CONNECTION_TIMEOUT, - &value, - 0, - 0), "Failed to get connection timeout."); - return value; +void SessionImpl::setLoginTimeout(const std::string&, const Poco::Any& value) +{ + int timeout = 0; + try + { + timeout = Poco::AnyCast(value); + } + catch(const Poco::BadCastException&) + { + timeout = Poco::AnyCast(value); + } + + _db.setLoginTimeout(timeout); } @@ -352,8 +358,10 @@ bool SessionImpl::hasTransactionIsolation(Poco::UInt32 ti) const { if (isTransaction()) throw InvalidAccessException(); - bool retval = true; Poco::UInt32 old = getTransactionIsolation(); + if (old == ti) return true; + + bool retval = true; try { setTransactionIsolationImpl(ti); } catch (Poco::Exception&) { retval = false; } setTransactionIsolationImpl(old); diff --git a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj index 473b80173..e08e2efe2 100644 --- a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 TestSuited TestSuited TestSuited @@ -358,6 +358,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -391,6 +393,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -421,6 +425,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -454,6 +460,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -484,6 +492,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -517,6 +527,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,6 +559,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -580,6 +594,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -610,6 +626,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -643,6 +661,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -673,6 +693,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -706,6 +728,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -736,6 +760,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -769,6 +795,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -799,6 +827,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -832,6 +862,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -862,6 +894,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -895,6 +929,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -922,36 +958,58 @@ 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/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters index 8666a8bd7..d299a0b1f 100644 --- a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {179a380b-3910-49b1-bd76-2fa7222a96cb} + {c7e9a1ea-73f4-4226-b310-b265201e0be9} - {27ed4014-dc16-4c25-84cd-1598bcc2b8ab} + {2348173e-2e62-4809-99ea-676ebb4198c0} - {44fb61ac-3639-400f-a868-2cfc81338e8d} + {8926ceae-a008-4b2d-accb-ff1e4f4a1b77} - {68ef2164-2dbb-48f6-85d9-d22e20cebaf2} + {30658ecd-cf47-42ec-8568-5acc3a624a78} - {36208f03-46c7-4ac6-9be6-c04374dfb886} + {5192786d-b801-40d6-a989-f7fdc825f525} - {2a8314f2-90c2-4649-8e5e-1ea1ab61200b} + {4a23e42f-ef34-4ab0-b282-21cf3de054b9} - {7d675381-7b81-43fd-882e-f2401eabdb9e} + {90adb98e-9140-4322-88ba-3ed19efe888c} - {f178aec2-ceb4-4c7b-9d88-4cb2bdb516cc} + {099c216f-5416-41a0-b28d-fb3156debbcd} diff --git a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp index 777895244..0acdf8e4d 100644 --- a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp @@ -164,7 +164,7 @@ void ODBCMySQLTest::testNull() recreateNullsTable("NOT NULL"); _pSession->setFeature("autoBind", bindValue(i)); _pSession->setFeature("autoExtract", bindValue(i+1)); - _pExecutor->notNulls("HY000"); + _pExecutor->notNulls({"HY000"}); i += 2; } diff --git a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp index 722d46c50..4a907915b 100644 --- a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp @@ -41,7 +41,19 @@ using Poco::DynamicAny; using Poco::DateTime; -#define ORACLE_ODBC_DRIVER "Oracle 21 ODBC driver" +//#define EASYSOFT_ODBC +//#define DATADIRECT_ODBC +#define DEVART_ODBC + +#ifdef EASYSOFT_ODBC +# define ORACLE_ODBC_DRIVER "ORACLE" +#elif defined(DATADIRECT_ODBC) +# define ORACLE_ODBC_DRIVER "Oracle Wire Protocol" +#elif defined(DEVART_ODBC) +# define ORACLE_ODBC_DRIVER "Devart ODBC Driver for Oracle" +#else +# define ORACLE_ODBC_DRIVER "Oracle 21 ODBC driver" +#endif #define ORACLE_DSN "PocoDataOracleTest" #define ORACLE_SERVER POCO_ODBC_TEST_DATABASE_SERVER #define ORACLE_PORT "1521" @@ -56,6 +68,15 @@ std::string ODBCOracleTest::_driver = ORACLE_ODBC_DRIVER; std::string ODBCOracleTest::_dsn = ORACLE_DSN; std::string ODBCOracleTest::_uid = ORACLE_UID; std::string ODBCOracleTest::_pwd = ORACLE_PWD; +#ifdef EASYSOFT_ODBC +std::string ODBCOracleTest::_connectString = "DRIVER={" ORACLE_ODBC_DRIVER "};DB=" ORACLE_SID ";UID=" ORACLE_UID ";PWD=" ORACLE_PWD ";"; +#elif defined(DATADIRECT_ODBC) +std::string ODBCOracleTest::_connectString = "DRIVER=DataDirect 8.0 Oracle Wire Protocol;" + "HOST=" ORACLE_SERVER ";PORT=" ORACLE_PORT ";UID=" ORACLE_UID ";PWD=" ORACLE_PWD ";SERVICENAME=" ORACLE_SID ";"; +#elif defined(DEVART_ODBC) +std::string ODBCOracleTest::_connectString = "DRIVER={" ORACLE_ODBC_DRIVER "};Direct=True;" + "Host=" ORACLE_SERVER ";Service Name=" ORACLE_SID ";User ID=" ORACLE_UID ";Password=" ORACLE_PWD ";"; +#else std::string ODBCOracleTest::_connectString = "DRIVER={" ORACLE_ODBC_DRIVER "};" "DBQ=" ORACLE_SERVER ":" ORACLE_PORT "/" ORACLE_SID ";" "UID=" ORACLE_UID ";" @@ -80,6 +101,7 @@ std::string ODBCOracleTest::_connectString = "DRIVER={" ORACLE_ODBC_DRI "EXC=F;" // EXEC syntax (T/F), default F "APA=T;" // thread safety (T/F), default T "DBA=W;"; // write access (R/W) +#endif const std::string ODBCOracleTest::MULTI_INSERT = "BEGIN " @@ -91,7 +113,7 @@ const std::string ODBCOracleTest::MULTI_INSERT = "END;"; const std::string ODBCOracleTest::MULTI_SELECT = - "{CALL multiResultsProcedure()}"; + "{CALL multiResultsProcedure(?,?,?,?,?)}"; ODBCOracleTest::ODBCOracleTest(const std::string& name): @@ -112,20 +134,20 @@ void ODBCOracleTest::testBarebone() "Second VARCHAR(30)," "Third BLOB," "Fourth INTEGER," - "Fifth NUMBER," + "Fifth BINARY_FLOAT," "Sixth TIMESTAMP)"; _pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_IMMEDIATE, SQLExecutor::DE_MANUAL); _pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_IMMEDIATE, SQLExecutor::DE_BOUND); _pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_AT_EXEC, SQLExecutor::DE_MANUAL); _pExecutor->bareboneODBCTest(_connectString, tableCreateString, SQLExecutor::PB_AT_EXEC, SQLExecutor::DE_BOUND); - +/* TODO - Oracle has different semantics for multiple results tableCreateString = "CREATE TABLE Test " "(First VARCHAR(30)," - "Second INTEGER," - "Third NUMBER)"; + "Second NUMBER," + "Third BINARY_FLOAT)"; - *_pSession << "CREATE OR REPLACE " + std::string procCreateString = "CREATE OR REPLACE " "PROCEDURE multiResultsProcedure(ret1 OUT SYS_REFCURSOR, " "ret2 OUT SYS_REFCURSOR," "ret3 OUT SYS_REFCURSOR," @@ -137,33 +159,37 @@ void ODBCOracleTest::testBarebone() "OPEN ret3 FOR SELECT * FROM Test WHERE First = '3';" "OPEN ret4 FOR SELECT * FROM Test WHERE First = '4';" "OPEN ret5 FOR SELECT * FROM Test WHERE First = '5';" - "END multiResultsProcedure;" , now; + "END multiResultsProcedure;";// , now; _pExecutor->bareboneODBCMultiResultTest(_connectString, tableCreateString, SQLExecutor::PB_IMMEDIATE, SQLExecutor::DE_MANUAL, MULTI_INSERT, - MULTI_SELECT); + MULTI_SELECT, + procCreateString); _pExecutor->bareboneODBCMultiResultTest(_connectString, tableCreateString, SQLExecutor::PB_IMMEDIATE, SQLExecutor::DE_BOUND, MULTI_INSERT, - MULTI_SELECT); + MULTI_SELECT, + procCreateString); _pExecutor->bareboneODBCMultiResultTest(_connectString, tableCreateString, SQLExecutor::PB_AT_EXEC, SQLExecutor::DE_MANUAL, MULTI_INSERT, - MULTI_SELECT); + MULTI_SELECT, + procCreateString); _pExecutor->bareboneODBCMultiResultTest(_connectString, tableCreateString, SQLExecutor::PB_AT_EXEC, SQLExecutor::DE_BOUND, MULTI_INSERT, - MULTI_SELECT); - + MULTI_SELECT, + procCreateString); +*/ } @@ -176,7 +202,7 @@ void ODBCOracleTest::testBLOB() try { executor().blob(maxFldSize); - fail ("must fail"); + fail ("must fail", __LINE__, __FILE__); } catch (DataException&) { @@ -196,7 +222,7 @@ void ODBCOracleTest::testBLOB() try { executor().blob(maxFldSize+1); - fail ("must fail"); + fail ("must fail", __LINE__, __FILE__); } catch (DataException&) { } } @@ -210,7 +236,7 @@ void ODBCOracleTest::testNull() recreateNullsTable("NOT NULL"); session().setFeature("autoBind", bindValue(i)); session().setFeature("autoExtract", bindValue(i+1)); - executor().notNulls("HY000"); + executor().notNulls({"HY000", "HY021"}); i += 2; } @@ -226,6 +252,13 @@ void ODBCOracleTest::testNull() } +void ODBCOracleTest::testTransaction() +{ + setReadUncommitted(false); + ODBCTest::testTransaction(); +} + + void ODBCOracleTest::testStoredProcedure() { for (int k = 0; k < 8;) @@ -252,7 +285,7 @@ void ODBCOracleTest::testStoredProcedure() int j = 0; *_pSession << "{call storedProcedure(?, ?)}", in(i), out(j), now; assertTrue (4 == j); - *_pSession << "DROP PROCEDURE storedProcedure;", now; + dropObject("PROCEDURE", "storedProcedure"); *_pSession << "CREATE OR REPLACE " "PROCEDURE storedProcedure(ioParam IN OUT NUMBER) IS " @@ -320,7 +353,7 @@ void ODBCOracleTest::testStoredProcedureAny() *_pSession << "{call storedProcedure(?, ?)}", in(i), out(j), now; assertTrue (4 == AnyCast(j)); - *_pSession << "DROP PROCEDURE storedProcedure;", now; + dropObject("PROCEDURE", "storedProcedure"); *_pSession << "CREATE OR REPLACE " "PROCEDURE storedProcedure(ioParam IN OUT NUMBER) IS " @@ -353,7 +386,7 @@ void ODBCOracleTest::testStoredProcedureDynamicAny() *_pSession << "{call storedProcedure(?, ?)}", in(i), out(j), now; assertTrue (4 == j); - *_pSession << "DROP PROCEDURE storedProcedure;", now; + dropObject("PROCEDURE", "storedProcedure"); *_pSession << "CREATE OR REPLACE " "PROCEDURE storedProcedure(ioParam IN OUT NUMBER) IS " @@ -372,189 +405,213 @@ void ODBCOracleTest::testStoredProcedureDynamicAny() void ODBCOracleTest::testCursorStoredProcedure() { - for (int k = 0; k < 8;) + try { - session().setFeature("autoBind", bindValue(k)); - session().setFeature("autoExtract", bindValue(k+1)); + for (int k = 0; k < 8;) + { + session().setFeature("autoBind", bindValue(k)); + session().setFeature("autoExtract", bindValue(k+1)); - recreatePersonTable(); - typedef Tuple Person; - std::vector people; - people.push_back(Person("Simpson", "Homer", "Springfield", 42)); - people.push_back(Person("Simpson", "Bart", "Springfield", 12)); - people.push_back(Person("Simpson", "Lisa", "Springfield", 10)); - *_pSession << "INSERT INTO Person VALUES (?, ?, ?, ?)", use(people), now; + recreatePersonTable(); + typedef Tuple Person; + std::vector people; + people.push_back(Person("Simpson", "Homer", "Springfield", 42)); + people.push_back(Person("Simpson", "Bart", "Springfield", 12)); + people.push_back(Person("Simpson", "Lisa", "Springfield", 10)); + *_pSession << "INSERT INTO Person VALUES (?, ?, ?, ?)", use(people), now; - *_pSession << "CREATE OR REPLACE " - "PROCEDURE storedCursorProcedure(ret OUT SYS_REFCURSOR, ageLimit IN NUMBER) IS " - " BEGIN " - " OPEN ret FOR " - " SELECT * " - " FROM Person " - " WHERE Age < ageLimit " - " ORDER BY Age DESC; " - " END storedCursorProcedure;" , now; + *_pSession << "CREATE OR REPLACE " + "PROCEDURE storedCursorProcedure(ret OUT SYS_REFCURSOR, ageLimit IN NUMBER) IS " + " BEGIN " + " OPEN ret FOR " + " SELECT * " + " FROM Person " + " WHERE Age < ageLimit " + " ORDER BY Age DESC; " + " END storedCursorProcedure;" , now; - people.clear(); - int age = 13; + people.clear(); + int age = 13; - *_pSession << "{call storedCursorProcedure(?)}", in(age), into(people), now; + *_pSession << "{call storedCursorProcedure(?)}", in(age), into(people), now; - assertTrue (2 == people.size()); - assertTrue (Person("Simpson", "Bart", "Springfield", 12) == people[0]); - assertTrue (Person("Simpson", "Lisa", "Springfield", 10) == people[1]); + assertTrue (2 == people.size()); + assertTrue (Person("Simpson", "Bart", "Springfield", 12) == people[0]); + assertTrue (Person("Simpson", "Lisa", "Springfield", 10) == people[1]); - Statement stmt = ((*_pSession << "{call storedCursorProcedure(?)}", in(age), now)); - RecordSet rs(stmt); - assertTrue (rs["LastName"] == "Simpson"); - assertTrue (rs["FirstName"] == "Bart"); - assertTrue (rs["Address"] == "Springfield"); - assertTrue (rs["Age"] == 12); + Statement stmt = ((*_pSession << "{call storedCursorProcedure(?)}", in(age), now)); + RecordSet rs(stmt); + assertTrue (rs["LastName"] == "Simpson"); + assertTrue (rs["FirstName"] == "Bart"); + assertTrue (rs["Address"] == "Springfield"); + assertTrue (rs["Age"] == 12); - dropObject("TABLE", "Person"); - dropObject("PROCEDURE", "storedCursorProcedure"); + dropObject("TABLE", "Person"); + dropObject("PROCEDURE", "storedCursorProcedure"); - k += 2; + k += 2; + } + } + catch(const DataException& e) + { + std::cerr << e.displayText() << '\n'; + fail ("testCursorStoredProcedure()", __LINE__, __FILE__); } } void ODBCOracleTest::testStoredFunction() { - for (int k = 0; k < 8;) + try { - session().setFeature("autoBind", bindValue(k)); - session().setFeature("autoExtract", bindValue(k+1)); + for (int k = 0; k < 8;) + { + session().setFeature("autoBind", bindValue(k)); + session().setFeature("autoExtract", bindValue(k+1)); - try{ - *_pSession << "CREATE OR REPLACE " - "FUNCTION storedFunction RETURN NUMBER IS " - " BEGIN return(-1); " - " END storedFunction;" , now; - }catch(StatementException& se) { std::cout << se.toString() << std::endl; } + try{ + *_pSession << "CREATE OR REPLACE " + "FUNCTION storedFunction RETURN NUMBER IS " + " BEGIN return(-1); " + " END storedFunction;" , now; + }catch(StatementException& se) { std::cout << se.toString() << std::endl; } - int i = 0; - *_pSession << "{? = call storedFunction()}", out(i), now; - assertTrue (-1 == i); - dropObject("FUNCTION", "storedFunction"); + int i = 0; + *_pSession << "{? = call storedFunction()}", out(i), now; + assertTrue (-1 == i); + dropObject("FUNCTION", "storedFunction"); + *_pSession << "CREATE OR REPLACE " + "FUNCTION storedFunction(inParam IN NUMBER) RETURN NUMBER IS " + " BEGIN RETURN(inParam*inParam); " + " END storedFunction;" , now; + + i = 2; + int result = 0; + *_pSession << "{? = call storedFunction(?)}", out(result), in(i), now; + assertTrue (4 == result); + dropObject("FUNCTION", "storedFunction"); + + *_pSession << "CREATE OR REPLACE " + "FUNCTION storedFunction(inParam IN NUMBER, outParam OUT NUMBER) RETURN NUMBER IS " + " BEGIN outParam := inParam*inParam; RETURN(outParam); " + " END storedFunction;" , now; + + i = 2; + int j = 0; + result = 0; + *_pSession << "{? = call storedFunction(?, ?)}", out(result), in(i), out(j), now; + assertTrue (4 == j); + assertTrue (j == result); + dropObject("FUNCTION", "storedFunction"); + + *_pSession << "CREATE OR REPLACE " + "FUNCTION storedFunction(param1 IN OUT NUMBER, param2 IN OUT NUMBER) RETURN NUMBER IS " + " temp NUMBER := param1; " + " BEGIN param1 := param2; param2 := temp; RETURN(param1+param2); " + " END storedFunction;" , now; + + i = 1; + j = 2; + result = 0; + *_pSession << "{? = call storedFunction(?, ?)}", out(result), io(i), io(j), now; + assertTrue (1 == j); + assertTrue (2 == i); + assertTrue (3 == result); + + Tuple params(1, 2); + assertTrue (1 == params.get<0>()); + assertTrue (2 == params.get<1>()); + result = 0; + *_pSession << "{? = call storedFunction(?, ?)}", out(result), io(params), now; + assertTrue (1 == params.get<1>()); + assertTrue (2 == params.get<0>()); + assertTrue (3 == result); + dropObject("FUNCTION", "storedFunction"); + + k += 2; + } + + session().setFeature("autoBind", true); + *_pSession << "CREATE OR REPLACE " - "FUNCTION storedFunction(inParam IN NUMBER) RETURN NUMBER IS " - " BEGIN RETURN(inParam*inParam); " - " END storedFunction;" , now; + "FUNCTION storedFunction(inParam IN VARCHAR2, outParam OUT VARCHAR2) RETURN VARCHAR2 IS " + " BEGIN outParam := inParam; RETURN outParam;" + "END storedFunction;" , now; - i = 2; - int result = 0; - *_pSession << "{? = call storedFunction(?)}", out(result), in(i), now; - assertTrue (4 == result); + std::string inParam = "123"; + std::string outParam; + std::string ret; + *_pSession << "{? = call storedFunction(?,?)}", out(ret), in(inParam), out(outParam), now; + assertTrue ("123" == inParam); + assertTrue (inParam == outParam); + assertTrue (ret == outParam); dropObject("FUNCTION", "storedFunction"); - - *_pSession << "CREATE OR REPLACE " - "FUNCTION storedFunction(inParam IN NUMBER, outParam OUT NUMBER) RETURN NUMBER IS " - " BEGIN outParam := inParam*inParam; RETURN(outParam); " - " END storedFunction;" , now; - - i = 2; - int j = 0; - result = 0; - *_pSession << "{? = call storedFunction(?, ?)}", out(result), in(i), out(j), now; - assertTrue (4 == j); - assertTrue (j == result); - dropObject("FUNCTION", "storedFunction"); - - *_pSession << "CREATE OR REPLACE " - "FUNCTION storedFunction(param1 IN OUT NUMBER, param2 IN OUT NUMBER) RETURN NUMBER IS " - " temp NUMBER := param1; " - " BEGIN param1 := param2; param2 := temp; RETURN(param1+param2); " - " END storedFunction;" , now; - - i = 1; - j = 2; - result = 0; - *_pSession << "{? = call storedFunction(?, ?)}", out(result), io(i), io(j), now; - assertTrue (1 == j); - assertTrue (2 == i); - assertTrue (3 == result); - - Tuple params(1, 2); - assertTrue (1 == params.get<0>()); - assertTrue (2 == params.get<1>()); - result = 0; - *_pSession << "{? = call storedFunction(?, ?)}", out(result), io(params), now; - assertTrue (1 == params.get<1>()); - assertTrue (2 == params.get<0>()); - assertTrue (3 == result); - dropObject("FUNCTION", "storedFunction"); - - k += 2; } - - session().setFeature("autoBind", true); - - *_pSession << "CREATE OR REPLACE " - "FUNCTION storedFunction(inParam IN VARCHAR2, outParam OUT VARCHAR2) RETURN VARCHAR2 IS " - " BEGIN outParam := inParam; RETURN outParam;" - "END storedFunction;" , now; - - std::string inParam = "123"; - std::string outParam; - std::string ret; - *_pSession << "{? = call storedFunction(?,?)}", out(ret), in(inParam), out(outParam), now; - assertTrue ("123" == inParam); - assertTrue (inParam == outParam); - assertTrue (ret == outParam); - dropObject("PROCEDURE", "storedFunction"); + catch(const DataException& e) + { + std::cerr << e.displayText() << '\n'; + fail ("testStoredFunction()", __LINE__, __FILE__); + } } void ODBCOracleTest::testCursorStoredFunction() { - for (int k = 0; k < 8;) + try { - session().setFeature("autoBind", bindValue(k)); - session().setFeature("autoExtract", bindValue(k+1)); + for (int k = 0; k < 8;) + { + session().setFeature("autoBind", bindValue(k)); + session().setFeature("autoExtract", bindValue(k+1)); - recreatePersonTable(); - typedef Tuple Person; - std::vector people; - people.push_back(Person("Simpson", "Homer", "Springfield", 42)); - people.push_back(Person("Simpson", "Bart", "Springfield", 12)); - people.push_back(Person("Simpson", "Lisa", "Springfield", 10)); - *_pSession << "INSERT INTO Person VALUES (?, ?, ?, ?)", use(people), now; + recreatePersonTable(); + typedef Tuple Person; + std::vector people; + people.push_back(Person("Simpson", "Homer", "Springfield", 42)); + people.push_back(Person("Simpson", "Bart", "Springfield", 12)); + people.push_back(Person("Simpson", "Lisa", "Springfield", 10)); + *_pSession << "INSERT INTO Person VALUES (?, ?, ?, ?)", use(people), now; - *_pSession << "CREATE OR REPLACE " - "FUNCTION storedCursorFunction(ageLimit IN NUMBER) RETURN SYS_REFCURSOR IS " - " ret SYS_REFCURSOR; " - " BEGIN " - " OPEN ret FOR " - " SELECT * " - " FROM Person " - " WHERE Age < ageLimit " - " ORDER BY Age DESC; " - " RETURN ret; " - " END storedCursorFunction;" , now; + *_pSession << "CREATE OR REPLACE " + "FUNCTION storedCursorFunction(ageLimit IN NUMBER) RETURN SYS_REFCURSOR IS " + " ret SYS_REFCURSOR; " + " BEGIN " + " OPEN ret FOR " + " SELECT * " + " FROM Person " + " WHERE Age < ageLimit " + " ORDER BY Age DESC; " + " RETURN ret; " + " END storedCursorFunction;" , now; - people.clear(); - int age = 13; + people.clear(); + int age = 13; - *_pSession << "{call storedCursorFunction(?)}", in(age), into(people), now; + *_pSession << "{call storedCursorFunction(?)}", in(age), into(people), now; - assertTrue (2 == people.size()); - assertTrue (Person("Simpson", "Bart", "Springfield", 12) == people[0]); - assertTrue (Person("Simpson", "Lisa", "Springfield", 10) == people[1]); + assertTrue (2 == people.size()); + assertTrue (Person("Simpson", "Bart", "Springfield", 12) == people[0]); + assertTrue (Person("Simpson", "Lisa", "Springfield", 10) == people[1]); - Statement stmt = ((*_pSession << "{call storedCursorFunction(?)}", in(age), now)); - RecordSet rs(stmt); - assertTrue (rs["LastName"] == "Simpson"); - assertTrue (rs["FirstName"] == "Bart"); - assertTrue (rs["Address"] == "Springfield"); - assertTrue (rs["Age"] == 12); + Statement stmt = ((*_pSession << "{call storedCursorFunction(?)}", in(age), now)); + RecordSet rs(stmt); + assertTrue (rs["LastName"] == "Simpson"); + assertTrue (rs["FirstName"] == "Bart"); + assertTrue (rs["Address"] == "Springfield"); + assertTrue (rs["Age"] == 12); - dropObject("TABLE", "Person"); - dropObject("FUNCTION", "storedCursorFunction"); + dropObject("TABLE", "Person"); + dropObject("FUNCTION", "storedCursorFunction"); - k += 2; + k += 2; + } + } + catch(const DataException& e) + { + std::cerr << e.displayText() << '\n'; + fail ("testCursorStoredFunction()", __LINE__, __FILE__); } } @@ -655,7 +712,7 @@ void ODBCOracleTest::dropObject(const std::string& type, const std::string& name for (; it != flds.end(); ++it) { if (4043 == it->_nativeError || //ORA-04043 (object does not exist) - 942 == it->_nativeError)//ORA-00942 (table does not exist) + 942 == it->_nativeError || 1433808584/*DevArt*/== it->_nativeError) //ORA-00942 (table does not exist) { ignoreError = true; break; @@ -671,8 +728,8 @@ 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; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()"); } + 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__); } } @@ -680,8 +737,8 @@ void ODBCOracleTest::recreatePersonTable() { dropObject("TABLE", "Person"); try { *_pSession << "CREATE TABLE Person (LastName VARCHAR2(30), FirstName VARCHAR2(30), Address VARCHAR2(30), Age INTEGER)", now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTable()"); } + 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__); } } @@ -690,8 +747,8 @@ void ODBCOracleTest::recreatePersonTupleTable() dropObject("TABLE", "Person"); try { *_pSession << "CREATE TABLE Person (LastName1 VARCHAR2(30), FirstName1 VARCHAR2(30), Address1 VARCHAR2(30), Age1 INTEGER," "LastName2 VARCHAR2(30), FirstName2 VARCHAR2(30), Address2 VARCHAR2(30), Age2 INTEGER)", now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTupleTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTupleTable()"); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonTupleTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonTupleTable()", __LINE__, __FILE__); } } @@ -699,8 +756,8 @@ void ODBCOracleTest::recreatePersonBLOBTable() { dropObject("TABLE", "Person"); try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Image BLOB)", now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonBLOBTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonBLOBTable()"); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonBLOBTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonBLOBTable()", __LINE__, __FILE__); } } @@ -708,8 +765,8 @@ void ODBCOracleTest::recreatePersonDateTimeTable() { dropObject("TABLE", "Person"); try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), Born TIMESTAMP)", now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonDateTimeTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonDateTimeTable()"); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonDateTimeTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonDateTimeTable()", __LINE__, __FILE__); } } @@ -717,8 +774,8 @@ void ODBCOracleTest::recreatePersonDateTable() { dropObject("TABLE", "Person"); try { *_pSession << "CREATE TABLE Person (LastName VARCHAR(30), FirstName VARCHAR(30), Address VARCHAR(30), BornDate DATE)", now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonDateTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonDateTable()"); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreatePersonDateTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreatePersonDateTable()", __LINE__, __FILE__); } } @@ -726,8 +783,8 @@ void ODBCOracleTest::recreateIntsTable() { dropObject("TABLE", "Strings"); try { *_pSession << "CREATE TABLE Strings (str INTEGER)", now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateIntsTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateIntsTable()"); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateIntsTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateIntsTable()", __LINE__, __FILE__); } } @@ -735,8 +792,8 @@ void ODBCOracleTest::recreateStringsTable() { dropObject("TABLE", "Strings"); try { *_pSession << "CREATE TABLE Strings (str VARCHAR(30))", now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateStringsTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateStringsTable()"); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateStringsTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateStringsTable()", __LINE__, __FILE__); } } @@ -744,8 +801,8 @@ void ODBCOracleTest::recreateFloatsTable() { dropObject("TABLE", "Strings"); try { *_pSession << "CREATE TABLE Strings (str NUMBER)", now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateFloatsTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateFloatsTable()"); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateFloatsTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateFloatsTable()", __LINE__, __FILE__); } } @@ -756,8 +813,8 @@ void ODBCOracleTest::recreateTuplesTable() "(int0 INTEGER, int1 INTEGER, int2 INTEGER, int3 INTEGER, int4 INTEGER, int5 INTEGER, int6 INTEGER, " "int7 INTEGER, int8 INTEGER, int9 INTEGER, int10 INTEGER, int11 INTEGER, int12 INTEGER, int13 INTEGER," "int14 INTEGER, int15 INTEGER, int16 INTEGER, int17 INTEGER, int18 INTEGER, int19 INTEGER)", now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateTuplesTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateTuplesTable()"); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateTuplesTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateTuplesTable()", __LINE__, __FILE__); } } @@ -765,8 +822,8 @@ void ODBCOracleTest::recreateVectorsTable() { dropObject("TABLE", "Vectors"); try { *_pSession << "CREATE TABLE Vectors (int0 INTEGER, flt0 NUMBER(5,2), str0 VARCHAR(30))", now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateVectorsTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateVectorsTable()"); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateVectorsTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateVectorsTable()", __LINE__, __FILE__); } } @@ -774,8 +831,8 @@ void ODBCOracleTest::recreateAnysTable() { dropObject("TABLE", "Anys"); try { *_pSession << "CREATE TABLE Anys (int0 INTEGER, flt0 NUMBER, str0 VARCHAR(30))", now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateAnysTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateAnysTable()"); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateAnysTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateAnysTable()", __LINE__, __FILE__); } } @@ -786,8 +843,8 @@ void ODBCOracleTest::recreateNullsTable(const std::string& notNull) notNull, notNull, notNull), now; } - catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateNullsTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateNullsTable()"); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateNullsTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateNullsTable()", __LINE__, __FILE__); } } @@ -802,8 +859,8 @@ void ODBCOracleTest::recreateMiscTable() "Third INTEGER," "Fourth NUMBER," "Fifth TIMESTAMP)", now; - } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateMiscTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateMiscTable()"); } + } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateMiscTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateMiscTable()", __LINE__, __FILE__); } } @@ -827,8 +884,8 @@ void ODBCOracleTest::recreateLogTable() session() << sql, "T_POCO_LOG", now; session() << sql, "T_POCO_LOG_ARCHIVE", now; - } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateLogTable()"); } - catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateLogTable()"); } + } catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail ("recreateLogTable()", __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail ("recreateLogTable()", __LINE__, __FILE__); } } @@ -914,23 +971,17 @@ CppUnit::Test* ODBCOracleTest::suite() CppUnit_addTest(pSuite, ODBCOracleTest, testTuple); CppUnit_addTest(pSuite, ODBCOracleTest, testTupleVector); CppUnit_addTest(pSuite, ODBCOracleTest, testStoredProcedure); - CppUnit_addTest(pSuite, ODBCOracleTest, testCursorStoredProcedure); + //CppUnit_addTest(pSuite, ODBCOracleTest, testCursorStoredProcedure); CppUnit_addTest(pSuite, ODBCOracleTest, testStoredProcedureAny); CppUnit_addTest(pSuite, ODBCOracleTest, testStoredProcedureDynamicAny); CppUnit_addTest(pSuite, ODBCOracleTest, testStoredFunction); - CppUnit_addTest(pSuite, ODBCOracleTest, testCursorStoredFunction); + //CppUnit_addTest(pSuite, ODBCOracleTest, testCursorStoredFunction); CppUnit_addTest(pSuite, ODBCOracleTest, testInternalExtraction); CppUnit_addTest(pSuite, ODBCOracleTest, testFilter); CppUnit_addTest(pSuite, ODBCOracleTest, testInternalBulkExtraction); CppUnit_addTest(pSuite, ODBCOracleTest, testInternalStorageType); CppUnit_addTest(pSuite, ODBCOracleTest, testNull); CppUnit_addTest(pSuite, ODBCOracleTest, testRowIterator); - CppUnit_addTest(pSuite, ODBCOracleTest, testAsync); - CppUnit_addTest(pSuite, ODBCOracleTest, testAny); - CppUnit_addTest(pSuite, ODBCOracleTest, testDynamicAny); - CppUnit_addTest(pSuite, ODBCOracleTest, testMultipleResults); - CppUnit_addTest(pSuite, ODBCOracleTest, testSQLChannel); - CppUnit_addTest(pSuite, ODBCOracleTest, testSQLLogger); CppUnit_addTest(pSuite, ODBCOracleTest, testAutoCommit); CppUnit_addTest(pSuite, ODBCOracleTest, testSessionTransactionNoAutoCommit); CppUnit_addTest(pSuite, ODBCOracleTest, testTransactionIsolation); diff --git a/Data/ODBC/testsuite/src/ODBCOracleTest.h b/Data/ODBC/testsuite/src/ODBCOracleTest.h index 168710be2..6c56fa59f 100644 --- a/Data/ODBC/testsuite/src/ODBCOracleTest.h +++ b/Data/ODBC/testsuite/src/ODBCOracleTest.h @@ -38,6 +38,8 @@ public: void testMultipleResults(); + virtual void testTransaction(); + void testStoredProcedure(); void testCursorStoredProcedure(); void testStoredFunction(); diff --git a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp index 381063f78..44e5fa7ed 100644 --- a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp @@ -224,7 +224,7 @@ void ODBCSQLServerTest::testNull() recreateNullsTable("NOT NULL"); session().setFeature("autoBind", bindValue(i)); session().setFeature("autoExtract", bindValue(i+1)); - executor().notNulls("23000"); + executor().notNulls({"23000"}); i += 2; } diff --git a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp index f49d4e037..f57ab1da2 100644 --- a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp @@ -130,7 +130,7 @@ void ODBCSQLiteTest::testNull() recreateNullsTable("NOT NULL"); session().setFeature("autoBind", bindValue(i)); session().setFeature("autoExtract", bindValue(i+1)); - _pExecutor->notNulls("HY000"); + _pExecutor->notNulls({"HY000"}); i += 2; } } diff --git a/Data/ODBC/testsuite/src/ODBCTest.cpp b/Data/ODBC/testsuite/src/ODBCTest.cpp index 5cd3e47f6..b2ac22a4f 100644 --- a/Data/ODBC/testsuite/src/ODBCTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCTest.cpp @@ -1275,7 +1275,7 @@ void ODBCTest::testTransaction() recreatePersonTable(); _pSession->setFeature("autoBind", bindValue(i)); _pSession->setFeature("autoExtract", bindValue(i+1)); - _pExecutor->transaction(_rConnectString); + _pExecutor->transaction(_rConnectString, _readUncommitted); i += 2; } } diff --git a/Data/ODBC/testsuite/src/ODBCTest.h b/Data/ODBC/testsuite/src/ODBCTest.h index 7d37f3268..8449324d7 100644 --- a/Data/ODBC/testsuite/src/ODBCTest.h +++ b/Data/ODBC/testsuite/src/ODBCTest.h @@ -210,6 +210,8 @@ protected: Poco::Data::Session& session(); SQLExecutor& executor(); + void setReadUncommitted(bool val); + const std::string& dsn(); const std::string& uid(); const std::string& pwd(); @@ -224,6 +226,7 @@ private: std::string& _rUID; std::string& _rPwd; std::string& _rConnectString; + bool _readUncommitted = true; }; @@ -443,4 +446,10 @@ inline const std::string& ODBCTest::dbConnString() } +inline void ODBCTest::setReadUncommitted(bool val) +{ + _readUncommitted = val; +} + + #endif // ODBCTest_INCLUDED diff --git a/Data/ODBC/testsuite/src/SQLExecutor.cpp b/Data/ODBC/testsuite/src/SQLExecutor.cpp index 75b22ba1c..5662cc5ef 100644 --- a/Data/ODBC/testsuite/src/SQLExecutor.cpp +++ b/Data/ODBC/testsuite/src/SQLExecutor.cpp @@ -579,7 +579,8 @@ void SQLExecutor::bareboneODBCMultiResultTest(const std::string& dbConnString, SQLExecutor::DataBinding bindMode, SQLExecutor::DataExtraction extractMode, const std::string& insert, - const std::string& select) + const std::string& select, + const std::string& procCreateString) { SQLRETURN rc; SQLHENV henv = SQL_NULL_HENV; @@ -626,6 +627,18 @@ void SQLExecutor::bareboneODBCMultiResultTest(const std::string& dbConnString, rc = SQLExecute(hstmt); poco_odbc_check_stmt (rc, hstmt); + // create stored proc, if provided + if (!procCreateString.empty()) + { + sql = procCreateString; + pStr = (SQLCHAR*) sql.c_str(); + rc = SQLPrepare(hstmt, pStr, (SQLINTEGER) sql.length()); + poco_odbc_check_stmt (rc, hstmt); + + rc = SQLExecute(hstmt); + poco_odbc_check_stmt (rc, hstmt); + } + // insert multiple rows pStr = (SQLCHAR*) insert.c_str(); rc = SQLPrepare(hstmt, pStr, (SQLINTEGER) insert.length()); @@ -980,8 +993,12 @@ void SQLExecutor::execute(const std::string& sql) void SQLExecutor::connection(const std::string& connectString) { + std::cout << connectString << std::endl; Poco::Data::ODBC::Connection c; - _dataExecutor.connection(c, connectString); + try { _dataExecutor.connection(c, connectString); } + catch(ConnectionException& ce){ std::cout << ce.toString() << std::endl; fail (connectString, __LINE__, __FILE__); } + catch(StatementException& se){ std::cout << se.toString() << std::endl; fail (connectString, __LINE__, __FILE__); } + catch(Poco::Exception& se){ std::cout << se.displayText() << std::endl; fail (connectString, __LINE__, __FILE__); } } @@ -1025,7 +1042,7 @@ void SQLExecutor::session(const std::string& connectString, int timeout) } -void SQLExecutor::notNulls(const std::string& sqlState) +void SQLExecutor::notNulls(const std::vector& sqlStates) { try { @@ -1038,9 +1055,14 @@ void SQLExecutor::notNulls(const std::string& sqlState) if (se.diagnostics().fields().size()) { std::string st = se.diagnostics().sqlState(0); - if (sqlState != st) - std::cerr << '[' << name() << ']' << " Warning: expected SQL state [" << sqlState << - "], received [" << se.diagnostics().sqlState(0) << "] instead." << std::endl; + for (const auto& sqlState : sqlStates) + if (sqlState == st) return; + + std::string strSQLStates; + for (const auto& sqlState : sqlStates) + strSQLStates.append(sqlState).append(1, ' '); + std::cerr << '[' << name() << ']' << " Warning: expected SQL state [" << strSQLStates << + "], received [" << st << "] instead." << std::endl; } } } diff --git a/Data/ODBC/testsuite/src/SQLExecutor.h b/Data/ODBC/testsuite/src/SQLExecutor.h index 815d937d7..128926717 100644 --- a/Data/ODBC/testsuite/src/SQLExecutor.h +++ b/Data/ODBC/testsuite/src/SQLExecutor.h @@ -106,7 +106,8 @@ public: SQLExecutor::DataBinding bindMode, SQLExecutor::DataExtraction extractMode, const std::string& insert = MULTI_INSERT, - const std::string& select = MULTI_SELECT); + const std::string& select = MULTI_SELECT, + const std::string& procCreateString = ""); void bareboneODBCStoredFuncTest(const std::string& dbConnString, const std::string& tableCreateString, @@ -495,7 +496,7 @@ public: void internalBulkExtractionUTF16(); void internalStorageType(); void nulls(); - void notNulls(const std::string& sqlState = "23502"); + void notNulls(const std::vector& sqlStates = {std::string("23502")}); void rowIterator(); void stdVectorBool(); @@ -517,7 +518,7 @@ public: void sessionTransaction(const std::string& connect); void sessionTransactionNoAutoCommit(const std::string& connect); - void transaction(const std::string& connect); + void transaction(const std::string& connect, bool readUncommitted = true); void transactor(); void nullable(); @@ -994,9 +995,9 @@ inline void SQLExecutor::sessionTransactionNoAutoCommit(const std::string& conne } -inline void SQLExecutor::transaction(const std::string& connect) +inline void SQLExecutor::transaction(const std::string& connect, bool readUncommitted) { - _dataExecutor.transaction("odbc", connect); + _dataExecutor.transaction("odbc", connect, readUncommitted); } diff --git a/Data/PostgreSQL/PostgreSQL_vs170.vcxproj b/Data/PostgreSQL/PostgreSQL_vs170.vcxproj index 34a4ecdf0..30417e18b 100644 --- a/Data/PostgreSQL/PostgreSQL_vs170.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDataPostgreSQLA64d PocoDataPostgreSQLmdd PocoDataPostgreSQLmtd @@ -346,6 +346,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\binA64\PocoDataPostgreSQLA64d.dll @@ -379,6 +381,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\binA64\PocoDataPostgreSQLA64.dll @@ -410,6 +414,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\libA64\PocoDataPostgreSQLmtd.lib @@ -436,6 +442,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\libA64\PocoDataPostgreSQLmt.lib @@ -459,6 +467,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\libA64\PocoDataPostgreSQLmdd.lib @@ -485,6 +495,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\libA64\PocoDataPostgreSQLmd.lib @@ -508,6 +520,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\bin\PocoDataPostgreSQLd.dll @@ -541,6 +555,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\bin\PocoDataPostgreSQL.dll @@ -572,6 +588,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataPostgreSQLmtd.lib @@ -598,6 +616,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\lib\PocoDataPostgreSQLmt.lib @@ -621,6 +641,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataPostgreSQLmdd.lib @@ -647,6 +669,8 @@ Default true + stdcpp17 + stdc11 ..\..\lib\PocoDataPostgreSQLmd.lib @@ -670,6 +694,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\bin64\PocoDataPostgreSQL64d.dll @@ -703,6 +729,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\bin64\PocoDataPostgreSQL64.dll @@ -734,6 +762,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataPostgreSQLmtd.lib @@ -760,6 +790,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\lib64\PocoDataPostgreSQLmt.lib @@ -783,6 +815,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\..\lib64\PocoDataPostgreSQLmdd.lib @@ -809,6 +843,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\..\lib64\PocoDataPostgreSQLmd.lib @@ -817,36 +853,58 @@ 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/Data/SQLite/SQLite_vs170.vcxproj b/Data/SQLite/SQLite_vs170.vcxproj index de35c5c6a..d4c542876 100644 --- a/Data/SQLite/SQLite_vs170.vcxproj +++ b/Data/SQLite/SQLite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDataSQLiteA64d PocoDataSQLitemdd PocoDataSQLitemtd @@ -347,6 +347,8 @@ $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\binA64\PocoDataSQLiteA64d.dll @@ -381,6 +383,8 @@ $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\binA64\PocoDataSQLiteA64.dll @@ -413,6 +417,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\libA64\PocoDataSQLitemtd.lib @@ -440,6 +446,8 @@ $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\libA64\PocoDataSQLitemt.lib @@ -464,6 +472,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\libA64\PocoDataSQLitemdd.lib @@ -491,6 +501,8 @@ $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\libA64\PocoDataSQLitemd.lib @@ -515,6 +527,8 @@ $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\bin\PocoDataSQLited.dll @@ -549,6 +563,8 @@ $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\bin\PocoDataSQLite.dll @@ -581,6 +597,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib\PocoDataSQLitemtd.lib @@ -608,6 +626,8 @@ $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib\PocoDataSQLitemt.lib @@ -632,6 +652,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib\PocoDataSQLitemdd.lib @@ -659,6 +681,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib\PocoDataSQLitemd.lib @@ -683,6 +707,8 @@ $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\bin64\PocoDataSQLite64d.dll @@ -717,6 +743,8 @@ $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\bin64\PocoDataSQLite64.dll @@ -749,6 +777,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib64\PocoDataSQLitemtd.lib @@ -776,6 +806,8 @@ $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib64\PocoDataSQLitemt.lib @@ -800,6 +832,8 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib64\PocoDataSQLitemdd.lib @@ -827,6 +861,8 @@ $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) true + stdcpp17 + stdc11 ..\..\lib64\PocoDataSQLitemd.lib @@ -847,30 +883,48 @@ 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/Data/SQLite/SQLite_vs170.vcxproj.filters b/Data/SQLite/SQLite_vs170.vcxproj.filters index 7dab32536..30cb72dd6 100644 --- a/Data/SQLite/SQLite_vs170.vcxproj.filters +++ b/Data/SQLite/SQLite_vs170.vcxproj.filters @@ -2,22 +2,22 @@ - {023fba4b-4ebd-4098-bfd0-95569b89efb9} + {1bad0647-a4aa-4822-a8ea-93f788ff7be1} - {9a59ce73-0d00-4438-9ea1-9014d62bf834} + {b81dd631-b740-450c-8fda-ba9c8d87c466} - {2a5c5030-0ab3-4ac1-8699-3cc1d228047b} + {d8fc7394-be23-4595-962f-53b9acdda727} - {34f21c3d-d771-458f-9b6f-90a3a44bb448} + {52dda208-a7cf-4967-a74f-88b1e0e30026} - {67a323f5-6b84-4db0-9098-087855fe9ac2} + {f8e8c0dd-45d7-4f06-8814-ccec0b5d03c6} - {aa7d787e-3b84-43df-9232-8e399089ee3e} + {4aa8c8c7-825e-46aa-8e36-59985cef50b2} diff --git a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj index 7d23cab24..b9f742330 100644 --- a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 TestSuited TestSuited TestSuited @@ -358,6 +358,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -391,6 +393,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -421,6 +425,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -454,6 +460,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -484,6 +492,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -517,6 +527,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,6 +559,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -580,6 +594,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -610,6 +626,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -643,6 +661,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -673,6 +693,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -706,6 +728,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -736,6 +760,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -769,6 +795,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -799,6 +827,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -832,6 +862,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -862,6 +894,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -895,6 +929,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -914,12 +950,18 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters index f6cfb49a2..8bba61b52 100644 --- a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {dd4cfc76-874b-4382-be44-81a295298cb6} + {62bc9434-578c-424b-af4b-838e351397f5} - {c5923469-368d-4bcb-8f28-5705b18b49c9} + {d11aa317-b999-454c-84af-0caae02b36f8} - {51dcfbe6-d547-4150-a965-ed9d7f75e266} + {de477f36-0385-4527-afe6-2c344f867014} - {8b666d33-bda1-420e-b882-4b339c8f2214} + {8f537ccd-f8fc-4079-8c37-5f0ac2c26436} - {3e7c0757-51e8-47bc-a907-20f1e465474d} + {836839b8-70df-4bf6-9130-447077a74d5c} - {0936e3ec-1613-4a78-ba4d-7f8ea3525526} + {c4807f6c-ac72-45f0-9230-4181bb2da4b5} - {c40d7bc0-a933-4bd2-9e18-f53925bbbb40} + {0503a1f8-53ab-4ddd-920c-bd3770f0b307} - {018c2803-1962-4f36-9e10-4e1ea6e9afad} + {6228e845-e29c-44cd-9347-0314b081373d} diff --git a/Data/include/Poco/Data/AbstractExtraction.h b/Data/include/Poco/Data/AbstractExtraction.h index dc5f59197..ea3fb168f 100644 --- a/Data/include/Poco/Data/AbstractExtraction.h +++ b/Data/include/Poco/Data/AbstractExtraction.h @@ -151,6 +151,25 @@ public: /// - string is empty /// - getEmptyStringIsNull() returns true + std::string getHeldType() const + /// Returns the held type name, if set. + /// If held type name is not set, returns empty string. + /// Held type is optionally set by calling setHeldType() + /// in child classes. + /// Useful for dynamic_cast failure diagnostics. + { + std::string held; + if (_pHeldType) held = *_pHeldType; + return held; + } + +protected: + template + void setHeldType() + { + _pHeldType.reset(new std::string(Poco::demangle())); + } + private: template bool isStringNull(const S& str, bool deflt) @@ -169,6 +188,7 @@ private: bool _bulk; bool _emptyStringIsNull; bool _forceEmptyString; + std::unique_ptr _pHeldType; }; diff --git a/Data/include/Poco/Data/Extraction.h b/Data/include/Poco/Data/Extraction.h index 90e773d95..39ca692e7 100644 --- a/Data/include/Poco/Data/Extraction.h +++ b/Data/include/Poco/Data/Extraction.h @@ -492,10 +492,10 @@ private: template class InternalExtraction: public Extraction - /// Container Data Type specialization extension for extraction of values from a query result set. + /// Container Data Type extension for extraction of values from a query result set. /// /// This class is intended for PocoData internal use - it is used by StatementImpl - /// to automaticaly create internal Extraction in cases when statement returns data and no external storage + /// to automatically create internal Extraction in cases when statement returns data and no external storage /// was supplied. It is later used by RecordSet to retrieve the fetched data after statement execution. /// It takes ownership of the Column pointer supplied as constructor argument. Column object, in turn /// owns the data container pointer. @@ -503,17 +503,14 @@ class InternalExtraction: public Extraction /// InternalExtraction objects can not be copied or assigned. { public: - using ValType = typename C::value_type; - using ValPtr = SharedPtr; - using Type = Extraction; - using Ptr = SharedPtr; - + using HeldValType = typename C::value_type; InternalExtraction(C& result, Column* pColumn, const Position& pos = Position(0)): - Extraction(result, ValType(), pos), + Extraction(result, HeldValType(), pos), _pColumn(pColumn) /// Creates InternalExtraction. { + AbstractExtraction::setHeldType(); } ~InternalExtraction() @@ -528,7 +525,7 @@ public: _pColumn->reset(); } - const ValType& value(int index) const + const HeldValType& value(int index) const { try { diff --git a/Data/include/Poco/Data/RecordSet.h b/Data/include/Poco/Data/RecordSet.h index 35b064190..a4483fad4 100644 --- a/Data/include/Poco/Data/RecordSet.h +++ b/Data/include/Poco/Data/RecordSet.h @@ -377,27 +377,22 @@ private: const Column& columnImpl(std::size_t pos) const /// Returns the reference to column at specified position. { - using T = typename C::value_type; - using ExtractionVecPtr = const E*; - const AbstractExtractionVec& rExtractions = extractions(); std::size_t s = rExtractions.size(); if (0 == s || pos >= s) throw RangeException(Poco::format("Invalid column index: %z", pos)); - ExtractionVecPtr pExtraction = dynamic_cast(rExtractions[pos].get()); - - if (pExtraction) + auto pExtraction = rExtractions[pos].cast(); + if (!pExtraction) { - return pExtraction->column(); - } - else - { - throw Poco::BadCastException(Poco::format("Type cast failed!\nColumn: %z\nTarget type:\t%s", + throw Poco::BadCastException(Poco::format("Type dynamic cast failed!\n" + "Column: %z\nConversion:\n%s\n%s", pos, - std::string(typeid(T).name()))); + Poco::demangle(typeid(typename E::ValType).name()), + rExtractions[pos]->getHeldType())); } + return pExtraction->column(); } bool isAllowed(std::size_t row) const; diff --git a/Data/samples/Binding/Binding_vs170.vcxproj b/Data/samples/Binding/Binding_vs170.vcxproj index 5c0b2354b..9a6fd0337 100644 --- a/Data/samples/Binding/Binding_vs170.vcxproj +++ b/Data/samples/Binding/Binding_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 Bindingd Bindingd Bindingd @@ -358,6 +358,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -391,6 +393,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -421,6 +425,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -454,6 +460,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -484,6 +492,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -517,6 +527,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,6 +559,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -580,6 +594,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -610,6 +626,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -643,6 +661,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -673,6 +693,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -706,6 +728,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -736,6 +760,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -769,6 +795,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -799,6 +827,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -832,6 +862,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -862,6 +894,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -895,6 +929,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -910,6 +946,8 @@ true + stdcpp17 + stdc11 diff --git a/Data/samples/Binding/Binding_vs170.vcxproj.filters b/Data/samples/Binding/Binding_vs170.vcxproj.filters index bb893a59f..66f7774f7 100644 --- a/Data/samples/Binding/Binding_vs170.vcxproj.filters +++ b/Data/samples/Binding/Binding_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {e8e76134-6346-40e9-bce4-baf24c7610fb} + {b66be61f-2d0d-4620-9e29-36518c68c8bc} - {9a993148-b7f8-48c8-92b8-14a209548407} + {65592551-377e-432a-9257-638f138d095e} diff --git a/Data/samples/RecordSet/RecordSet_vs170.vcxproj b/Data/samples/RecordSet/RecordSet_vs170.vcxproj index 3426fb812..580f58f9c 100644 --- a/Data/samples/RecordSet/RecordSet_vs170.vcxproj +++ b/Data/samples/RecordSet/RecordSet_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 RecordSetd RecordSetd RecordSetd @@ -358,6 +358,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -391,6 +393,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -421,6 +425,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -454,6 +460,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -484,6 +492,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -517,6 +527,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,6 +559,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -580,6 +594,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -610,6 +626,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -643,6 +661,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -673,6 +693,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -706,6 +728,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -736,6 +760,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -769,6 +795,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -799,6 +827,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -832,6 +862,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -862,6 +894,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -895,6 +929,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -910,6 +946,8 @@ true + stdcpp17 + stdc11 diff --git a/Data/samples/RecordSet/RecordSet_vs170.vcxproj.filters b/Data/samples/RecordSet/RecordSet_vs170.vcxproj.filters index 930c29c55..c7b587983 100644 --- a/Data/samples/RecordSet/RecordSet_vs170.vcxproj.filters +++ b/Data/samples/RecordSet/RecordSet_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {5c9585a2-5f0e-4e0d-a215-c5b4e2598b02} + {96e43d12-7f78-4b66-a8b9-c83d2ef4822d} - {4114cf23-5bc2-4f39-83cd-dab67726573b} + {ed7a2499-d73a-4049-9ea4-5c4a6219b25f} diff --git a/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj b/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj index da03c0b98..2517ce024 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj +++ b/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 RowFormatterd RowFormatterd RowFormatterd @@ -358,6 +358,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -391,6 +393,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -421,6 +425,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -454,6 +460,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -484,6 +492,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -517,6 +527,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,6 +559,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -580,6 +594,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -610,6 +626,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -643,6 +661,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -673,6 +693,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -706,6 +728,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -736,6 +760,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -769,6 +795,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -799,6 +827,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -832,6 +862,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -862,6 +894,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -895,6 +929,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -910,6 +946,8 @@ true + stdcpp17 + stdc11 diff --git a/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj.filters index 30d00b894..206a6f1e6 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj.filters +++ b/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {55d27c6d-34e3-48c9-9dab-30f19b4eb2db} + {abbe8f59-688c-4083-bb17-30afaf3b4078} - {a2662e75-309d-48b4-ac0f-6b20f70c63e7} + {b1637afe-a5e1-4f7a-99c0-6b7a5c67fe2e} diff --git a/Data/samples/Tuple/Tuple_vs170.vcxproj b/Data/samples/Tuple/Tuple_vs170.vcxproj index ead6b92b4..91ec3a2a3 100644 --- a/Data/samples/Tuple/Tuple_vs170.vcxproj +++ b/Data/samples/Tuple/Tuple_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 Tupled Tupled Tupled @@ -358,6 +358,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -391,6 +393,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -421,6 +425,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -454,6 +460,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -484,6 +492,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -517,6 +527,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,6 +559,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -580,6 +594,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -610,6 +626,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -643,6 +661,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -673,6 +693,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -706,6 +728,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -736,6 +760,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -769,6 +795,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -799,6 +827,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -832,6 +862,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -862,6 +894,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -895,6 +929,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -910,6 +946,8 @@ true + stdcpp17 + stdc11 diff --git a/Data/samples/Tuple/Tuple_vs170.vcxproj.filters b/Data/samples/Tuple/Tuple_vs170.vcxproj.filters index 90cbfb8d5..00933f38c 100644 --- a/Data/samples/Tuple/Tuple_vs170.vcxproj.filters +++ b/Data/samples/Tuple/Tuple_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {dac0e7cb-b6c6-48ec-a4fe-dfc68586a8a8} + {3fa1093b-2e2f-48d3-91bc-1faed241dfe1} - {d0910af4-6934-4679-a1d5-06b32761ccbb} + {89e9f080-6f25-42e9-bce1-121f839d2d69} diff --git a/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj b/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj index 9b9e9a772..bbb95405c 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj +++ b/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 TypeHandlerd TypeHandlerd TypeHandlerd @@ -358,6 +358,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -391,6 +393,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -421,6 +425,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -454,6 +460,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -484,6 +492,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -517,6 +527,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,6 +559,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -580,6 +594,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -610,6 +626,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -643,6 +661,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -673,6 +693,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -706,6 +728,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -736,6 +760,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -769,6 +795,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -799,6 +827,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -832,6 +862,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -862,6 +894,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -895,6 +929,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -910,6 +946,8 @@ true + stdcpp17 + stdc11 diff --git a/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj.filters b/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj.filters index b9aed831b..d006adc3a 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj.filters +++ b/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {c8572373-9da3-41da-ae2d-593a2d477636} + {2080fcd4-75d2-47d1-8901-b6e36837010c} - {c2309f1a-6646-481b-9043-eff95df10be7} + {7dd4895e-fb1b-409c-a507-df11d3dabf37} diff --git a/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj b/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj index 3f55b0caf..79b166193 100644 --- a/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj +++ b/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 WebNotifierd WebNotifierd WebNotifierd @@ -358,6 +358,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -391,6 +393,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -421,6 +425,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -454,6 +460,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -484,6 +492,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -517,6 +527,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,6 +559,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -580,6 +594,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -610,6 +626,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -643,6 +661,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -673,6 +693,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -706,6 +728,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -736,6 +760,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -769,6 +795,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -799,6 +827,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -832,6 +862,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -862,6 +894,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -895,6 +929,8 @@ Default $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -910,6 +946,8 @@ true + stdcpp17 + stdc11 diff --git a/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj.filters b/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj.filters index 1f7fbe255..4d9d98858 100644 --- a/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj.filters +++ b/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {574dcbbb-642e-4307-b0da-189fb24bc04d} + {a0e05d21-ad87-4322-8c68-d9cfb15cbd85} - {a73ef0f0-269a-4ac8-9988-d72517e63f55} + {265b8749-8202-4f8e-be5b-46ba0e742cb5} diff --git a/Data/testsuite/DataTest/DataTest.progen b/Data/testsuite/DataTest/DataTest.progen index a66f1f1a9..a59d85262 100644 --- a/Data/testsuite/DataTest/DataTest.progen +++ b/Data/testsuite/DataTest/DataTest.progen @@ -16,5 +16,5 @@ vc.project.compiler.defines = vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS;SQLParser_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 /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = false diff --git a/Data/testsuite/DataTest/DataTest_vs160.vcxproj b/Data/testsuite/DataTest/DataTest_vs160.vcxproj index 1b1fe654c..47ab9627b 100644 --- a/Data/testsuite/DataTest/DataTest_vs160.vcxproj +++ b/Data/testsuite/DataTest/DataTest_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDataTestd PocoDataTestmdd PocoDataTestmtd @@ -240,7 +240,7 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true @@ -273,7 +273,7 @@ Level3 Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true @@ -305,7 +305,7 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true @@ -331,7 +331,7 @@ Level3 Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true @@ -355,7 +355,7 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true @@ -382,7 +382,7 @@ Level3 Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true @@ -405,7 +405,7 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true @@ -438,7 +438,7 @@ Level3 Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true @@ -470,7 +470,7 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true @@ -496,7 +496,7 @@ Level3 Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true @@ -520,7 +520,7 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true @@ -546,7 +546,7 @@ Level3 Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true diff --git a/Data/testsuite/DataTest/DataTest_vs160.vcxproj.filters b/Data/testsuite/DataTest/DataTest_vs160.vcxproj.filters index ff3bdca00..c0d5a1ed5 100644 --- a/Data/testsuite/DataTest/DataTest_vs160.vcxproj.filters +++ b/Data/testsuite/DataTest/DataTest_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {500cef7c-16d5-46fb-97ec-01057efdb45c} + {f760d849-e52d-44e3-84ac-c11bf255e05a} - {ea370452-c471-484e-953b-6d4f1802114c} + {3abd9539-27ca-465e-bab6-f75ab22329ae} diff --git a/Data/testsuite/DataTest/DataTest_vs170.vcxproj b/Data/testsuite/DataTest/DataTest_vs170.vcxproj index e485ed818..7f9b4389c 100644 --- a/Data/testsuite/DataTest/DataTest_vs170.vcxproj +++ b/Data/testsuite/DataTest/DataTest_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoDataTestA64d PocoDataTestmdd PocoDataTestmtd @@ -345,8 +345,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\binA64\PocoDataTestA64d.dll @@ -379,8 +381,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\binA64\PocoDataTestA64.dll @@ -411,8 +415,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\libA64\PocoDataTestmtd.lib @@ -438,8 +444,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\libA64\PocoDataTestmt.lib @@ -462,8 +470,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\libA64\PocoDataTestmdd.lib @@ -489,8 +499,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\libA64\PocoDataTestmd.lib @@ -513,8 +525,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\bin\PocoDataTestd.dll @@ -547,8 +561,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\bin\PocoDataTest.dll @@ -579,8 +595,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\lib\PocoDataTestmtd.lib @@ -606,8 +624,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\lib\PocoDataTestmt.lib @@ -630,8 +650,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\lib\PocoDataTestmdd.lib @@ -657,8 +679,10 @@ Level3 Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\lib\PocoDataTestmd.lib @@ -681,8 +705,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\bin64\PocoDataTest64d.dll @@ -715,8 +741,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\bin64\PocoDataTest64.dll @@ -747,8 +775,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\lib64\PocoDataTestmtd.lib @@ -774,8 +804,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\lib64\PocoDataTestmt.lib @@ -798,8 +830,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\lib64\PocoDataTestmdd.lib @@ -825,8 +859,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\..\..\lib64\PocoDataTestmd.lib @@ -842,6 +878,8 @@ true + stdcpp17 + stdc11 diff --git a/Data/testsuite/DataTest/DataTest_vs170.vcxproj.filters b/Data/testsuite/DataTest/DataTest_vs170.vcxproj.filters index b51cabb96..f76472c5d 100644 --- a/Data/testsuite/DataTest/DataTest_vs170.vcxproj.filters +++ b/Data/testsuite/DataTest/DataTest_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {2713314a-e003-4c79-92c3-7d9b8e7203f9} + {6dd648e2-e024-4d90-a270-c8ba55e39c02} - {de6b2c36-307e-4d6c-8e6d-d945183e3f0c} + {69ef55f2-d63a-4a3b-841b-aaed5af20d13} diff --git a/Data/testsuite/DataTest/include/Poco/Data/Test/SQLExecutor.h b/Data/testsuite/DataTest/include/Poco/Data/Test/SQLExecutor.h index 9ef79e5e8..8833fa2a9 100644 --- a/Data/testsuite/DataTest/include/Poco/Data/Test/SQLExecutor.h +++ b/Data/testsuite/DataTest/include/Poco/Data/Test/SQLExecutor.h @@ -61,11 +61,63 @@ public: void connection(C& c, const std::string& connectString) { assertFalse (c.isConnected()); - assertTrue (c.connect(connectString, 5)); + // some drivers/DBMS do not distinguish, so we only test same values here + assertTrue (c.connect(connectString, 10, 10)); assertTrue (c.isConnected()); - assertTrue (c.getTimeout() == 5); - c.setTimeout(6); - assertTrue (c.getTimeout() == 6); + try + { + assertTrue (c.getTimeout() == 10); + } + catch(const NotSupportedException&) + { + std::cout << "Getting session timeout not supported." << '\n'; + } + + try + { + assertTrue (c.getLoginTimeout() == 10); + } + catch(const NotSupportedException&) + { + std::cout << "Getting login timeout not supported." << '\n'; + } + + try + { + c.setTimeout(6); + } + catch(const NotSupportedException&) + { + std::cout << "Setting session timeout not supported." << '\n'; + } + + try + { + assertTrue (c.getTimeout() == 6); + } + catch(const NotSupportedException&) + { + std::cout << "Getting session timeout not supported." << '\n'; + } + + try + { + c.setLoginTimeout(11); + } + catch(const InvalidAccessException&) + { + std::cout << "Setting login timeout not supported." << '\n'; + } + + try + { + assertTrue (c.getLoginTimeout() == 11); + } + catch(const NotSupportedException&) + { + std::cout << "Getting login timeout not supported." << '\n'; + } + assertTrue (c.disconnect()); assertFalse (c.isConnected()); assertTrue (c.connect(connectString)); @@ -215,7 +267,7 @@ public: void sessionTransaction(const std::string& connector, const std::string& connect); void sessionTransactionNoAutoCommit(const std::string& connector, const std::string& connect); - void transaction(const std::string& connector, const std::string& connect); + void transaction(const std::string& connector, const std::string& connect, bool readUncommitted = true); void transactor(); void nullable(); diff --git a/Data/testsuite/DataTest/src/SQLExecutor.cpp b/Data/testsuite/DataTest/src/SQLExecutor.cpp index 7744ece24..2b30647b0 100644 --- a/Data/testsuite/DataTest/src/SQLExecutor.cpp +++ b/Data/testsuite/DataTest/src/SQLExecutor.cpp @@ -573,7 +573,6 @@ void SQLExecutor::simpleAccess() fail (__func__, __LINE__, __FILE__); } - count = 0; try { session() << "SELECT COUNT(*) FROM Person", into(count), now; } catch(DataException& ce) @@ -2844,14 +2843,30 @@ void SQLExecutor::internalExtraction() assertTrue (3 == rset2.columnCount()); assertTrue (4 == rset2.rowCount()); - int i = rset.value(0,0); - assertTrue (1 == i); + try + { + int i = rset.value(0,0); + assertTrue (1 == i); + } + catch(BadCastException&) + { + Poco::Int64 l = rset.value(0,0); + assertTrue (1 == l); + } std::string s = rset.value(0,0).convert(); assertTrue ("1" == s); - int a = rset.value(0,2); - assertTrue (3 == a); + try + { + int a = rset.value(0,2); + assertTrue (3 == a); + } + catch(BadCastException&) + { + Poco::Int64 l = rset.value(0,2); + assertTrue (3 == l); + } try { @@ -2875,14 +2890,25 @@ void SQLExecutor::internalExtraction() } assertTrue ("5" == s); - i = rset.value("str0", 2); + int i = rset.value("str0", 2); assertTrue (5 == i); - const Column >& col = rset.column >(0); - Column >::Iterator it = col.begin(); - Column >::Iterator end = col.end(); - for (int i = 1; it != end; ++it, ++i) - assertTrue (*it == i); + try + { + const Column>& col = rset.column >(0); + Column>::Iterator it = col.begin(); + Column>::Iterator end = col.end(); + for (int j = 1; it != end; ++it, ++j) + assertTrue (*it == j); + } + catch(BadCastException&) + { + const Column>& col = rset.column >(0); + Column>::Iterator it = col.begin(); + Column>::Iterator end = col.end(); + for (Poco::Int64 l = 1; it != end; ++it, ++l) + assertTrue (*it == l); + } rset = (session() << "SELECT COUNT(*) AS cnt FROM Vectors", now); @@ -2929,6 +2955,11 @@ void SQLExecutor::internalExtraction() std::cout << ce.displayText() << std::endl; fail (__func__, __LINE__, __FILE__); } + catch(Exception& ce) + { + std::cout << ce.displayText() << std::endl; + fail (__func__, __LINE__, __FILE__); + } } @@ -3937,7 +3968,7 @@ void SQLExecutor::sessionTransactionNoAutoCommit(const std::string& connector, c try { local.setFeature("autoCommit", true); - fail ("must fail on autocommit setting during transaction", __LINE__); + fail ("must fail on autocommit setting during transaction", __LINE__, __FILE__); } catch(const Poco::InvalidAccessException&) { } // but setting it to its current state is allowed (no-op) @@ -3992,7 +4023,7 @@ void SQLExecutor::sessionTransactionNoAutoCommit(const std::string& connector, c } -void SQLExecutor::transaction(const std::string& connector, const std::string& connect) +void SQLExecutor::transaction(const std::string& connector, const std::string& connect, bool readUncommitted) { if (!session().canTransact()) { @@ -4076,7 +4107,9 @@ void SQLExecutor::transaction(const std::string& connector, const std::string& c try { stmt1.wait(5000); - if (local.getTransactionIsolation() == Session::TRANSACTION_READ_UNCOMMITTED) + if (readUncommitted && + local.hasTransactionIsolation(Session::TRANSACTION_READ_UNCOMMITTED) && + local.getTransactionIsolation() == Session::TRANSACTION_READ_UNCOMMITTED) assertTrue (0 == locCount); } catch (TimeoutException&) { std::cerr << '[' << name() << ']' << " Warning: async query timed out." << std::endl; } @@ -4150,72 +4183,80 @@ struct TestRollbackTransactor void SQLExecutor::transactor() { - int count = 0; - - bool autoCommit = session().getFeature("autoCommit"); - auto ti = session().getTransactionIsolation(); - - session().setFeature("autoCommit", false); - session().setTransactionIsolation(Session::TRANSACTION_READ_COMMITTED); - - TestCommitTransactor ct; - Transaction t1(session(), ct); - - session() << "SELECT count(*) FROM Person", into(count), now; - assertTrue (1 == count); - - session() << "DELETE FROM Person", now; session().commit(); - - session() << "SELECT count(*) FROM Person", into(count), now; - assertTrue (0 == count); - try { - TestRollbackTransactor rt; - Transaction t(session(), rt); - fail ("must fail"); - } catch (Poco::Exception&) { } + int count = 0; - session() << "SELECT count(*) FROM Person", into(count), now; - assertTrue (0 == count); + bool autoCommit = session().getFeature("autoCommit"); + auto ti = session().getTransactionIsolation(); - try + session().setFeature("autoCommit", false); + session().setTransactionIsolation(Session::TRANSACTION_READ_COMMITTED); + + TestCommitTransactor ct; + Transaction t1(session(), ct); + + session() << "SELECT count(*) FROM Person", into(count), now; + assertTrue (1 == count); + + session() << "DELETE FROM Person", now; session().commit(); + + session() << "SELECT count(*) FROM Person", into(count), now; + assertTrue (0 == count); + + try + { + TestRollbackTransactor rt; + Transaction t(session(), rt); + fail ("must fail"); + } catch (Poco::Exception&) { } + + session() << "SELECT count(*) FROM Person", into(count), now; + assertTrue (0 == count); + + try + { + TestRollbackTransactor rt; + Transaction t(session()); + t.transact(rt); + fail ("must fail"); + } catch (Poco::Exception&) { } + + session() << "SELECT count(*) FROM Person", into(count), now; + assertTrue (0 == count); + + try + { + TestRollbackTransactor rt; + Transaction t(session(), false); + t.transact(rt); + fail ("must fail"); + } catch (Poco::Exception&) { } + + session() << "SELECT count(*) FROM Person", into(count), now; + assertTrue (0 == count); + + try + { + TestRollbackTransactor rt; + Transaction t(session(), true); + t.transact(rt); + fail ("must fail"); + } catch (Poco::Exception&) { } + + session() << "SELECT count(*) FROM Person", into(count), now; + assertTrue (0 == count); + session().commit(); + + // restore the original transaction state + session().setFeature("autoCommit", autoCommit); + setTransactionIsolation(session(), ti); + } + catch (Poco::Exception& ex) { - TestRollbackTransactor rt; - Transaction t(session()); - t.transact(rt); - fail ("must fail"); - } catch (Poco::Exception&) { } - - session() << "SELECT count(*) FROM Person", into(count), now; - assertTrue (0 == count); - - try - { - TestRollbackTransactor rt; - Transaction t(session(), false); - t.transact(rt); - fail ("must fail"); - } catch (Poco::Exception&) { } - - session() << "SELECT count(*) FROM Person", into(count), now; - assertTrue (0 == count); - - try - { - TestRollbackTransactor rt; - Transaction t(session(), true); - t.transact(rt); - fail ("must fail"); - } catch (Poco::Exception&) { } - - session() << "SELECT count(*) FROM Person", into(count), now; - assertTrue (0 == count); - session().commit(); - - // restore the original transaction state - session().setFeature("autoCommit", autoCommit); - setTransactionIsolation(session(), ti); + std::cerr << __func__ << ':' << ex.displayText() << std::endl; + fail (__func__, __LINE__, __FILE__); + } } diff --git a/Data/testsuite/TestSuite.progen b/Data/testsuite/TestSuite.progen index 6e936ac49..bea49bc18 100644 --- a/Data/testsuite/TestSuite.progen +++ b/Data/testsuite/TestSuite.progen @@ -9,6 +9,6 @@ vc.project.prototype = TestSuite_vs90.vcproj # TODO, for now we can just send cpp std via AdditionalOptions (see below) #vc.project.compiler.std.cpp=stdcpp17 #vc.project.compiler.std.c=stdc11 -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.compiler.include = ..\\src;..\\..\\Foundation\\include vc.project.linker.dependencies.Win32 = iphlpapi.lib diff --git a/Data/testsuite/TestSuite_vs170.vcxproj b/Data/testsuite/TestSuite_vs170.vcxproj index d8a07a82b..84b9b1a53 100644 --- a/Data/testsuite/TestSuite_vs170.vcxproj +++ b/Data/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 TestSuited TestSuited TestSuited @@ -357,8 +357,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -391,8 +393,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -422,8 +426,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -456,8 +462,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -487,8 +495,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -521,8 +531,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,8 +564,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -586,8 +600,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -617,8 +633,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -651,8 +669,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -682,8 +702,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -716,8 +738,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -747,8 +771,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -781,8 +807,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -812,8 +840,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -846,8 +876,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -877,8 +909,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -911,8 +945,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -940,36 +976,58 @@ 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/Data/testsuite/TestSuite_vs170.vcxproj.filters b/Data/testsuite/TestSuite_vs170.vcxproj.filters index ca13c060b..b4898c2c6 100644 --- a/Data/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,55 +2,55 @@ - {bfb939fb-2a9d-4da7-b6ad-e04d4a293d2f} + {eb163d66-4f6f-42de-a04e-52e38dfb9225} - {fbff398e-274d-4f64-b41f-65f7a7fc7c2c} + {b463247e-94f4-43c7-872f-7668fbd733b8} - {83f79846-18d7-4869-ab18-f9a220d7e22c} + {da33cba1-cbb5-4ba3-ab34-85e43ab42f82} - {39b1a2ac-3b5c-40b5-89aa-05484f2b26b0} + {ef265d31-0949-467d-973a-c1f09e433897} - {1b5be6d4-1d17-4ef9-a524-6e891779d7e7} + {3d13feb6-806a-4eb4-8b46-c355dc1cc571} - {b771eb76-d75b-468b-b09c-ea802323ba47} + {da4e4535-7278-4c9e-b4c0-d056f7e33f27} - {2a5cd233-fc4d-42d5-94ec-073698b29255} + {16b4ea46-09ae-4c53-9037-2a7cd06b5296} - {9729b7a6-eefe-4063-8711-adeb071c8a47} + {fe4a83c2-964c-4298-99f0-404b648ff97f} - {2eb01c5a-4b7e-4595-aa6d-6224e546f35c} + {6b1d9cf8-1073-4412-8255-037c48829507} - {5cb5afec-f610-4725-b20b-1a5f9abd7290} + {8194cc84-8a37-4dd6-94c7-7c469eeb4aa6} - {e0bd3e5b-1fcc-4476-8bbf-35c4a1c956e9} + {1cdf3a0d-7bf6-44fd-b651-3e1a4311c6d6} - {e5e2a5fe-1877-4def-ae55-49c843216fa7} + {3b4ca634-cf77-419c-8f6b-a7923d3ce3eb} - {3e80b53f-9999-4bdb-a94a-712c0ff85c93} + {58df62f8-9bfe-4849-9e2e-6888973db2c5} - {a20048d6-a82e-464c-84d2-e605d0c8bdf3} + {06862e3d-b7dc-42fb-a498-cf483fd5235a} - {f5928423-1e7c-4fdb-a4d4-ce8282e4586e} + {c5a9408f-0a19-400c-a269-129ab41fea51} - {3b9ede37-08a8-41e5-b770-c602e121d367} + {f27b7199-f2fa-48be-b1a6-9bf7294ca2d9} - {62f36aaa-94ce-43ce-985d-baba339bbfd8} + {9ab4a54c-2ad7-48f7-b476-dee9bb5a27d8} diff --git a/Encodings/Encodings_vs170.vcxproj b/Encodings/Encodings_vs170.vcxproj index 4d9bd9cb9..09e052f5e 100644 --- a/Encodings/Encodings_vs170.vcxproj +++ b/Encodings/Encodings_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoEncodingsA64d PocoEncodingsmdd PocoEncodingsmtd @@ -344,13 +344,16 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\binA64\PocoEncodingsA64d.dll true true - ..\binA64\PocoEncodingsA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoEncodingsd.lib @@ -376,7 +379,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\binA64\PocoEncodingsA64.dll @@ -403,11 +409,13 @@ true true - ..\libA64\PocoEncodingsmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\libA64\PocoEncodingsmtd.lib @@ -432,7 +440,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\libA64\PocoEncodingsmt.lib @@ -451,11 +462,13 @@ true true - ..\libA64\PocoEncodingsmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\libA64\PocoEncodingsmdd.lib @@ -480,7 +493,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\libA64\PocoEncodingsmd.lib @@ -502,13 +518,16 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin\PocoEncodingsd.dll true true - ..\bin\PocoEncodingsd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoEncodingsd.lib @@ -534,7 +553,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin\PocoEncodings.dll @@ -561,11 +583,13 @@ true true - ..\lib\PocoEncodingsmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoEncodingsmtd.lib @@ -590,7 +614,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib\PocoEncodingsmt.lib @@ -609,11 +636,13 @@ true true - ..\lib\PocoEncodingsmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoEncodingsmdd.lib @@ -635,11 +664,13 @@ true true - ..\lib\PocoEncodingsmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default true + stdcpp17 + stdc11 ..\lib\PocoEncodingsmd.lib @@ -661,13 +692,16 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin64\PocoEncodings64d.dll true true - ..\bin64\PocoEncodings64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoEncodingsd.lib @@ -693,7 +727,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\bin64\PocoEncodings64.dll @@ -720,11 +757,13 @@ true true - ..\lib64\PocoEncodingsmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoEncodingsmtd.lib @@ -749,7 +788,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib64\PocoEncodingsmt.lib @@ -768,11 +810,13 @@ true true - ..\lib64\PocoEncodingsmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoEncodingsmdd.lib @@ -797,7 +841,10 @@ Level3 Default + $(OutDir)$(TargetName).pdb true + stdcpp17 + stdc11 ..\lib64\PocoEncodingsmd.lib @@ -840,99 +887,163 @@ 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 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 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Encodings/Encodings_vs170.vcxproj.filters b/Encodings/Encodings_vs170.vcxproj.filters index 7940ee84c..fda1ba6bf 100644 --- a/Encodings/Encodings_vs170.vcxproj.filters +++ b/Encodings/Encodings_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {34b2ce84-20f9-4e80-9644-59e07ccfa790} + {faa93394-b756-435b-9a06-0fed19badbbe} - {cc1dd9e6-5cf6-4352-9331-2a6066d52900} + {e0d05a7d-2c4d-4f65-85b4-4314086035bf} - {7bfef72c-94a5-4b28-ba53-ec93ca03fcf2} + {0cc01621-1367-4f74-a521-6bf563c6665a} diff --git a/Foundation/Foundation_vs170.vcxproj b/Foundation/Foundation_vs170.vcxproj index f79c42792..49ca0eb15 100644 --- a/Foundation/Foundation_vs170.vcxproj +++ b/Foundation/Foundation_vs170.vcxproj @@ -340,6 +340,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -371,6 +373,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -436,6 +440,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -472,6 +478,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -542,6 +550,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoFoundationmtd.lib @@ -567,6 +577,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoFoundationmtd.lib @@ -618,6 +630,8 @@ Default true + stdcpp17 + stdc11 ..\lib\PocoFoundationmt.lib @@ -646,6 +660,8 @@ Default true + stdcpp17 + stdc11 ..\lib64\PocoFoundationmt.lib @@ -699,6 +715,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib\PocoFoundationmdd.lib @@ -724,6 +742,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 ..\lib64\PocoFoundationmdd.lib @@ -776,6 +796,8 @@ Default true + stdcpp17 + stdc11 @@ -807,6 +829,8 @@ Default true + stdcpp17 + stdc11 @@ -2462,4 +2486,4 @@ - + \ No newline at end of file diff --git a/Foundation/Foundation_vs170.vcxproj.filters b/Foundation/Foundation_vs170.vcxproj.filters index 15652e5bd..f06337f92 100644 --- a/Foundation/Foundation_vs170.vcxproj.filters +++ b/Foundation/Foundation_vs170.vcxproj.filters @@ -921,6 +921,8 @@ RegularExpression\PCRE2 Source Files + + diff --git a/Foundation/include/Poco/Debugger.h b/Foundation/include/Poco/Debugger.h index f1de9fc38..f6c82b11b 100644 --- a/Foundation/include/Poco/Debugger.h +++ b/Foundation/include/Poco/Debugger.h @@ -19,6 +19,7 @@ #include "Poco/Foundation.h" +#include namespace Poco { @@ -61,10 +62,28 @@ public: static void enter(const char* file, int line); /// Writes a debug message to the debugger log and breaks into it. + + static constexpr std::string_view sourceFile(const std::string_view& fileName) + /// Utility function for reporting the source file name. The file path is + /// truncated and only the source file name (with extension) is returned. + /// + /// For full location reporting (including function name and line number), + /// see `poco_src_loc` macro. + { + std::size_t pos = fileName.find_last_of("/\\"); + if (pos == std::string_view::npos) pos = 0; + else if (fileName.length() > 1) ++pos; + return std::string_view(fileName.substr(pos)); + } }; } // namespace Poco +#define poco_src_loc std::string(Poco::Debugger::sourceFile(__FILE__)) \ + .append("::").append(__func__) \ + .append("():").append(std::to_string(__LINE__)) + + #endif // Foundation_Debugger_INCLUDED diff --git a/Foundation/include/Poco/Dynamic/Var.h b/Foundation/include/Poco/Dynamic/Var.h index 4b6b03b30..076b56646 100644 --- a/Foundation/include/Poco/Dynamic/Var.h +++ b/Foundation/include/Poco/Dynamic/Var.h @@ -475,6 +475,11 @@ public: const std::type_info& type() const; /// Returns the type information of the stored content. + std::string typeName(bool demangle = true) const; + /// Returns the type name of the stored content. + /// If demangling is available and emangle is true, + /// the returnsed string will be demangled. + //@ deprecated void empty(); /// Empties Var. @@ -521,23 +526,8 @@ public: /// This function returns 0 when Var is empty, 1 for POD or the size (i.e. length) /// for held container. - std::string toString() const + std::string toString() const; /// Returns the stored value as string. - { - VarHolder* pHolder = content(); - - if (!pHolder) - throw InvalidAccessException("Can not convert empty value."); - - if (typeid(std::string) == pHolder->type()) - return extract(); - else - { - std::string result; - pHolder->convert(result); - return result; - } - } static Var parse(const std::string& val); /// Parses the string which must be in JSON format @@ -617,17 +607,8 @@ private: _placeholder.assign, ValueType>(value); } - void construct(const char* value) - { - std::string val(value); - _placeholder.assign, std::string>(val); - } - - void construct(const Var& other) - { - if (!other.isEmpty()) - other.content()->clone(&_placeholder); - } + void construct(const char* value); + void construct(const Var& other); Placeholder _placeholder; }; @@ -642,6 +623,20 @@ private: /// Var members /// +inline void Var::construct(const char* value) +{ + std::string val(value); + _placeholder.assign, std::string>(val); +} + + +inline void Var::construct(const Var& other) +{ + if (!other.isEmpty()) + other.content()->clone(&_placeholder); +} + + inline void Var::swap(Var& other) { if (this == &other) return; @@ -674,6 +669,13 @@ inline const std::type_info& Var::type() const } +inline std::string Var::typeName(bool demangle) const +{ + VarHolder* pHolder = content(); + return pHolder ? demangle ? Poco::demangle(pHolder->type().name()) : pHolder->type().name() : std::string(); +} + + inline Var::ConstIterator Var::begin() const { if (size() == 0) return ConstIterator(const_cast(this), true); diff --git a/Foundation/include/Poco/Dynamic/VarHolder.h b/Foundation/include/Poco/Dynamic/VarHolder.h index 0ae246ab7..2cab44d54 100644 --- a/Foundation/include/Poco/Dynamic/VarHolder.h +++ b/Foundation/include/Poco/Dynamic/VarHolder.h @@ -33,17 +33,27 @@ #include "Poco/UTF8String.h" #include "Poco/UUID.h" #include "Poco/Any.h" +#include "Poco/Format.h" +#include "Poco/Debugger.h" #include "Poco/Exception.h" #include #include #include #include #include +#include #undef min #undef max #include +#define POCO_VAR_RANGE_EXCEPTION(str, from) \ + throw RangeException(Poco::format("%v ((%s/%d) %s > (%s/%d) %s) @ %s.", \ + std::string_view(#str), Poco::demangle(), numValDigits(from), std::to_string(from), \ + Poco::demangle(), numTypeDigits(), std::to_string(static_cast(from)), \ + poco_src_loc)) + + namespace Poco { namespace Dynamic { @@ -312,140 +322,186 @@ protected: return pVarHolder->assign, T>(val); } - template - void convertToSmaller(const F& from, T& to) const - /// This function is meant to convert signed numeric values from + template ::value && std::is_signed::value) || + std::is_floating_point::value, F>::type* = nullptr, + typename std::enable_if<(std::is_integral::value && std::is_signed::value) || + std::is_floating_point::value, T>::type* = nullptr> + static void convertToSmaller(const F& from, T& to) + /// Converts signed integral, as well as floating-point, values from /// larger to smaller type. It checks the upper and lower bound and /// if from value is within limits of type T (i.e. check calls do not throw), /// it is converted. { - poco_static_assert (std::numeric_limits::is_specialized); - poco_static_assert (std::numeric_limits::is_specialized); - poco_static_assert (std::numeric_limits::is_signed); - poco_static_assert (std::numeric_limits::is_signed); - + if constexpr((std::is_integral::value) && (std::is_floating_point::value)) + { + if (isPrecisionLost(from)) + POCO_VAR_RANGE_EXCEPTION ("Lost precision", from); + } checkUpperLimit(from); checkLowerLimit(from); - to = static_cast(from); } - template - void convertToSmallerUnsigned(const F& from, T& to) const - /// This function is meant for converting unsigned integral data types, - /// from larger to smaller type. Since lower limit is always 0 for unsigned types, - /// only the upper limit is checked, thus saving some cycles compared to the signed - /// version of the function. If the value to be converted is smaller than - /// the maximum value for the target type, the conversion is performed. + template ::value && std::is_signed::value, F>::type* = nullptr, + typename std::enable_if::value, T>::type* = nullptr> + static void convertToSmaller(const F& from, T& to) + /// Converts signed integral values from integral to floating-point type. Checks for + /// the loss of precision and if from value is within limits of type T (i.e. check calls do not throw), + /// it is converted. { - poco_static_assert (std::numeric_limits::is_specialized); - poco_static_assert (std::numeric_limits::is_specialized); - poco_static_assert (!std::numeric_limits::is_signed); - poco_static_assert (!std::numeric_limits::is_signed); + if (isPrecisionLost(from)) + POCO_VAR_RANGE_EXCEPTION ("Lost precision", from); + to = static_cast(from); + } + template ::value>::type* = nullptr, + typename std::enable_if::value, T>::type* = nullptr> + static void convertToSmaller(const F& from, T& to) + /// Converts boolean values to floating-point type. + { + to = static_cast(from); + } + + template ::value && !std::is_signed::value, F>::type* = nullptr, + typename std::enable_if<(std::is_integral::value && !std::is_signed::value) || std::is_floating_point::value, T>::type* = nullptr> + static void convertToSmallerUnsigned(const F& from, T& to) + /// Converts unsigned integral data types from larger to smaller, as well as to floating-point, types. + /// Since lower limit is always 0 for unsigned types, only the upper limit is checked, thus + /// saving some cycles compared to the signed version of the function. If the + /// value to be converted is smaller than the maximum value for the target type, + /// the conversion is performed. + { checkUpperLimit(from); to = static_cast(from); } - template - void convertSignedToUnsigned(const F& from, T& to) const - /// This function is meant for converting signed integral data types to - /// unsigned data types. Negative values can not be converted and if one - /// is encountered, RangeException is thrown. + template ::value && std::is_signed::value, F>::type* = nullptr, + typename std::enable_if::value && !std::is_signed::value, T>::type* = nullptr> + static void convertSignedToUnsigned(const F& from, T& to) + /// Converts signed integral data types to unsigned data types. + /// Negative values can not be converted and if one is encountered, RangeException is thrown. /// If upper limit is within the target data type limits, the conversion is performed. { - poco_static_assert (std::numeric_limits::is_specialized); - poco_static_assert (std::numeric_limits::is_specialized); - poco_static_assert (std::numeric_limits::is_signed); - poco_static_assert (!std::numeric_limits::is_signed); - if (from < 0) - throw RangeException("Value too small."); + POCO_VAR_RANGE_EXCEPTION ("Value too small", from); checkUpperLimit,T>(from); to = static_cast(from); } - template ::value, bool> = true> - void convertSignedFloatToUnsigned(const F& from, T& to) const - /// This function is meant for converting floating point data types to - /// unsigned integral data types. Negative values can not be converted and if one - /// is encountered, RangeException is thrown. + template ::value, bool> = true, + typename std::enable_if::value && !std::is_signed::value, T>::type* = nullptr> + static void convertSignedFloatToUnsigned(const F& from, T& to) + /// Converts floating point data types to unsigned integral data types. Negative values + /// can not be converted and if one is encountered, RangeException is thrown. /// If upper limit is within the target data type limits, the conversion is performed. { - poco_static_assert (std::numeric_limits::is_specialized); - poco_static_assert (std::numeric_limits::is_specialized); - poco_static_assert (!std::numeric_limits::is_integer); - poco_static_assert (std::numeric_limits::is_integer); - poco_static_assert (!std::numeric_limits::is_signed); - if (from < 0) - throw RangeException("Value too small."); + POCO_VAR_RANGE_EXCEPTION ("Value too small", from); checkUpperLimit(from); to = static_cast(from); } - template - void convertUnsignedToSigned(const F& from, T& to) const - /// This function is meant for converting unsigned integral data types to - /// signed integral data types. Negative values can not be converted and if one - /// is encountered, RangeException is thrown. + template ::value && !std::is_signed::value, F>::type* = nullptr, + typename std::enable_if::value && std::is_signed::value, T>::type* = nullptr> + static void convertUnsignedToSigned(const F& from, T& to) + /// Converts unsigned integral data types to signed integral data types. /// If upper limit is within the target data type limits, the conversion is performed. { - poco_static_assert (std::numeric_limits::is_specialized); - poco_static_assert (std::numeric_limits::is_specialized); - poco_static_assert (!std::numeric_limits::is_signed); - poco_static_assert (std::numeric_limits::is_signed); - checkUpperLimit(from); to = static_cast(from); } + template ::value, bool> = true, + std::enable_if_t::value, bool> = true> + static void convertToFP(F& from, T& to) + /// Converts unsigned integral data types to floating-point data types. + /// If the number of significant digits used for the integer vaue exceeds the number + /// of available digits in the floatinng-point destination (ie. if precision would be lost + /// by casting the value), RangeException is thrown. + { + if (isPrecisionLost(from)) + POCO_VAR_RANGE_EXCEPTION ("Lost precision", from); + to = static_cast(from); + } + private: - template ::value, bool> = true> - void checkUpperLimit(const F& from) const + template ::value, bool> = true> + static constexpr int numValDigits(const T& value) { - if (from > std::numeric_limits::max()) - throw RangeException("Value too large."); + using U = std::make_unsigned_t; + if (value == 0) return 0; + int digitCount = 0; + U locVal = value; // to prevent sign preservation + while (locVal >>= 1) ++digitCount; + return digitCount; + } + + template ::value, bool> = true> + static constexpr int numValDigits(T value) + { + return numValDigits(static_cast(value)); + } + + template ::value, bool> = true> + static constexpr int numTypeDigits() + { + return std::numeric_limits::digits; + } + + template ::value, bool> = true> + static constexpr int numTypeDigits() + { + return numValDigits(std::numeric_limits::max()); + } + + template ::value, bool> = true, + std::enable_if_t::value, bool> = true> + static bool isPrecisionLost(const F& from) + // Checks for loss of precision in integral -> floating point conversion. + { + return numValDigits(from) > numTypeDigits(); } template ::value, bool> = true> - void checkLowerLimit(const F& from) const + static void checkUpperLimit(const F& from) { - if (from < std::numeric_limits::min()) - throw RangeException("Value too small."); + if (from > static_cast(std::numeric_limits::max())) + POCO_VAR_RANGE_EXCEPTION ("Value too big", from); + } + + template ::value, bool> = true> + static void checkLowerLimit(const F& from) + { + if (from < static_cast(std::numeric_limits::min())) + POCO_VAR_RANGE_EXCEPTION ("Value too small", from); } template ::value, bool> = true> - void checkUpperLimit(const F& from) const + static void checkUpperLimit(const F& from) { - if (std::is_floating_point::value) - { - if (from > std::numeric_limits::max()) - throw RangeException("Value too large."); - } - else - { - // Avoid clang -Wimplicit-int-float-conversion warning with an explicit cast. - if (from > static_cast(std::numeric_limits::max())) - throw RangeException("Value too large."); - } + if ((from > static_cast(std::numeric_limits::max()))) + POCO_VAR_RANGE_EXCEPTION ("Value too big", from); } template ::value, bool> = true> - void checkLowerLimit(const F& from) const + static void checkLowerLimit(const F& from) { - if (std::is_floating_point::value) + if constexpr(std::is_floating_point::value) { - if (from < -std::numeric_limits::max()) - throw RangeException("Value too small."); - } - else - { - // Avoid clang -Wimplicit-int-float-conversion warning with an explicit cast. - if (from < static_cast(std::numeric_limits::min())) - throw RangeException("Value too small."); + if (static_cast(-std::numeric_limits::max()) > from) + POCO_VAR_RANGE_EXCEPTION ("Value too small", from); } + else if (from < static_cast(std::numeric_limits::min())) + POCO_VAR_RANGE_EXCEPTION ("Value too small", from); } }; @@ -828,12 +884,12 @@ public: void convert(float& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(double& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(char& val) const @@ -984,12 +1040,12 @@ public: void convert(float& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(double& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(char& val) const @@ -1137,12 +1193,12 @@ public: void convert(float& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(double& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(char& val) const @@ -1289,12 +1345,12 @@ public: void convert(float& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(double& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(char& val) const @@ -1456,12 +1512,12 @@ public: void convert(float& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(double& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(char& val) const @@ -1608,12 +1664,12 @@ public: void convert(float& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(double& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(char& val) const @@ -1760,12 +1816,12 @@ public: void convert(float& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(double& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(char& val) const @@ -1912,12 +1968,12 @@ public: void convert(float& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(double& val) const { - val = static_cast(_val); + convertToFP(_val, val); } void convert(char& val) const diff --git a/Foundation/include/Poco/Format.h b/Foundation/include/Poco/Format.h index d82b107be..2334b11a0 100644 --- a/Foundation/include/Poco/Format.h +++ b/Foundation/include/Poco/Format.h @@ -63,6 +63,7 @@ std::string Foundation_API format(const std::string& fmt, const Any& value); /// * E signed floating-point value in the form [-]d.ddddE[]dd[d] /// * f signed floating-point value in the form [-]dddd.dddd /// * s std::string + /// * v std::string_view /// * z std::size_t /// /// The following flags are supported: diff --git a/Foundation/include/Poco/Thread_POSIX.h b/Foundation/include/Poco/Thread_POSIX.h index f758353d7..15dfc7fdc 100644 --- a/Foundation/include/Poco/Thread_POSIX.h +++ b/Foundation/include/Poco/Thread_POSIX.h @@ -145,8 +145,8 @@ private: int policy; Event done; std::size_t stackSize; - bool started; - bool joined; + std::atomic started; + std::atomic joined; std::string name; int affinity; mutable FastMutex mutex; diff --git a/Foundation/include/Poco/Types.h b/Foundation/include/Poco/Types.h index 8aa919e3d..ed1a38622 100644 --- a/Foundation/include/Poco/Types.h +++ b/Foundation/include/Poco/Types.h @@ -21,6 +21,16 @@ #include "Poco/Foundation.h" #include #include +#if defined(__clang__) || (defined (__GNUC__) && (__GNUC__ >= 3)) +# if (__cplusplus >= 201703L) +# if __has_include() +# include +# include +# include +# define POCO_HAVE_CXXABI_H +# endif // __has_include() +# endif // __cplusplus >= 201703L +#endif // defined(__clang__) || (defined (__GNUC__) && (__GNUC__ >= 3)) namespace Poco { @@ -73,6 +83,40 @@ using UIntPtr = std::uintptr_t; #endif +inline std::string Foundation_API demangle(const char* typeName) +{ + std::string result(typeName); +#ifdef POCO_HAVE_CXXABI_H + int status; + char* demangled = abi::__cxa_demangle(typeName, nullptr, nullptr, &status); + if (demangled) + { + if (status == 0) result = demangled; + else + { + switch (status) + { + case -1: result = "[ERRMEM]"; break; + case -2: result = "[ERRNAME]"; break; + case -3: result = "[ERRARG]"; break; + default: result = "[ERRUNK]"; + } + } + + std::free(demangled); + } +#endif + return result; +} + + +template +std::string demangle() +{ + return demangle(typeid(T).name()); +} + + } // namespace Poco diff --git a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.progen b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.progen +++ b/Foundation/samples/BinaryReaderWriter/BinaryReaderWriter.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/DateTime/DateTime.progen b/Foundation/samples/DateTime/DateTime.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/DateTime/DateTime.progen +++ b/Foundation/samples/DateTime/DateTime.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/LineEndingConverter/LineEndingConverter.progen b/Foundation/samples/LineEndingConverter/LineEndingConverter.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/LineEndingConverter/LineEndingConverter.progen +++ b/Foundation/samples/LineEndingConverter/LineEndingConverter.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/LogRotation/LogRotation.progen b/Foundation/samples/LogRotation/LogRotation.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/LogRotation/LogRotation.progen +++ b/Foundation/samples/LogRotation/LogRotation.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/Logger/Logger.progen b/Foundation/samples/Logger/Logger.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/Logger/Logger.progen +++ b/Foundation/samples/Logger/Logger.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/NotificationQueue/NotificationQueue.progen b/Foundation/samples/NotificationQueue/NotificationQueue.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/NotificationQueue/NotificationQueue.progen +++ b/Foundation/samples/NotificationQueue/NotificationQueue.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/StringTokenizer/StringTokenizer.progen b/Foundation/samples/StringTokenizer/StringTokenizer.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/StringTokenizer/StringTokenizer.progen +++ b/Foundation/samples/StringTokenizer/StringTokenizer.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/Timer/Timer.progen b/Foundation/samples/Timer/Timer.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/Timer/Timer.progen +++ b/Foundation/samples/Timer/Timer.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/URI/URI.progen b/Foundation/samples/URI/URI.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/URI/URI.progen +++ b/Foundation/samples/URI/URI.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/base64decode/base64decode.progen b/Foundation/samples/base64decode/base64decode.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/base64decode/base64decode.progen +++ b/Foundation/samples/base64decode/base64decode.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/base64encode/base64encode.progen b/Foundation/samples/base64encode/base64encode.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/base64encode/base64encode.progen +++ b/Foundation/samples/base64encode/base64encode.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/deflate/deflate.progen b/Foundation/samples/deflate/deflate.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/deflate/deflate.progen +++ b/Foundation/samples/deflate/deflate.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/dir/dir.progen b/Foundation/samples/dir/dir.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/dir/dir.progen +++ b/Foundation/samples/dir/dir.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/grep/grep.progen b/Foundation/samples/grep/grep.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/grep/grep.progen +++ b/Foundation/samples/grep/grep.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/hmacmd5/hmacmd5.progen b/Foundation/samples/hmacmd5/hmacmd5.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/hmacmd5/hmacmd5.progen +++ b/Foundation/samples/hmacmd5/hmacmd5.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/inflate/inflate.progen b/Foundation/samples/inflate/inflate.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/inflate/inflate.progen +++ b/Foundation/samples/inflate/inflate.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/md5/md5.progen b/Foundation/samples/md5/md5.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/md5/md5.progen +++ b/Foundation/samples/md5/md5.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/uuidgen/uuidgen.progen b/Foundation/samples/uuidgen/uuidgen.progen index dbae00da9..518a9d34a 100644 --- a/Foundation/samples/uuidgen/uuidgen.progen +++ b/Foundation/samples/uuidgen/uuidgen.progen @@ -7,5 +7,5 @@ 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.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/src/Error.cpp b/Foundation/src/Error.cpp index f7aaae6c6..1bda8d9d3 100644 --- a/Foundation/src/Error.cpp +++ b/Foundation/src/Error.cpp @@ -62,9 +62,7 @@ namespace Poco { { _buffer[0] = 0; -#if (_XOPEN_SOURCE >= 600) || POCO_OS == POCO_OS_ANDROID || __APPLE__ - setMessage(strerror_r(err, _buffer, sizeof(_buffer))); -#elif _GNU_SOURCE +#if (_XOPEN_SOURCE >= 600) || POCO_OS == POCO_OS_ANDROID || __APPLE__ || _GNU_SOURCE setMessage(strerror_r(err, _buffer, sizeof(_buffer))); #else setMessage(strerror(err)); diff --git a/Foundation/src/Format.cpp b/Foundation/src/Format.cpp index df1f37bfe..951f7dcb9 100644 --- a/Foundation/src/Format.cpp +++ b/Foundation/src/Format.cpp @@ -20,6 +20,7 @@ #include #endif #include +#include namespace Poco { @@ -222,6 +223,9 @@ namespace case 's': str << RefAnyCast(*itVal++); break; + case 'v': + str << RefAnyCast(*itVal++); + break; case 'z': str << AnyCast(*itVal++); break; diff --git a/Foundation/src/Thread_POSIX.cpp b/Foundation/src/Thread_POSIX.cpp index 0cc89cb18..cfbe29872 100644 --- a/Foundation/src/Thread_POSIX.cpp +++ b/Foundation/src/Thread_POSIX.cpp @@ -20,6 +20,7 @@ #include "Poco/Timespan.h" #include "Poco/Timestamp.h" #include "Poco/Format.h" +#include "Poco/Error.h" #include #if POCO_OS == POCO_OS_FREE_BSD @@ -194,8 +195,10 @@ void ThreadImpl::setPriorityImpl(int prio) { struct sched_param par; par.sched_priority = mapPrio(_pData->prio, SCHED_OTHER); - if (pthread_setschedparam(_pData->thread, SCHED_OTHER, &par)) - throw SystemException("cannot set thread priority"); + int errorCode; + if ((errorCode = pthread_setschedparam(_pData->thread, SCHED_OTHER, &par))) + throw SystemException(Poco::format("cannot set thread priority (%s)", + Error::getMessage(errorCode))); } } } @@ -209,8 +212,10 @@ void ThreadImpl::setOSPriorityImpl(int prio, int policy) { struct sched_param par; par.sched_priority = prio; - if (pthread_setschedparam(_pData->thread, policy, &par)) - throw SystemException("cannot set thread priority"); + int errorCode; + if ((errorCode = pthread_setschedparam(_pData->thread, policy, &par))) + throw SystemException(Poco::format("cannot set thread priority (%s)", + Error::getMessage(errorCode))); } _pData->prio = reverseMapPrio(prio, policy); _pData->osPrio = prio; @@ -291,24 +296,29 @@ void ThreadImpl::startImpl(SharedPtr pTarget) if (_pData->stackSize != 0) { - if (0 != pthread_attr_setstacksize(&attributes, _pData->stackSize)) + int errorCode; + if ((errorCode = pthread_attr_setstacksize(&attributes, _pData->stackSize))) { pthread_attr_destroy(&attributes); - throw SystemException("cannot set thread stack size"); + throw SystemException(Poco::format("cannot set thread stack size: (%s)", + Error::getMessage(errorCode))); } } { FastMutex::ScopedLock l(_pData->mutex); _pData->pRunnableTarget = pTarget; - if (pthread_create(&_pData->thread, &attributes, runnableEntry, this)) + int errorCode; + if ((errorCode = pthread_create(&_pData->thread, &attributes, runnableEntry, this))) { _pData->pRunnableTarget = 0; pthread_attr_destroy(&attributes); - throw SystemException("cannot start thread"); + throw SystemException(Poco::format("cannot start thread (%s)", + Error::getMessage(errorCode))); } } _pData->started = true; + _pData->joined = false; pthread_attr_destroy(&attributes); if (_pData->policy == SCHED_OTHER) @@ -317,16 +327,20 @@ void ThreadImpl::startImpl(SharedPtr pTarget) { struct sched_param par; par.sched_priority = mapPrio(_pData->prio, SCHED_OTHER); - if (pthread_setschedparam(_pData->thread, SCHED_OTHER, &par)) - throw SystemException("cannot set thread priority"); + int errorCode; + if ((errorCode = pthread_setschedparam(_pData->thread, SCHED_OTHER, &par))) + throw SystemException(Poco::format("cannot set thread priority (%s)", + Error::getMessage(errorCode))); } } else { struct sched_param par; par.sched_priority = _pData->osPrio; - if (pthread_setschedparam(_pData->thread, _pData->policy, &par)) - throw SystemException("cannot set thread priority"); + int errorCode; + if ((errorCode = pthread_setschedparam(_pData->thread, _pData->policy, &par))) + throw SystemException(Poco::format("cannot set thread priority (%s)", + Error::getMessage(errorCode))); } } @@ -335,20 +349,25 @@ void ThreadImpl::joinImpl() { if (!_pData->started) return; _pData->done.wait(); - void* result; - if (pthread_join(_pData->thread, &result)) - throw SystemException("cannot join thread"); - _pData->joined = true; + if (!_pData->joined) + { + int errorCode; + if ((errorCode = pthread_join(_pData->thread, nullptr))) + throw SystemException(Poco::format("cannot join thread (%s)", + Error::getMessage(errorCode))); + _pData->joined = true; + } } bool ThreadImpl::joinImpl(long milliseconds) { - if (_pData->started && _pData->done.tryWait(milliseconds)) + if (_pData->started && _pData->done.tryWait(milliseconds) && !_pData->joined) { - void* result; - if (pthread_join(_pData->thread, &result)) - throw SystemException("cannot join thread"); + int errorCode; + if ((errorCode = pthread_join(_pData->thread, nullptr))) + throw SystemException(Poco::format("cannot join thread (%s)", + Error::getMessage(errorCode))); _pData->joined = true; return true; } diff --git a/Foundation/src/Var.cpp b/Foundation/src/Var.cpp index 3af2bcfcf..0aa7b7ecd 100644 --- a/Foundation/src/Var.cpp +++ b/Foundation/src/Var.cpp @@ -368,6 +368,24 @@ Var& Var::getAt(const std::string& name) } +std::string Var::toString() const +{ + VarHolder* pHolder = content(); + + if (!pHolder) + throw InvalidAccessException("Can not convert empty value."); + + if (typeid(std::string) == pHolder->type()) + return extract(); + else + { + std::string result; + pHolder->convert(result); + return result; + } +} + + Var Var::parse(const std::string& val) { std::string::size_type t = 0; diff --git a/Foundation/testsuite/TestApp_vs170.vcxproj b/Foundation/testsuite/TestApp_vs170.vcxproj index 6d7c1f083..7f5bd8cb0 100644 --- a/Foundation/testsuite/TestApp_vs170.vcxproj +++ b/Foundation/testsuite/TestApp_vs170.vcxproj @@ -359,6 +359,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;PocoFoundationd.lib;%(AdditionalDependencies) @@ -387,6 +389,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;PocoFoundationd.lib;%(AdditionalDependencies) @@ -414,6 +418,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;PocoFoundationd.lib;%(AdditionalDependencies) @@ -446,6 +452,8 @@ /FS true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;PocoFoundation.lib;%(AdditionalDependencies) @@ -482,6 +490,8 @@ /FS true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;PocoFoundation.lib;%(AdditionalDependencies) @@ -517,6 +527,8 @@ /FS true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;PocoFoundation.lib;%(AdditionalDependencies) @@ -552,6 +564,8 @@ /FS true + stdcpp17 + stdc11 PocoFoundationmd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -588,6 +602,8 @@ /FS true + stdcpp17 + stdc11 PocoFoundationmd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -623,6 +639,8 @@ /FS true + stdcpp17 + stdc11 PocoFoundationmd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -654,6 +672,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 PocoFoundationmdd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -682,6 +702,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 PocoFoundationmdd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -709,6 +731,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 PocoFoundationmdd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -737,6 +761,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 PocoFoundationmtd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -765,6 +791,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 PocoFoundationmtd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -792,6 +820,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 PocoFoundationmtd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -824,6 +854,8 @@ /FS true + stdcpp17 + stdc11 PocoFoundationmt.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -860,6 +892,8 @@ /FS true + stdcpp17 + stdc11 PocoFoundationmt.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -895,6 +929,8 @@ /FS true + stdcpp17 + stdc11 PocoFoundationmt.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) diff --git a/Foundation/testsuite/TestLibrary_vs170.vcxproj b/Foundation/testsuite/TestLibrary_vs170.vcxproj index 6daae65cc..c717b7139 100644 --- a/Foundation/testsuite/TestLibrary_vs170.vcxproj +++ b/Foundation/testsuite/TestLibrary_vs170.vcxproj @@ -137,6 +137,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 PocoFoundationd.lib;%(AdditionalDependencies) @@ -168,6 +170,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 PocoFoundationd.lib;%(AdditionalDependencies) @@ -198,6 +202,8 @@ ProgramDatabase /FS true + stdcpp17 + stdc11 PocoFoundationd.lib;%(AdditionalDependencies) @@ -232,6 +238,8 @@ /FS true + stdcpp17 + stdc11 PocoFoundation.lib;%(AdditionalDependencies) @@ -270,6 +278,8 @@ /FS true + stdcpp17 + stdc11 PocoFoundation.lib;%(AdditionalDependencies) @@ -307,6 +317,8 @@ /FS true + stdcpp17 + stdc11 PocoFoundation.lib;%(AdditionalDependencies) diff --git a/Foundation/testsuite/TestSuite_vs170.vcxproj b/Foundation/testsuite/TestSuite_vs170.vcxproj index dc5bfaca2..58bbfe6a9 100644 --- a/Foundation/testsuite/TestSuite_vs170.vcxproj +++ b/Foundation/testsuite/TestSuite_vs170.vcxproj @@ -352,6 +352,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -382,6 +384,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -412,6 +416,8 @@ Default true $(OutDir)$(TargetName).pdb + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -443,6 +449,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -477,6 +485,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -511,6 +521,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -541,6 +553,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -571,6 +585,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -601,6 +617,8 @@ Default true $(OutDir)$(TargetName).pdb + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -632,6 +650,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -666,6 +686,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -700,6 +722,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -730,6 +754,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -760,6 +786,8 @@ ProgramDatabase Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -790,6 +818,8 @@ Default true $(OutDir)$(TargetName).pdb + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -821,6 +851,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -855,6 +887,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -889,6 +923,8 @@ Default true + stdcpp17 + stdc11 iphlpapi.lib;%(AdditionalDependencies) @@ -1189,4 +1225,4 @@ - + \ No newline at end of file diff --git a/Foundation/testsuite/TestSuite_vs170.vcxproj.filters b/Foundation/testsuite/TestSuite_vs170.vcxproj.filters index cbcc92d96..1ab7bf822 100644 --- a/Foundation/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs170.vcxproj.filters @@ -600,6 +600,7 @@ URI\Source Files + @@ -1022,5 +1023,6 @@ URI\Header Files + \ No newline at end of file diff --git a/Foundation/testsuite/src/CoreTest.cpp b/Foundation/testsuite/src/CoreTest.cpp index 234d5071f..9755a918c 100644 --- a/Foundation/testsuite/src/CoreTest.cpp +++ b/Foundation/testsuite/src/CoreTest.cpp @@ -23,6 +23,7 @@ #include "Poco/Ascii.h" #include "Poco/BasicEvent.h" #include "Poco/Delegate.h" +#include "Poco/Debugger.h" #include "Poco/Exception.h" #include #include @@ -1118,6 +1119,13 @@ void CoreTest::testAscii() } +void CoreTest::testSrcLoc() +{ + // must be all on a single line to succeed + assertTrue(poco_src_loc == Poco::format("CoreTest.cpp::testSrcLoc():%d", __LINE__)); +} + + void CoreTest::onReadable(bool& b) { if (b) ++_notToReadable; @@ -1161,6 +1169,7 @@ CppUnit::Test* CoreTest::suite() CppUnit_addTest(pSuite, CoreTest, testAtomicCounter); CppUnit_addTest(pSuite, CoreTest, testNullable); CppUnit_addTest(pSuite, CoreTest, testAscii); + CppUnit_addTest(pSuite, CoreTest, testSrcLoc); return pSuite; } diff --git a/Foundation/testsuite/src/CoreTest.h b/Foundation/testsuite/src/CoreTest.h index 59b4fd321..2af10f31f 100644 --- a/Foundation/testsuite/src/CoreTest.h +++ b/Foundation/testsuite/src/CoreTest.h @@ -36,6 +36,7 @@ public: void testAtomicCounter(); void testNullable(); void testAscii(); + void testSrcLoc(); void setUp(); void tearDown(); diff --git a/Foundation/testsuite/src/FormatTest.cpp b/Foundation/testsuite/src/FormatTest.cpp index b852f1736..f8fd4fea0 100644 --- a/Foundation/testsuite/src/FormatTest.cpp +++ b/Foundation/testsuite/src/FormatTest.cpp @@ -14,6 +14,7 @@ #include "Poco/Any.h" #include "Poco/Format.h" #include "Poco/Exception.h" +#include using Poco::format; @@ -416,6 +417,32 @@ void FormatTest::testString() } +void FormatTest::testStringView() +{ + std::string_view foo("foo"); + std::string s(format("%v", foo)); + assertTrue (s == "foo"); + + s = format("%5v", foo); + assertTrue (s == " foo"); + + s = format("%-5v", foo); + assertTrue (s == "foo "); + + s = format("%*v", 5, foo); + assertTrue (s == " foo"); + + s = format("%-*v", 5, foo); + assertTrue (s == "foo "); + + s = format("%v%%a", foo); + assertTrue (s == "foo%a"); + + s = format("'%v%%''%v%%'", foo, foo); + assertTrue (s == "'foo%''foo%'"); +} + + void FormatTest::testMultiple() { std::string s(format("aaa%dbbb%4dccc", 1, 2)); @@ -496,6 +523,7 @@ CppUnit::Test* FormatTest::suite() CppUnit_addTest(pSuite, FormatTest, testFloatFix); CppUnit_addTest(pSuite, FormatTest, testFloatSci); CppUnit_addTest(pSuite, FormatTest, testString); + CppUnit_addTest(pSuite, FormatTest, testStringView); CppUnit_addTest(pSuite, FormatTest, testMultiple); CppUnit_addTest(pSuite, FormatTest, testIndex); CppUnit_addTest(pSuite, FormatTest, testAny); diff --git a/Foundation/testsuite/src/FormatTest.h b/Foundation/testsuite/src/FormatTest.h index 0dc326358..6b34a3492 100644 --- a/Foundation/testsuite/src/FormatTest.h +++ b/Foundation/testsuite/src/FormatTest.h @@ -28,6 +28,7 @@ public: void testFloatFix(); void testFloatSci(); void testString(); + void testStringView(); void testMultiple(); void testIndex(); void testAny(); diff --git a/Foundation/testsuite/src/ThreadTest.cpp b/Foundation/testsuite/src/ThreadTest.cpp index eefdf0c9e..9b05b9b41 100644 --- a/Foundation/testsuite/src/ThreadTest.cpp +++ b/Foundation/testsuite/src/ThreadTest.cpp @@ -17,7 +17,6 @@ #include "Poco/Event.h" #include "Poco/Timestamp.h" #include "Poco/Timespan.h" -//#include #if defined(__sun) && defined(__SVR4) && !defined(__EXTENSIONS__) #define __EXTENSIONS__ #endif diff --git a/Foundation/testsuite/src/VarTest.cpp b/Foundation/testsuite/src/VarTest.cpp index 5b48578f5..b9616f94c 100644 --- a/Foundation/testsuite/src/VarTest.cpp +++ b/Foundation/testsuite/src/VarTest.cpp @@ -54,7 +54,7 @@ public: { return i == _val; } - + friend bool operator == (const Dummy &d1, const Dummy &d2) { return d1._val == d2._val; @@ -1982,7 +1982,6 @@ void VarTest::testLimitsInt() testLimitsFloatToInt(); testLimitsFloatToInt(); - testLimitsUnsigned(); testLimitsUnsigned(); testLimitsUnsigned(); @@ -2000,14 +1999,42 @@ void VarTest::testLimitsFloat() { double iMin = -1 * std::numeric_limits::max(); Var da = iMin * 10; - try { float POCO_UNUSED f; f = da; fail("must fail"); } + try { float POCO_UNUSED f; f = da; fail("must throw", __LINE__, __FILE__); } catch (RangeException&) {} double iMax = std::numeric_limits::max(); da = iMax * 10; - try { float POCO_UNUSED f; f = da; fail("must fail"); } + try { float POCO_UNUSED f; f = da; fail("must throw", __LINE__, __FILE__); } catch (RangeException&) {} } + + int64_t i = std::numeric_limits::max(); + Var anyInt = i; + try { anyInt.convert(); fail("must throw", __LINE__, __FILE__); } + catch (RangeException&) {} + + Var anyFloat = 1.0f; + anyFloat = i; + anyFloat.convert(); + assertTrue (anyFloat.convert() == i); + + try { float POCO_UNUSED fl = anyFloat; fail("must throw", __LINE__, __FILE__); } + catch (Poco::RangeException&) {} + + i = std::numeric_limits::max(); + anyInt = i; + + float f = 0.f; + try { f = anyInt.convert(); fail("must throw", __LINE__, __FILE__); } + catch (Poco::RangeException&) {} + i = f; + assertTrue (0 == i); + + double d = 0.; + try { d = anyInt.convert(); fail("must throw", __LINE__, __FILE__); } + catch (Poco::RangeException&) {} + i = d; + assertTrue (0 == i); } @@ -3220,15 +3247,15 @@ void VarTest::testVarVisitor() processedVar = v; std::cout << " -> string "; }; - + std::vector var; - + using ulong = unsigned long; using longlong = long long; using ulonglong = unsigned long long; - + ProcessDummy processDummy(processedVar); - + bool accepted = false; accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(Poco::Int8, processInt8, -8); accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(Poco::Int16, processInt16, -16); @@ -3242,16 +3269,20 @@ void VarTest::testVarVisitor() accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(char, processChar, 'f'); accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(float, processFloat, 1.2f); accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(double, processDouble, 2.4); - accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(long, processLong, 123L); - accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(ulong, processULong, 124UL); - accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(longlong, processLongLong, 123123LL); - accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(ulonglong, processULongLong, 124124ULL); + if (typeid(long) != typeid(Poco::Int64)) + {accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(long, processLong, 123L);} + if (typeid(ulong) != typeid(Poco::UInt64)) + {accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(ulong, processULong, 124UL);} + if (typeid(longlong) != typeid(Poco::Int64)) + {accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(longlong, processLongLong, 123123LL);} + if (typeid(ulonglong) != typeid(Poco::UInt64)) + {accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(ulonglong, processULongLong, 124124ULL);} accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(std::string, processString, "hello world"); accepted = ADD_HANDLER_FOR_TYPE_WITH_VALUE(Dummy, processDummy, 42); - + for (const auto &v : var) { - std::cout << "handle type : " << v.type().name(); + std::cout << "handle type : " << v.typeName(); if (visitor.visit(v)) { if (v.type() != typeid(Dummy)) @@ -3269,7 +3300,7 @@ void VarTest::testVarVisitor() else { std::cout << " fail" << '\n'; - fail(Poco::format("failed type handle : %s", v.type().name()), __LINE__, __FILE__); + fail(Poco::format("failed type handle : %s", v.typeName()), __LINE__, __FILE__); } } } diff --git a/JSON/JSON.progen b/JSON/JSON.progen index 1502f6624..cb3ce16f5 100644 --- a/JSON/JSON.progen +++ b/JSON/JSON.progen @@ -12,6 +12,6 @@ vc.project.compiler.defines = 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} -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/JSON/JSON_vs170.vcxproj b/JSON/JSON_vs170.vcxproj index d67f34a58..0614b249b 100644 --- a/JSON/JSON_vs170.vcxproj +++ b/JSON/JSON_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoJSONA64d PocoJSONmdd PocoJSONmtd @@ -344,13 +344,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoJSONA64d.dll true true - ..\binA64\PocoJSONA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoJSONd.lib @@ -376,7 +380,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoJSONA64.dll @@ -403,11 +411,14 @@ true true - ..\libA64\PocoJSONmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoJSONmtd.lib @@ -432,7 +443,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoJSONmt.lib @@ -451,11 +466,14 @@ true true - ..\libA64\PocoJSONmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoJSONmdd.lib @@ -480,7 +498,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoJSONmd.lib @@ -502,13 +524,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoJSONd.dll true true - ..\bin\PocoJSONd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoJSONd.lib @@ -534,7 +560,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoJSON.dll @@ -561,11 +591,14 @@ true true - ..\lib\PocoJSONmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJSONmtd.lib @@ -590,7 +623,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJSONmt.lib @@ -609,11 +646,14 @@ true true - ..\lib\PocoJSONmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJSONmdd.lib @@ -635,11 +675,14 @@ true true - ..\lib\PocoJSONmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJSONmd.lib @@ -661,13 +704,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoJSON64d.dll true true - ..\bin64\PocoJSON64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoJSONd.lib @@ -693,7 +740,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoJSON64.dll @@ -720,11 +771,14 @@ true true - ..\lib64\PocoJSONmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJSONmtd.lib @@ -749,7 +803,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJSONmt.lib @@ -768,11 +826,14 @@ true true - ..\lib64\PocoJSONmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJSONmdd.lib @@ -797,7 +858,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJSONmd.lib @@ -806,24 +871,38 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true @@ -863,21 +942,33 @@ true CompileAsCpp true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/JSON/JSON_vs170.vcxproj.filters b/JSON/JSON_vs170.vcxproj.filters index bced04fdd..de3ef1a5d 100644 --- a/JSON/JSON_vs170.vcxproj.filters +++ b/JSON/JSON_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {5204146e-015c-4e94-8fbf-55edfc9060f4} + {b4ca54b7-8995-4245-84eb-fd8649736ca6} - {fbf7b979-344c-4976-ab4f-6688398648f3} + {798deb3f-247e-47f5-ac92-86dd30aaf7a7} diff --git a/JSON/samples/Benchmark/Benchmark.progen b/JSON/samples/Benchmark/Benchmark.progen index 40e486bd7..d0d81fca9 100644 --- a/JSON/samples/Benchmark/Benchmark.progen +++ b/JSON/samples/Benchmark/Benchmark.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\JSON\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/JSON/samples/Benchmark/Benchmark_vs170.vcxproj b/JSON/samples/Benchmark/Benchmark_vs170.vcxproj index d697d1c5c..9ccce3326 100644 --- a/JSON/samples/Benchmark/Benchmark_vs170.vcxproj +++ b/JSON/samples/Benchmark/Benchmark_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 Benchmark {D0381ECF-E750-32DA-8EEF-92D56B172D15} Benchmark @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 + Benchmarkd + Benchmarkd + Benchmarkd + Benchmark + Benchmark + Benchmark Benchmarkd Benchmarkd Benchmarkd @@ -171,6 +250,36 @@ Benchmark Benchmark + + binA64\ + objA64\Benchmark\$(Configuration)\ + true + + + binA64\ + objA64\Benchmark\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\Benchmark\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\Benchmark\$(Configuration)\ + false + + + binA64\static_md\ + objA64\Benchmark\$(Configuration)\ + true + + + binA64\static_md\ + objA64\Benchmark\$(Configuration)\ + false + bin\ obj\Benchmark\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\Benchmark\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\Benchmark.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\Benchmarkd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\Benchmark.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\Benchmarkd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\JSON\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\Benchmarkd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\Benchmarkd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\Benchmarkd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\Benchmarkd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\Benchmarkd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\Benchmarkd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/JSON/samples/Benchmark/Benchmark_vs170.vcxproj.filters b/JSON/samples/Benchmark/Benchmark_vs170.vcxproj.filters index 2310aaea7..9ccb2bd49 100644 --- a/JSON/samples/Benchmark/Benchmark_vs170.vcxproj.filters +++ b/JSON/samples/Benchmark/Benchmark_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {6f7db298-0e80-46c1-a320-238259af1443} + {191dbded-1d8a-4fda-a457-3fb684a4228a} - {b65539dc-0c5f-4a54-8808-463f426c06c6} + {88402007-1e0c-4845-a43b-d89fe64751fa} diff --git a/JSON/testsuite/TestSuite.progen b/JSON/testsuite/TestSuite.progen index d5a1c2f16..a9a55670a 100644 --- a/JSON/testsuite/TestSuite.progen +++ b/JSON/testsuite/TestSuite.progen @@ -7,5 +7,5 @@ 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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = iphlpapi.lib diff --git a/JSON/testsuite/TestSuite_vs170.vcxproj b/JSON/testsuite/TestSuite_vs170.vcxproj index f4a1d7cdd..737871b5c 100644 --- a/JSON/testsuite/TestSuite_vs170.vcxproj +++ b/JSON/testsuite/TestSuite_vs170.vcxproj @@ -1,4 +1,4 @@ - + @@ -81,7 +81,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -172,63 +172,63 @@ MultiByte v143 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + <_ProjectFileVersion>17.0.32505.173 TestSuited @@ -352,11 +352,13 @@ true true true - + Level3 ProgramDatabase Default true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -384,11 +386,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -413,11 +417,13 @@ true true true - + Level3 ProgramDatabase Default true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -445,11 +451,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -474,11 +482,13 @@ true true true - + Level3 ProgramDatabase Default true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -506,11 +516,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -535,11 +547,13 @@ true true true - + Level3 ProgramDatabase Default true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -567,11 +581,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -596,11 +612,13 @@ true true true - + Level3 ProgramDatabase Default true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -628,11 +646,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -657,11 +677,13 @@ true true true - + Level3 ProgramDatabase Default true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -689,11 +711,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -718,11 +742,13 @@ true true true - + Level3 ProgramDatabase Default true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -750,11 +776,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -779,11 +807,13 @@ true true true - + Level3 ProgramDatabase Default true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -811,11 +841,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -840,11 +872,13 @@ true true true - + Level3 ProgramDatabase Default true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -872,11 +906,13 @@ true true true - + Level3 - + Default true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -901,9 +937,9 @@ - - + + - - - + + + \ No newline at end of file diff --git a/JWT/JWT.progen b/JWT/JWT.progen index c8b7f83f2..70f081e9e 100644 --- a/JWT/JWT.progen +++ b/JWT/JWT.progen @@ -11,6 +11,6 @@ vc.project.compiler.include = ..\\Foundation\\include;..\\JSON\\include;..\\Cryp 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} -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/JWT/JWT_vs170.vcxproj b/JWT/JWT_vs170.vcxproj index a2c242396..9410efe71 100644 --- a/JWT/JWT_vs170.vcxproj +++ b/JWT/JWT_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoJWTA64d PocoJWTmdd PocoJWTmtd @@ -344,13 +344,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoJWTA64d.dll true true - ..\binA64\PocoJWTA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoJWTd.lib @@ -376,7 +380,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoJWTA64.dll @@ -403,11 +411,14 @@ true true - ..\libA64\PocoJWTmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoJWTmtd.lib @@ -432,7 +443,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoJWTmt.lib @@ -451,11 +466,14 @@ true true - ..\libA64\PocoJWTmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoJWTmdd.lib @@ -480,7 +498,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoJWTmd.lib @@ -502,13 +524,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoJWTd.dll true true - ..\bin\PocoJWTd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoJWTd.lib @@ -534,7 +560,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoJWT.dll @@ -561,11 +591,14 @@ true true - ..\lib\PocoJWTmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJWTmtd.lib @@ -590,7 +623,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJWTmt.lib @@ -609,11 +646,14 @@ true true - ..\lib\PocoJWTmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJWTmdd.lib @@ -635,11 +675,14 @@ true true - ..\lib\PocoJWTmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoJWTmd.lib @@ -661,13 +704,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoJWT64d.dll true true - ..\bin64\PocoJWT64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoJWTd.lib @@ -693,7 +740,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoJWT64.dll @@ -720,11 +771,14 @@ true true - ..\lib64\PocoJWTmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJWTmtd.lib @@ -749,7 +803,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJWTmt.lib @@ -768,11 +826,14 @@ true true - ..\lib64\PocoJWTmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJWTmdd.lib @@ -797,7 +858,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoJWTmd.lib @@ -806,15 +871,23 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/JWT/JWT_vs170.vcxproj.filters b/JWT/JWT_vs170.vcxproj.filters index b26ec425b..2d5bd5d83 100644 --- a/JWT/JWT_vs170.vcxproj.filters +++ b/JWT/JWT_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {4a51ca29-2dc4-43fa-982e-58ad0c815e39} + {99ea761a-eb19-49af-aa37-f0c29265845c} - {6ea463a4-b16e-40ce-bf96-dca2d13bccef} + {98e7b8ac-808a-458d-83af-ad5de88c01d2} diff --git a/JWT/testsuite/TestSuite.progen b/JWT/testsuite/TestSuite.progen index 9f509e17a..72c40da85 100644 --- a/JWT/testsuite/TestSuite.progen +++ b/JWT/testsuite/TestSuite.progen @@ -7,7 +7,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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\JSON\\include;..\\..\\Crypto\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/MongoDB/MongoDB.progen b/MongoDB/MongoDB.progen index 3eca02b91..67595ba84 100644 --- a/MongoDB/MongoDB.progen +++ b/MongoDB/MongoDB.progen @@ -12,6 +12,6 @@ vc.project.compiler.defines = 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} -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/MongoDB/MongoDB_vs170.vcxproj b/MongoDB/MongoDB_vs170.vcxproj index 95412050a..fe51a2e9c 100644 --- a/MongoDB/MongoDB_vs170.vcxproj +++ b/MongoDB/MongoDB_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoMongoDBA64d PocoMongoDBmdd PocoMongoDBmtd @@ -344,13 +344,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoMongoDBA64d.dll true true - ..\binA64\PocoMongoDBA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoMongoDBd.lib @@ -376,7 +380,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoMongoDBA64.dll @@ -403,11 +411,14 @@ true true - ..\libA64\PocoMongoDBmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoMongoDBmtd.lib @@ -432,7 +443,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoMongoDBmt.lib @@ -451,11 +466,14 @@ true true - ..\libA64\PocoMongoDBmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoMongoDBmdd.lib @@ -480,7 +498,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoMongoDBmd.lib @@ -502,13 +524,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoMongoDBd.dll true true - ..\bin\PocoMongoDBd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoMongoDBd.lib @@ -534,7 +560,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoMongoDB.dll @@ -561,11 +591,14 @@ true true - ..\lib\PocoMongoDBmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoMongoDBmtd.lib @@ -590,7 +623,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoMongoDBmt.lib @@ -609,11 +646,14 @@ true true - ..\lib\PocoMongoDBmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoMongoDBmdd.lib @@ -635,11 +675,14 @@ true true - ..\lib\PocoMongoDBmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoMongoDBmd.lib @@ -661,13 +704,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoMongoDB64d.dll true true - ..\bin64\PocoMongoDB64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoMongoDBd.lib @@ -693,7 +740,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoMongoDB64.dll @@ -720,11 +771,14 @@ true true - ..\lib64\PocoMongoDBmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoMongoDBmtd.lib @@ -749,7 +803,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoMongoDBmt.lib @@ -768,11 +826,14 @@ true true - ..\lib64\PocoMongoDBmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoMongoDBmdd.lib @@ -797,7 +858,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoMongoDBmd.lib @@ -806,72 +871,118 @@ 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 - - - true - - - true - - - true - - - true - - - true - - - true - - - 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 @@ -900,8 +1011,6 @@ - - diff --git a/MongoDB/MongoDB_vs170.vcxproj.filters b/MongoDB/MongoDB_vs170.vcxproj.filters index d2898ee15..f615f265d 100644 --- a/MongoDB/MongoDB_vs170.vcxproj.filters +++ b/MongoDB/MongoDB_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {85c3834d-f3a8-4c90-91db-82fe489a020a} + {f5a4eaef-7b91-4fcd-a0cc-abf16751ee24} - {69e469f1-0a40-4a54-9c10-328b2e7c0574} + {e77da2cc-d3b2-48dc-b148-9b2de0c25acc} @@ -54,6 +54,12 @@ Source Files + + Source Files + + + Source Files + Source Files diff --git a/MongoDB/MongoDB_vs90.vcproj b/MongoDB/MongoDB_vs90.vcproj index 851c3f300..4cc1f4631 100644 --- a/MongoDB/MongoDB_vs90.vcproj +++ b/MongoDB/MongoDB_vs90.vcproj @@ -556,6 +556,14 @@ RelativePath=".\src\ObjectId.cpp" > + + + + diff --git a/MongoDB/samples/SQLToMongo/SQLToMongo.progen b/MongoDB/samples/SQLToMongo/SQLToMongo.progen index 1543dabdb..602fdc35e 100644 --- a/MongoDB/samples/SQLToMongo/SQLToMongo.progen +++ b/MongoDB/samples/SQLToMongo/SQLToMongo.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\Net\\include;..\\..\\..\\MongoDB\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/MongoDB/testsuite/TestSuite.progen b/MongoDB/testsuite/TestSuite.progen index c1bc49fed..fb74be89f 100644 --- a/MongoDB/testsuite/TestSuite.progen +++ b/MongoDB/testsuite/TestSuite.progen @@ -7,5 +7,5 @@ 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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/NEWS b/NEWS deleted file mode 100644 index 359b017e2..000000000 --- a/NEWS +++ /dev/null @@ -1,2 +0,0 @@ -As of release 1.4 this file is no longer maintained. -Please see the CHANGELOG for what's new in each release. diff --git a/Net/Net.progen b/Net/Net.progen index 1c5bbcbb9..50812acf6 100644 --- a/Net/Net.progen +++ b/Net/Net.progen @@ -12,7 +12,7 @@ vc.project.compiler.defines = 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} -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Net/Net_vs170.vcxproj b/Net/Net_vs170.vcxproj index 4be3ef120..331f5f6ef 100644 --- a/Net/Net_vs170.vcxproj +++ b/Net/Net_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34322.80 PocoNetA64d PocoNetmdd PocoNetmtd @@ -345,8 +345,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -380,8 +382,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -413,8 +417,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetmtd.lib @@ -440,8 +446,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetmt.lib @@ -464,8 +472,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetmdd.lib @@ -491,8 +501,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetmd.lib @@ -515,8 +527,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -550,8 +564,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -583,8 +599,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetmtd.lib @@ -610,8 +628,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetmt.lib @@ -634,8 +654,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetmdd.lib @@ -661,8 +683,10 @@ Level3 Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -686,8 +710,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -721,8 +747,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -754,8 +782,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetmtd.lib @@ -781,8 +811,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetmt.lib @@ -805,8 +837,10 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetmdd.lib @@ -832,8 +866,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetmd.lib @@ -962,324 +998,538 @@ 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 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 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 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 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 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 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 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Net/Net_vs170.vcxproj.filters b/Net/Net_vs170.vcxproj.filters index 8ba36682f..389f958ab 100644 --- a/Net/Net_vs170.vcxproj.filters +++ b/Net/Net_vs170.vcxproj.filters @@ -2,166 +2,166 @@ - {90277211-36fe-44fa-8779-bee1b27c0b33} + {807ff714-e183-4df3-9bcf-999f06de4b55} - {dde6886a-711b-4b19-8ede-16e0946b3dd3} + {3abff93d-1752-42d9-be72-717f4d2eafd3} - {225e8c7b-6770-4930-a8a6-de55b4e51c6f} + {2a34e5e5-8e51-4df1-bc1d-72bef47656bd} - {89f0837c-8470-476c-872e-2feb780c3755} + {39703b0c-6789-4197-9dfc-1b3ec95767d8} - {2adaae0b-b111-47fc-8613-a8eda7c657b8} + {e20271eb-bfc6-4aa3-b84d-e0a892da51ea} - {6b763933-275b-43db-8351-c759be910124} + {85f5b169-a46f-4033-9ede-7f21f7f41844} - {c8823488-ff33-4000-bc95-a32a4962bc5f} + {bb5e4b31-e1e6-4463-96fb-40dad19d890d} - {66abd578-d1d6-4f71-b3b6-6442be8027ea} + {5561f49c-32c1-4977-b73e-72acc18967c6} - {04a41c32-4f81-4630-8251-aebaac657dde} + {ce1eda6c-182d-42c3-bc6e-f0e5a57bd910} - {a1b32860-4beb-44c8-be19-9ce8f80a8628} + {2a3cf08f-277c-44f4-b281-53a222589521} - {f3e1e652-16e3-4251-953d-dfbe62ea3982} + {f46011ae-51b0-4c75-94f2-75ce38a9c1f8} - {eb9d676b-c46b-4256-a316-d50aa6d696db} + {8e09bf51-43af-4927-a1f8-35fde03e31f9} - {be5fbb21-ee3d-4a3b-824d-a93663d3b5b5} + {a2585b09-952a-4846-85dc-7cef5d8e6316} - {4bf59802-369d-44b5-b5e2-27de877443b7} + {ed0e694d-c54a-43db-86b1-b9cff1bca9e7} - {2d040338-7189-4832-885f-c35df5e0261e} + {e0388610-bb32-4a05-9608-201c166cbd7a} - {65ff22c9-dc2e-4dd6-806f-112e50a728a3} + {3422fb59-7aaa-4418-bbd9-e02b6b0a89bf} - {171a9cfa-0f74-4258-b1cb-e8bc2f542719} + {96093a57-1ffc-45b3-97c7-54117dadf3a8} - {700a3455-e21e-4b83-bbde-3bbf58da3ac2} + {42bcafa5-fa8b-43bb-83b2-b78856633103} - {491c59ae-0899-40d7-88e8-27b4b3bd341c} + {b6744e60-638e-49f2-82fd-a9c787d5fcb2} - {e318a0ee-2d73-454f-a372-1cb32986fcbf} + {0110954e-bf64-49bb-8ff3-3912f8a94ab0} - {7bbbe1fd-5699-4d47-aeea-5c4ae76e0ed1} + {3326cd87-4134-405b-bc9b-560b18ef8c3d} - {e1c20e0e-cf9d-4388-ae15-747c642452ee} + {c32b81d5-baff-45f9-aee4-3ce46a8491f2} - {e7c37000-31b5-4d4d-8b8e-ebb4b91e22aa} + {9aa25ee3-479c-4bbb-8211-973459fa25e7} - {303f1252-d50c-45f5-ad39-9538d48e7da8} + {6cf2a4e9-ae34-432d-9472-50d6f34fa139} - {64d4ca86-bc0e-47cd-93cb-1688b08c7dbc} + {976530a3-79ab-46b9-877f-27c280f88bf5} - {ac6da4d0-ff1d-4845-8655-c1d7bb8af706} + {85a66838-8212-4638-b218-788b24cf6214} - {59dfc623-2f30-4dee-9e7f-b9ea32311877} + {62b5a7ad-f566-4507-bcc2-65f553ac3bc2} - {e35f97d2-6c4e-4101-b8d9-2d40a6e1f8d6} + {69a92687-4570-4f08-a82c-3e201cbc0df6} - {d4f6b235-3727-43b1-a45c-97634a88bcb5} + {cf137793-887b-498a-a839-249fe20fa659} - {729c6f41-45c3-445c-9eaf-adc6fa2ab957} + {058d16f3-1c77-40f5-bed0-6ee39f6d69fc} - {1c1aa126-7035-4c6c-b4a6-6db4bb9ba7b8} + {07113e92-8e9d-4fd9-be0e-c8d1ee90b205} - {697d988f-e82e-4b9a-a763-4e20e959246e} + {a971c52d-e993-4a15-b467-0e24c9654d0a} - {5f209277-2d19-4d78-b6f6-eb69ff9d169a} + {60591c89-e2f9-4a9d-8680-2bbe7f8166c5} - {97dc13ec-7fd0-4bd0-88d7-d3f4e8b5aaf0} + {fbd4ef96-6fb6-4922-b3a6-6da9bc59fce2} - {82036806-9daf-40ea-97a9-7fa9d48d2c76} + {e3c6e815-447f-44ab-bbfc-5971bb96ff53} - {d44c2015-66b4-41bb-bab8-ce94e0642356} + {b7970e66-2cc1-4f85-bcbe-1056f64510c4} - {67442bc4-3f65-4814-8a73-98a91d70f29d} + {ec1ca999-4ce9-42e1-9462-1a85fe6d3d62} - {bd80dc76-0f7c-4c57-b1d6-1211abc0b0f1} + {c1905a95-4aaf-4a68-9951-d270e7c853fe} - {6a5f03bb-b749-40b5-86a2-8662f0ff7dfe} + {b06f281f-d37d-48c4-809a-cfd5475c3b2c} - {f535b5d2-7a50-45aa-8ce1-d427d3a7e54c} + {2fd44bbc-34d8-445a-8f31-5aec62d27fd2} - {575be2dd-dcee-4599-a534-e51c4cbab323} + {8bf4c3b6-de70-4762-b1ae-dcd299834636} - {60d2fad0-8bae-4b91-a14c-f9b782c0d8ba} + {d851eca3-7aca-47a1-a082-558984aef491} - {26842ddd-3b15-47f6-a5a0-b4044213e4b5} + {9a6adb10-3c83-4c3e-a78c-bc842c3e728c} - {db4b2298-756d-4f33-8047-e122cbf5ee67} + {96b53209-6c12-41fd-ae10-744a156a0f41} - {4f92c211-e6a2-401d-b04e-887f42165a06} + {e14d9455-731e-4228-84e8-6e421e57e5df} - {66d9c5ee-26b0-43d1-9a58-e257d9a76b59} + {bc05e2c6-07dd-46e4-911f-a83044012e0e} - {c0fc6593-fd16-4366-a83a-cae87e1fae2f} + {ab9b6b24-5d69-41bf-ae73-0d081605207b} - {08828b81-6913-4920-9f47-369439c27b3a} + {eab59ba2-b014-4aa7-aa87-69e7223c221e} - {1ba12463-f782-4a94-9113-acfe835a2b8a} + {4146679a-e4af-4d07-a76c-766c3d9b79f0} - {692613dc-6b1e-4ffb-9c28-47282f9b119f} + {f185f3d3-c3bf-4745-9d51-fd14041bcc0e} - {2df8e415-77bd-41b2-b770-ec4bfaee9e00} + {d5a327e3-3145-436a-895a-ad2cc062dbf2} - {ccae9a0d-6819-45e0-af22-a5b2ff8b429b} + {c6720f96-b33d-4936-872f-5a2576ea95c5} - {7f1a06da-5317-4803-9f4c-a13acd1e3959} + {aec6cc22-5394-4555-8474-b3f0c3b26e7f} - {d1384c8b-86bb-4d26-a6cf-06b490284056} + {7c3b8656-5cb5-4355-b2fc-936bc3c3114c} diff --git a/Net/samples/EchoServer/EchoServer.progen b/Net/samples/EchoServer/EchoServer.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/EchoServer/EchoServer.progen +++ b/Net/samples/EchoServer/EchoServer.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/HTTPFormServer/HTTPFormServer.progen b/Net/samples/HTTPFormServer/HTTPFormServer.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/HTTPFormServer/HTTPFormServer.progen +++ b/Net/samples/HTTPFormServer/HTTPFormServer.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest.progen b/Net/samples/HTTPLoadTest/HTTPLoadTest.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest.progen +++ b/Net/samples/HTTPLoadTest/HTTPLoadTest.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer.progen b/Net/samples/HTTPTimeServer/HTTPTimeServer.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer.progen +++ b/Net/samples/HTTPTimeServer/HTTPTimeServer.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/Mail/Mail.progen b/Net/samples/Mail/Mail.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/Mail/Mail.progen +++ b/Net/samples/Mail/Mail.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/Ping/Ping.progen b/Net/samples/Ping/Ping.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/Ping/Ping.progen +++ b/Net/samples/Ping/Ping.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/SMTPLogger/SMTPLogger.progen b/Net/samples/SMTPLogger/SMTPLogger.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/SMTPLogger/SMTPLogger.progen +++ b/Net/samples/SMTPLogger/SMTPLogger.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/TimeServer/TimeServer.progen b/Net/samples/TimeServer/TimeServer.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/TimeServer/TimeServer.progen +++ b/Net/samples/TimeServer/TimeServer.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/WebSocketServer/WebSocketServer.progen b/Net/samples/WebSocketServer/WebSocketServer.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/WebSocketServer/WebSocketServer.progen +++ b/Net/samples/WebSocketServer/WebSocketServer.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/dict/dict.progen b/Net/samples/dict/dict.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/dict/dict.progen +++ b/Net/samples/dict/dict.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/download/download.progen b/Net/samples/download/download.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/download/download.progen +++ b/Net/samples/download/download.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/httpget/httpget.progen b/Net/samples/httpget/httpget.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/httpget/httpget.progen +++ b/Net/samples/httpget/httpget.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/ifconfig/ifconfig.progen b/Net/samples/ifconfig/ifconfig.progen index ede2c7832..c610dc055 100644 --- a/Net/samples/ifconfig/ifconfig.progen +++ b/Net/samples/ifconfig/ifconfig.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/samples/tcpserver/tcpserver.progen b/Net/samples/tcpserver/tcpserver.progen index 70c16504a..9ffca51c2 100644 --- a/Net/samples/tcpserver/tcpserver.progen +++ b/Net/samples/tcpserver/tcpserver.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Net/testsuite/TestSuite.progen b/Net/testsuite/TestSuite.progen index 205fabcee..f65485977 100644 --- a/Net/testsuite/TestSuite.progen +++ b/Net/testsuite/TestSuite.progen @@ -7,6 +7,6 @@ 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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = iphlpapi.lib vc.project.linker.dependencies.Win32 = ws2_32.lib diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL.progen b/NetSSL_OpenSSL/NetSSL_OpenSSL.progen index 6e03a7bc7..507316953 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL.progen +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL.progen @@ -12,7 +12,7 @@ vc.project.compiler.defines = vc.project.compiler.defines.shared = NetSSL_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 /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj index a4745f63e..2b1ea8c42 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoNetSSLA64d PocoNetSSLmdd PocoNetSSLmtd @@ -344,14 +344,18 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\binA64\PocoNetSSLA64d.dll true true - ..\binA64\PocoNetSSLA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoNetSSLd.lib @@ -377,7 +381,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -405,11 +413,14 @@ true true - ..\libA64\PocoNetSSLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetSSLmtd.lib @@ -434,7 +445,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetSSLmt.lib @@ -453,11 +468,14 @@ true true - ..\libA64\PocoNetSSLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetSSLmdd.lib @@ -482,7 +500,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetSSLmd.lib @@ -504,14 +526,18 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoNetSSLd.dll true true - ..\bin\PocoNetSSLd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoNetSSLd.lib @@ -537,7 +563,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -565,11 +595,14 @@ true true - ..\lib\PocoNetSSLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLmtd.lib @@ -594,7 +627,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLmt.lib @@ -613,11 +650,14 @@ true true - ..\lib\PocoNetSSLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLmdd.lib @@ -639,11 +679,14 @@ true true - ..\lib\PocoNetSSLmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -666,14 +709,18 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoNetSSL64d.dll true true - ..\bin64\PocoNetSSL64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoNetSSLd.lib @@ -699,7 +746,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -727,11 +778,14 @@ true true - ..\lib64\PocoNetSSLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLmtd.lib @@ -756,7 +810,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLmt.lib @@ -775,11 +833,14 @@ true true - ..\lib64\PocoNetSSLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLmdd.lib @@ -804,7 +865,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLmd.lib @@ -845,90 +910,148 @@ 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 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/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters index b7a16784a..06fafc903 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters @@ -2,49 +2,49 @@ - {5596c631-64ae-43f4-8414-e91e2ec4a377} + {73c9f951-b8c8-48ff-8692-75b8265a7b5f} - {435160f7-9d7c-4dcc-81b8-f7bd892ab884} + {a9b8a66c-dcf3-4818-82d3-3ffeacf236bd} - {35d27af2-9a0f-4549-9610-dc6c5c82735e} + {aa25e56e-e2ee-463a-9254-6f72d98055b7} - {4919ad01-859f-40e9-b151-de7ed20cfcb2} + {9aa19c54-dabd-40c8-824f-fb5960969e06} - {b1b92b8d-b564-4895-9df8-bbe67f097ce1} + {339923e3-8ad1-4507-86d5-14fa991a4022} - {358fe3e3-9caa-43c5-aad5-2cd51b385536} + {5fe53210-ac84-4ce4-8207-60f7fe03ee7d} - {34230bdb-d490-40ad-89ff-489a7744e82c} + {3bcd1b3f-9444-4fe2-b0c7-d7ba98084118} - {d6f4bdbf-cc94-43b2-b3e3-2d8972be20f9} + {fb203413-9bd3-4666-9e6b-17bc254946be} - {22977f45-4f7e-4339-aaf7-337622e09fb8} + {e44aced8-c356-4072-af09-27319a2201b0} - {d444b4ff-caba-4e95-b924-0599440d01a6} + {0531bd60-2aa6-40b8-9501-8c63c6d62097} - {f2ecedfb-d611-4e9a-9a4a-31021ee5c530} + {9b1c9a40-a812-4155-b623-f05ba269c986} - {af457eb3-6532-45ce-8df5-42145d636a5d} + {03349be0-1387-4a00-9d7f-b5946c882909} - {ecdea47e-3c87-48bf-984f-c320514b5e5b} + {dd130327-f2c2-431e-bb0a-d1d36bf021fe} - {1c3fa9bc-d21f-4b10-82bb-8e68f3524917} + {41fc35d3-b992-4451-a927-4b4f71c34923} - {b25ab851-6c5e-4dc7-859e-b65d6f47e1f2} + {5d30681e-7d75-4766-8f7c-4143ebdb1320} diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen index b7b3a1b28..6c28cacf4 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen @@ -7,7 +7,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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/NetSSL_OpenSSL/samples/Mail/Mail.progen b/NetSSL_OpenSSL/samples/Mail/Mail.progen index b7b3a1b28..6c28cacf4 100644 --- a/NetSSL_OpenSSL/samples/Mail/Mail.progen +++ b/NetSSL_OpenSSL/samples/Mail/Mail.progen @@ -7,7 +7,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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen index b7b3a1b28..6c28cacf4 100644 --- a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen +++ b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen @@ -7,7 +7,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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen index 8a5572545..aab070e1a 100644 --- a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen +++ b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen @@ -7,7 +7,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;..\\..\\..\\XML\\include;..\\..\\..\\JSON\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/NetSSL_OpenSSL/samples/download/download.progen b/NetSSL_OpenSSL/samples/download/download.progen index b7b3a1b28..6c28cacf4 100644 --- a/NetSSL_OpenSSL/samples/download/download.progen +++ b/NetSSL_OpenSSL/samples/download/download.progen @@ -7,7 +7,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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/NetSSL_OpenSSL/testsuite/TestSuite.progen b/NetSSL_OpenSSL/testsuite/TestSuite.progen index adcae7daa..61b90bc37 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite.progen +++ b/NetSSL_OpenSSL/testsuite/TestSuite.progen @@ -7,7 +7,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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\Util\\include;..\\..\\Net\\include;..\\..\\Crypto\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/NetSSL_Win/NetSSL_Win.progen b/NetSSL_Win/NetSSL_Win.progen index 10824e6a8..4e149bcb0 100644 --- a/NetSSL_Win/NetSSL_Win.progen +++ b/NetSSL_Win/NetSSL_Win.progen @@ -12,7 +12,7 @@ vc.project.compiler.defines = 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} -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib Crypt32.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/NetSSL_Win/NetSSL_Win_vs170.vcxproj b/NetSSL_Win/NetSSL_Win_vs170.vcxproj index 528f67752..d6b9be682 100644 --- a/NetSSL_Win/NetSSL_Win_vs170.vcxproj +++ b/NetSSL_Win/NetSSL_Win_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoNetSSLWinA64d PocoNetSSLWinmdd PocoNetSSLWinmtd @@ -344,14 +344,18 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) ..\binA64\PocoNetSSLWinA64d.dll true true - ..\binA64\PocoNetSSLWinA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoNetSSLWind.lib @@ -377,7 +381,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -405,11 +413,14 @@ true true - ..\libA64\PocoNetSSLWinmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetSSLWinmtd.lib @@ -434,7 +445,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetSSLWinmt.lib @@ -453,11 +468,14 @@ true true - ..\libA64\PocoNetSSLWinmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetSSLWinmdd.lib @@ -482,7 +500,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoNetSSLWinmd.lib @@ -504,14 +526,18 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) ..\bin\PocoNetSSLWind.dll true true - ..\bin\PocoNetSSLWind.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoNetSSLWind.lib @@ -537,7 +563,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -565,11 +595,14 @@ true true - ..\lib\PocoNetSSLWinmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLWinmtd.lib @@ -594,7 +627,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLWinmt.lib @@ -613,11 +650,14 @@ true true - ..\lib\PocoNetSSLWinmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoNetSSLWinmdd.lib @@ -639,11 +679,14 @@ true true - ..\lib\PocoNetSSLWinmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -666,14 +709,18 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) ..\bin64\PocoNetSSLWin64d.dll true true - ..\bin64\PocoNetSSLWin64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoNetSSLWind.lib @@ -699,7 +746,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -727,11 +778,14 @@ true true - ..\lib64\PocoNetSSLWinmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLWinmtd.lib @@ -756,7 +810,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLWinmt.lib @@ -775,11 +833,14 @@ true true - ..\lib64\PocoNetSSLWinmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLWinmdd.lib @@ -804,7 +865,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoNetSSLWinmd.lib @@ -844,84 +909,138 @@ 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 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/NetSSL_Win/NetSSL_Win_vs170.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs170.vcxproj.filters index 69f2734f2..cdb8e5eec 100644 --- a/NetSSL_Win/NetSSL_Win_vs170.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs170.vcxproj.filters @@ -2,40 +2,40 @@ - {8e2c6f4c-e36b-4525-833d-da583154fae6} + {529e4d63-2f77-4e5c-a2e5-34110a9c3dac} - {15b42d88-0b08-4bbe-aaf4-811c980cbf40} + {7aae5bb7-e02e-4b5a-a1d7-18defbb43ba6} - {8dbbbc70-e285-4d63-b23e-f66589fee2ae} + {8b3810a5-f377-4c88-86ce-91955a65c818} - {6d889d29-ead4-441c-bae5-bcab55774e50} + {42aba42b-89c4-486d-bbcc-3362d6695961} - {fa7dfc04-8c45-40fd-9ffd-103c392df211} + {24caee21-d17b-44d7-a41c-cf4c70a2b38e} - {0148faac-745f-46a3-93ef-d9077921b25b} + {0e421c8b-7fab-4427-ae5a-4fc06d5a00f7} - {3e0b562a-c18a-490e-be9b-24baef437558} + {4bf3cd72-825a-47ae-b749-34dc49f8bbf3} - {e3e960ed-29e0-4e60-a835-7a0143176c93} + {8add9720-7056-4d14-9003-e3419eb6338f} - {ddd37bb6-19fe-4b19-abd5-7b13b91735e9} + {5e798d4b-82a7-48ca-b1d2-2c2c4240add3} - {f4b31afb-c7f0-4479-91ba-3c7f7ba188c3} + {e4074053-eb34-4fc6-83ff-9fa850c71c01} - {d0a99012-8762-4749-9d80-49e85bfd08ca} + {24551290-9f10-4f62-8738-7d9f6b785866} - {a22c5080-e673-4373-a48c-51405ebce579} + {cfda1168-eeb5-41ca-81f4-7a3217b74129} diff --git a/NetSSL_Win/samples/HTTPSTimeServer/HTTPSTimeServer.progen b/NetSSL_Win/samples/HTTPSTimeServer/HTTPSTimeServer.progen index c63b31f35..9225aa0c3 100644 --- a/NetSSL_Win/samples/HTTPSTimeServer/HTTPSTimeServer.progen +++ b/NetSSL_Win/samples/HTTPSTimeServer/HTTPSTimeServer.progen @@ -7,7 +7,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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_Win\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/NetSSL_Win/samples/Mail/Mail.progen b/NetSSL_Win/samples/Mail/Mail.progen index c63b31f35..9225aa0c3 100644 --- a/NetSSL_Win/samples/Mail/Mail.progen +++ b/NetSSL_Win/samples/Mail/Mail.progen @@ -7,7 +7,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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_Win\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/NetSSL_Win/samples/download/download.progen b/NetSSL_Win/samples/download/download.progen index c63b31f35..9225aa0c3 100644 --- a/NetSSL_Win/samples/download/download.progen +++ b/NetSSL_Win/samples/download/download.progen @@ -7,7 +7,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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_Win\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/NetSSL_Win/testsuite/TestSuite.progen b/NetSSL_Win/testsuite/TestSuite.progen index 6be09147b..f22128754 100644 --- a/NetSSL_Win/testsuite/TestSuite.progen +++ b/NetSSL_Win/testsuite/TestSuite.progen @@ -7,7 +7,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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\Util\\include;..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/PDF/PDF.progen b/PDF/PDF.progen index f187804ea..12898d52a 100644 --- a/PDF/PDF.progen +++ b/PDF/PDF.progen @@ -12,6 +12,6 @@ vc.project.compiler.defines = vc.project.compiler.defines.shared = _CRT_SECURE_NO_WARNINGS;${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} -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/PDF/PDF_vs170.vcxproj b/PDF/PDF_vs170.vcxproj index 2152f12af..b413aaff7 100644 --- a/PDF/PDF_vs170.vcxproj +++ b/PDF/PDF_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoPDFA64d PocoPDFmdd PocoPDFmtd @@ -344,13 +344,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoPDFA64d.dll true true - ..\binA64\PocoPDFA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoPDFd.lib @@ -376,7 +380,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoPDFA64.dll @@ -403,11 +411,14 @@ true true - ..\libA64\PocoPDFmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoPDFmtd.lib @@ -432,7 +443,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoPDFmt.lib @@ -451,11 +466,14 @@ true true - ..\libA64\PocoPDFmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoPDFmdd.lib @@ -480,7 +498,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoPDFmd.lib @@ -502,13 +524,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoPDFd.dll true true - ..\bin\PocoPDFd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoPDFd.lib @@ -534,7 +560,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoPDF.dll @@ -561,11 +591,14 @@ true true - ..\lib\PocoPDFmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPDFmtd.lib @@ -590,7 +623,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPDFmt.lib @@ -609,11 +646,14 @@ true true - ..\lib\PocoPDFmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPDFmdd.lib @@ -635,11 +675,14 @@ true true - ..\lib\PocoPDFmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPDFmd.lib @@ -661,13 +704,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoPDF64d.dll true true - ..\bin64\PocoPDF64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoPDFd.lib @@ -693,7 +740,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoPDF64.dll @@ -720,11 +771,14 @@ true true - ..\lib64\PocoPDFmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPDFmtd.lib @@ -749,7 +803,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPDFmt.lib @@ -768,11 +826,14 @@ true true - ..\lib64\PocoPDFmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPDFmdd.lib @@ -797,7 +858,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPDFmd.lib @@ -806,303 +871,503 @@ 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 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 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 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 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 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 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/PDF/PDF_vs170.vcxproj.filters b/PDF/PDF_vs170.vcxproj.filters index 269252ee6..e7c185fb0 100644 --- a/PDF/PDF_vs170.vcxproj.filters +++ b/PDF/PDF_vs170.vcxproj.filters @@ -2,40 +2,40 @@ - {f67852f5-f6d2-42b2-968a-a439dce35a6c} + {f426c4fb-4635-4391-8169-1e078aaa22b3} - {0e1106d8-9896-4284-ab06-c09647cc564d} + {d7818ff4-830b-4e66-9746-26126f718530} - {7329e9a5-d822-455b-8445-f4bc6861af02} + {073dbf44-33de-4f4b-a13c-9e363cbfc4a5} - {1b35d64e-cf54-4915-9132-5cc651144446} + {f2fe92b5-fe93-43c9-a865-6bb64838f66e} - {0bf10ac1-6894-46ae-99c7-353d71f122b3} + {ec84f2dd-f70c-41d3-a23d-306a26e13a9f} - {7e579c96-cb80-4d08-b3bc-7462c12ffbe6} + {97e85bcc-b3d6-4d34-9b6c-c178d49915fc} - {b592faf4-a779-4253-a96e-d1b7e56d59f9} + {39714c8b-23da-48ba-aff0-f102ed25a1b6} - {49b6cf60-856c-4876-bac8-df783517647e} + {6e56df48-04b3-410f-bc28-af19f16e993c} - {d5d06994-f86c-48aa-a5a7-4ac8c5ef87ee} + {722c70fe-5922-42fd-af5e-a44ab5445860} - {270a3349-005e-46a7-b484-0ccd3f6c78a1} + {4e5d60ed-707a-4a2b-b487-dd48987f50c4} - {f13e1a87-9a44-4669-a758-de278f22e4a9} + {b0774c0b-991f-44d6-a8d5-810757dba8f2} - {874a1947-f881-4697-b410-43ed7d5c2579} + {32f3a026-d9c2-4bbe-af3c-c5e8345dd57d} diff --git a/PDF/samples/Image/Image.progen b/PDF/samples/Image/Image.progen index aa38e179b..ae20fcfeb 100644 --- a/PDF/samples/Image/Image.progen +++ b/PDF/samples/Image/Image.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\PDF\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = diff --git a/PDF/samples/Template/Template.progen b/PDF/samples/Template/Template.progen index 028bc844f..8ec52a56c 100644 --- a/PDF/samples/Template/Template.progen +++ b/PDF/samples/Template/Template.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\PDF\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = diff --git a/PDF/samples/Text/Text.progen b/PDF/samples/Text/Text.progen index aa38e179b..ae20fcfeb 100644 --- a/PDF/samples/Text/Text.progen +++ b/PDF/samples/Text/Text.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\PDF\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = diff --git a/PDF/testsuite/TestSuite.progen b/PDF/testsuite/TestSuite.progen index fbe3e7456..17f326951 100644 --- a/PDF/testsuite/TestSuite.progen +++ b/PDF/testsuite/TestSuite.progen @@ -7,5 +7,5 @@ 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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\Util\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = iphlpapi.lib diff --git a/PageCompiler/File2Page/File2Page.progen b/PageCompiler/File2Page/File2Page.progen index fd5708eca..8dd0d26ff 100644 --- a/PageCompiler/File2Page/File2Page.progen +++ b/PageCompiler/File2Page/File2Page.progen @@ -12,6 +12,6 @@ vc.project.compiler.defines = vc.project.compiler.defines.shared = 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 /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib vc.solution.create = true diff --git a/PageCompiler/File2Page/File2Page_vs170.vcxproj b/PageCompiler/File2Page/File2Page_vs170.vcxproj index f0f31e589..fa92b209e 100644 --- a/PageCompiler/File2Page/File2Page_vs170.vcxproj +++ b/PageCompiler/File2Page/File2Page_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 f2cpspd f2cpspd f2cpspd @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\f2cpspd.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\f2cpspd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,7 +392,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -417,7 +425,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -425,7 +437,7 @@ ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\f2cpspd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,7 +461,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -478,7 +494,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -486,7 +506,7 @@ ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\f2cpspd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\f2cpsp.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\f2cpspd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\f2cpspd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\f2cpspd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\f2cpspd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\f2cpspd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\f2cpspd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -892,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters b/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters index 0b9c22cd3..4460a4d58 100644 --- a/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {c1c1b410-a8a8-4913-989c-08d3413d1773} + {5b6cb120-2052-4168-b459-5ad2e6304ec7} - {f0a29a31-2b05-4a17-9a00-66591850d4a4} + {d1a7496e-488a-46aa-bdea-f7e55762edf9} diff --git a/PageCompiler/PageCompiler.progen b/PageCompiler/PageCompiler.progen index d0193b1bf..4535e63db 100644 --- a/PageCompiler/PageCompiler.progen +++ b/PageCompiler/PageCompiler.progen @@ -12,6 +12,6 @@ vc.project.compiler.defines = vc.project.compiler.defines.shared = 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 /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib vc.solution.create = true diff --git a/PageCompiler/PageCompiler_vs170.vcxproj b/PageCompiler/PageCompiler_vs170.vcxproj index bb533086d..a336db198 100644 --- a/PageCompiler/PageCompiler_vs170.vcxproj +++ b/PageCompiler/PageCompiler_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 cpspcd cpspcd cpspcd @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\cpspcd.exe + $(OutDir)$(TargetName).exe ..\libA64;%(AdditionalLibraryDirectories) true true - binA64\cpspcd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,7 +392,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -417,7 +425,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -425,7 +437,7 @@ ..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\cpspcd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,7 +461,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -478,7 +494,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -486,7 +506,7 @@ ..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\cpspcd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\cpspc.exe + $(OutDir)$(TargetName).exe ..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\lib;%(AdditionalLibraryDirectories) true true - bin\cpspcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\cpspcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\cpspcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\lib64;%(AdditionalLibraryDirectories) true true - bin64\cpspcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\cpspcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\cpspcd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -895,21 +967,33 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/PageCompiler/PageCompiler_vs170.vcxproj.filters b/PageCompiler/PageCompiler_vs170.vcxproj.filters index 1d34aef4e..ad87e7d87 100644 --- a/PageCompiler/PageCompiler_vs170.vcxproj.filters +++ b/PageCompiler/PageCompiler_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {a6f3a30b-ecc0-4b92-93d2-48856acefbc7} + {3373ba58-8c45-4d06-a20a-946c741b4542} - {cb151d00-691f-45bc-ab1a-1c769cd24843} + {b7244796-750d-4fd9-97a1-989fceb9da18} - {d6ddf6eb-fd4d-4b92-929e-7313ecbe097d} + {f644b45f-70db-48a7-86e3-cf91d71dc74d} diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer.progen b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer.progen index ede2c7832..c610dc055 100644 --- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer.progen +++ b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/PocoDoc/PocoDoc.progen b/PocoDoc/PocoDoc.progen index 832c985c5..555286756 100644 --- a/PocoDoc/PocoDoc.progen +++ b/PocoDoc/PocoDoc.progen @@ -12,6 +12,6 @@ vc.project.compiler.defines = vc.project.compiler.defines.shared = 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 /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib vc.solution.create = true diff --git a/PocoDoc/PocoDoc_vs170.vcxproj b/PocoDoc/PocoDoc_vs170.vcxproj index 83e5e101d..673897032 100644 --- a/PocoDoc/PocoDoc_vs170.vcxproj +++ b/PocoDoc/PocoDoc_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoDocd PocoDocd PocoDocd @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\PocoDocd.exe + $(OutDir)$(TargetName).exe ..\libA64;%(AdditionalLibraryDirectories) true true - binA64\PocoDocd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,7 +392,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -417,7 +425,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -425,7 +437,7 @@ ..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\PocoDocd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,7 +461,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -478,7 +494,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -486,7 +506,7 @@ ..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\PocoDocd.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\PocoDoc.exe + $(OutDir)$(TargetName).exe ..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\lib;%(AdditionalLibraryDirectories) true true - bin\PocoDocd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\PocoDocd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\PocoDocd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\lib64;%(AdditionalLibraryDirectories) true true - bin64\PocoDocd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\PocoDocd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\PocoDocd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -892,9 +964,13 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/PocoDoc/PocoDoc_vs170.vcxproj.filters b/PocoDoc/PocoDoc_vs170.vcxproj.filters index 0449f858b..27d09a983 100644 --- a/PocoDoc/PocoDoc_vs170.vcxproj.filters +++ b/PocoDoc/PocoDoc_vs170.vcxproj.filters @@ -2,22 +2,22 @@ - {61c800c9-587b-41ba-87e3-34ff640ef172} + {2285d602-2fd1-4276-887c-7dc9d8c4751f} - {fd1b3e51-2e8d-4e8c-91d4-46db7a3844e5} + {4909c872-7e96-4974-bc68-b9ff7d28c454} - {f7dc3703-4775-424b-b4e7-6f9e4ebf156b} + {2b98b6ea-162a-4f7c-8fc6-df11e9857293} - {be953bb3-d530-4aa1-905c-15cf3dffd17f} + {0699b1a7-de87-46a2-aad5-d0fa2b2ace3f} - {9d391651-b314-43be-bade-b8568a4bc511} + {1f5e1fc4-3b23-4eed-a143-065894c933aa} - {7d5696d9-9136-4311-9ad4-5d2b1bd0bd4d} + {c9b50355-c6f5-4906-a49f-6e8ab416d3dc} diff --git a/ProGen/ProGen.progen b/ProGen/ProGen.progen index 93a3aecb4..0cb9602be 100644 --- a/ProGen/ProGen.progen +++ b/ProGen/ProGen.progen @@ -12,6 +12,6 @@ vc.project.compiler.defines = vc.project.compiler.defines.shared = 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 /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib vc.solution.create = true diff --git a/ProGen/ProGen_vs170.vcxproj b/ProGen/ProGen_vs170.vcxproj index 89953fc63..1cf374d64 100644 --- a/ProGen/ProGen_vs170.vcxproj +++ b/ProGen/ProGen_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 progend progend progend @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\progend.exe + $(OutDir)$(TargetName).exe ..\libA64;%(AdditionalLibraryDirectories) true true - binA64\progend.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,7 +392,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -417,7 +425,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -425,7 +437,7 @@ ..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\progend.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,7 +461,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -478,7 +494,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -486,7 +506,7 @@ ..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\progend.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\progen.exe + $(OutDir)$(TargetName).exe ..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\lib;%(AdditionalLibraryDirectories) true true - bin\progend.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\progend.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\progend.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\lib64;%(AdditionalLibraryDirectories) true true - bin64\progend.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\progend.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\progend.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -895,9 +967,13 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/ProGen/ProGen_vs170.vcxproj.filters b/ProGen/ProGen_vs170.vcxproj.filters index 1875e14ed..b1b9720c0 100644 --- a/ProGen/ProGen_vs170.vcxproj.filters +++ b/ProGen/ProGen_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {c19b0653-7cd5-4342-9d01-f9a1c8d7165f} + {a1546477-6c69-498d-ba86-3a38eeafcafa} - {c982a442-d0a6-48aa-9d18-8b594fb33e87} + {9d13273d-cec3-418d-899e-198ded914263} - {e7f8ca85-51cb-4a65-92fe-32f0148210a8} + {e6a0ecf9-6f30-482d-b44d-41bf35797a3f} diff --git a/ProGen/src/ProGen.cpp b/ProGen/src/ProGen.cpp index 657d6f6ec..6909abe2a 100644 --- a/ProGen/src/ProGen.cpp +++ b/ProGen/src/ProGen.cpp @@ -601,6 +601,21 @@ protected: appendElement(pLinkElem, "TargetMachine", "MachineARM64"); } } + Poco::AutoPtr pClCompileList = pProjectDoc->getElementsByTagName("ClCompile"); + for (unsigned long i = 0; i < pClCompileList->length(); i++) + { + Poco::XML::Element* pClCompileElem = static_cast(pClCompileList->item(i)); + Poco::AutoPtr pLanguageStandard = pProjectDoc->createElement("LanguageStandard"); + Poco::AutoPtr pStandardText = pProjectDoc->createTextNode("stdcpp17"); + pLanguageStandard->appendChild(pStandardText); + pClCompileElem->appendChild(pLanguageStandard); + + pClCompileElem = static_cast(pClCompileList->item(i)); + pLanguageStandard = pProjectDoc->createElement("LanguageStandard_C"); + pStandardText = pProjectDoc->createTextNode("stdc11"); + pLanguageStandard->appendChild(pStandardText); + pClCompileElem->appendChild(pLanguageStandard); + } } void appendElement(Poco::XML::Node* pParentNode, const std::string& elemName, const std::string& text) diff --git a/Prometheus/Prometheus.progen b/Prometheus/Prometheus.progen index e24b46f91..cfe4ce225 100644 --- a/Prometheus/Prometheus.progen +++ b/Prometheus/Prometheus.progen @@ -12,6 +12,6 @@ vc.project.compiler.defines = 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} -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Prometheus/Prometheus_vs160.vcxproj b/Prometheus/Prometheus_vs160.vcxproj index a88388570..3cd101c95 100644 --- a/Prometheus/Prometheus_vs160.vcxproj +++ b/Prometheus/Prometheus_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 Prometheus {FAB67DE6-17E1-40F5-8FAC-A77A87DA034C} Prometheus @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 PocoPrometheusd PocoPrometheusmdd PocoPrometheusmtd @@ -239,6 +240,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -271,6 +273,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -302,6 +305,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -327,6 +331,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -350,6 +355,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -376,6 +382,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -398,6 +405,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -430,6 +438,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -461,6 +470,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -486,6 +496,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -509,6 +520,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -534,6 +546,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true diff --git a/Prometheus/Prometheus_vs160.vcxproj.filters b/Prometheus/Prometheus_vs160.vcxproj.filters index 686f883fe..1aaf386a3 100644 --- a/Prometheus/Prometheus_vs160.vcxproj.filters +++ b/Prometheus/Prometheus_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {da550d87-d4ce-43f1-9de7-95ff18bd3b61} + {a2e895c5-43ef-44fc-8843-8ce5f32490a3} - {b856d548-6ff2-43b8-8ece-28beb7105da2} + {007e1e30-599f-40f1-a03b-73d4ccc2697f} - {00c34b95-ed74-4de6-846c-f93021b9ea5f} + {4b99f8e7-b3ca-42ce-8513-51b68ad0f46a} diff --git a/Prometheus/Prometheus_vs170.vcxproj b/Prometheus/Prometheus_vs170.vcxproj index 3aecfb120..b96d34932 100644 --- a/Prometheus/Prometheus_vs170.vcxproj +++ b/Prometheus/Prometheus_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoPrometheusA64d PocoPrometheusmdd PocoPrometheusmtd @@ -344,13 +344,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoPrometheusA64d.dll true true - ..\binA64\PocoPrometheusA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoPrometheusd.lib @@ -376,7 +380,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoPrometheusA64.dll @@ -403,11 +411,14 @@ true true - ..\libA64\PocoPrometheusmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoPrometheusmtd.lib @@ -432,7 +443,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoPrometheusmt.lib @@ -451,11 +466,14 @@ true true - ..\libA64\PocoPrometheusmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoPrometheusmdd.lib @@ -480,7 +498,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoPrometheusmd.lib @@ -502,13 +524,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoPrometheusd.dll true true - ..\bin\PocoPrometheusd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoPrometheusd.lib @@ -534,7 +560,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoPrometheus.dll @@ -561,11 +591,14 @@ true true - ..\lib\PocoPrometheusmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPrometheusmtd.lib @@ -590,7 +623,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPrometheusmt.lib @@ -609,11 +646,14 @@ true true - ..\lib\PocoPrometheusmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPrometheusmdd.lib @@ -635,11 +675,14 @@ true true - ..\lib\PocoPrometheusmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoPrometheusmd.lib @@ -661,13 +704,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoPrometheus64d.dll true true - ..\bin64\PocoPrometheus64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoPrometheusd.lib @@ -693,7 +740,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoPrometheus64.dll @@ -720,11 +771,14 @@ true true - ..\lib64\PocoPrometheusmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPrometheusmtd.lib @@ -749,7 +803,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPrometheusmt.lib @@ -768,11 +826,14 @@ true true - ..\lib64\PocoPrometheusmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPrometheusmdd.lib @@ -797,7 +858,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoPrometheusmd.lib @@ -827,42 +892,68 @@ 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/Prometheus/Prometheus_vs170.vcxproj.filters b/Prometheus/Prometheus_vs170.vcxproj.filters index 2548d3690..5bcf53072 100644 --- a/Prometheus/Prometheus_vs170.vcxproj.filters +++ b/Prometheus/Prometheus_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {d9fa76ba-4879-42fe-b58d-5e9b5ea0e30e} + {5f0e8c47-e90e-48f5-b3f0-363d1969fcba} - {3de05224-2bb9-4fb1-84ba-df073562fa5f} + {316b98f5-3da2-4a16-b927-31a14c7cf767} - {b4aec395-e181-43e0-97f0-269d20432b09} + {6f6d0101-51af-4819-b50a-f55927be1957} diff --git a/Prometheus/samples/MetricsSample/MetricsSample.progen b/Prometheus/samples/MetricsSample/MetricsSample.progen index a6047e0a0..db3ccc99f 100644 --- a/Prometheus/samples/MetricsSample/MetricsSample.progen +++ b/Prometheus/samples/MetricsSample/MetricsSample.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\Util\\include;..\\..\\..\\XML\\include;..\\..\\..\\JSON\\include;..\\..\\..\\Net\\include;..\\..\\..\\Prometheus\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Prometheus/testsuite/TestSuite.progen b/Prometheus/testsuite/TestSuite.progen index 21c033eab..3fd46be00 100644 --- a/Prometheus/testsuite/TestSuite.progen +++ b/Prometheus/testsuite/TestSuite.progen @@ -7,4 +7,4 @@ 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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Net\\include;..\\..\\Prometheus\\include;.\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 \ No newline at end of file +vc.project.compiler.additionalOptions = /Zc:__cplusplus \ No newline at end of file diff --git a/Redis/Redis.progen b/Redis/Redis.progen index 6f31b281c..a3300cd1f 100644 --- a/Redis/Redis.progen +++ b/Redis/Redis.progen @@ -12,6 +12,6 @@ vc.project.compiler.defines = 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} -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Redis/Redis_vs170.vcxproj b/Redis/Redis_vs170.vcxproj index 57c87e1fd..1ce3ece51 100644 --- a/Redis/Redis_vs170.vcxproj +++ b/Redis/Redis_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoRedisA64d PocoRedismdd PocoRedismtd @@ -344,13 +344,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoRedisA64d.dll true true - ..\binA64\PocoRedisA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoRedisd.lib @@ -376,7 +380,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoRedisA64.dll @@ -403,11 +411,14 @@ true true - ..\libA64\PocoRedismtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoRedismtd.lib @@ -432,7 +443,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoRedismt.lib @@ -451,11 +466,14 @@ true true - ..\libA64\PocoRedismdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoRedismdd.lib @@ -480,7 +498,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoRedismd.lib @@ -502,13 +524,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoRedisd.dll true true - ..\bin\PocoRedisd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoRedisd.lib @@ -534,7 +560,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoRedis.dll @@ -561,11 +591,14 @@ true true - ..\lib\PocoRedismtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoRedismtd.lib @@ -590,7 +623,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoRedismt.lib @@ -609,11 +646,14 @@ true true - ..\lib\PocoRedismdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoRedismdd.lib @@ -635,11 +675,14 @@ true true - ..\lib\PocoRedismd.pdb + $(OutDir)$(TargetName).pdb Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoRedismd.lib @@ -661,13 +704,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoRedis64d.dll true true - ..\bin64\PocoRedis64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoRedisd.lib @@ -693,7 +740,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoRedis64.dll @@ -720,11 +771,14 @@ true true - ..\lib64\PocoRedismtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoRedismtd.lib @@ -749,7 +803,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoRedismt.lib @@ -768,11 +826,14 @@ true true - ..\lib64\PocoRedismdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoRedismdd.lib @@ -797,7 +858,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoRedismd.lib @@ -806,30 +871,48 @@ 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/Redis/Redis_vs170.vcxproj.filters b/Redis/Redis_vs170.vcxproj.filters index 6a448d40c..d433d236c 100644 --- a/Redis/Redis_vs170.vcxproj.filters +++ b/Redis/Redis_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {939546c3-584c-4d2b-9c14-1f101e7f478b} + {ed08d752-2ac4-4a37-9ae8-c7eb7953b09c} - {87c0e63a-8969-4502-9c69-f97206bb6596} + {48880c00-e839-48c7-8e0b-f986530ce20c} diff --git a/Redis/testsuite/TestSuite.progen b/Redis/testsuite/TestSuite.progen index c1bc49fed..fb74be89f 100644 --- a/Redis/testsuite/TestSuite.progen +++ b/Redis/testsuite/TestSuite.progen @@ -7,5 +7,5 @@ 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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Net\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/SevenZip/SevenZip.progen b/SevenZip/SevenZip.progen index b262740ed..704a7a428 100644 --- a/SevenZip/SevenZip.progen +++ b/SevenZip/SevenZip.progen @@ -13,5 +13,5 @@ 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} vc.project.compiler.disableWarnings = 4244;4267 -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true diff --git a/SevenZip/samples/un7zip/un7zip.progen b/SevenZip/samples/un7zip/un7zip.progen index 90a8dd807..be513ad17 100644 --- a/SevenZip/samples/un7zip/un7zip.progen +++ b/SevenZip/samples/un7zip/un7zip.progen @@ -7,4 +7,4 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\SevenZip\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus diff --git a/Util/Util.progen b/Util/Util.progen index 67580f011..465e2dbdb 100644 --- a/Util/Util.progen +++ b/Util/Util.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;..\\XML\\include;..\\JSON\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.compiler.defines = vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} diff --git a/Util/Util_vs170.vcxproj b/Util/Util_vs170.vcxproj index d594a0b6b..d5942e836 100644 --- a/Util/Util_vs170.vcxproj +++ b/Util/Util_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoUtilA64d PocoUtilmdd PocoUtilmtd @@ -344,13 +344,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoUtilA64d.dll true true - ..\binA64\PocoUtilA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoUtild.lib @@ -376,7 +380,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoUtilA64.dll @@ -403,11 +411,14 @@ true true - ..\libA64\PocoUtilmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoUtilmtd.lib @@ -432,7 +443,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoUtilmt.lib @@ -451,11 +466,14 @@ true true - ..\libA64\PocoUtilmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoUtilmdd.lib @@ -480,7 +498,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoUtilmd.lib @@ -502,13 +524,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoUtild.dll true true - ..\bin\PocoUtild.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoUtild.lib @@ -534,7 +560,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoUtil.dll @@ -561,11 +591,14 @@ true true - ..\lib\PocoUtilmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoUtilmtd.lib @@ -590,7 +623,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoUtilmt.lib @@ -609,11 +646,14 @@ true true - ..\lib\PocoUtilmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoUtilmdd.lib @@ -635,11 +675,14 @@ true true - ..\lib\PocoUtilmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoUtilmd.lib @@ -661,13 +704,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoUtil64d.dll true true - ..\bin64\PocoUtil64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoUtild.lib @@ -693,7 +740,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoUtil64.dll @@ -720,11 +771,14 @@ true true - ..\lib64\PocoUtilmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoUtilmtd.lib @@ -749,7 +803,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoUtilmt.lib @@ -768,11 +826,14 @@ true true - ..\lib64\PocoUtilmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoUtilmdd.lib @@ -797,7 +858,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoUtilmd.lib @@ -841,96 +906,158 @@ 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 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 true + stdcpp17 + stdc11 diff --git a/Util/Util_vs170.vcxproj.filters b/Util/Util_vs170.vcxproj.filters index a4d7b4d68..9a07fa7f3 100644 --- a/Util/Util_vs170.vcxproj.filters +++ b/Util/Util_vs170.vcxproj.filters @@ -2,58 +2,58 @@ - {b8490675-eb3e-48ae-8d47-3e62ffb80c2f} + {6a1a5ec7-003a-40c5-b947-0b0873e2d6ee} - {dfbff407-74ed-440f-980f-5950d5acc80c} + {05e1ed3e-9afb-4ebf-b835-fe9bfbe194af} - {cb9715c5-2cbb-481d-9055-bf63a8150519} + {e60dae01-1e6c-4a67-9fa1-0c3c3bdf2826} - {89f286bf-4872-4f1e-8fb1-5a68ceb7b0b2} + {694c6834-669b-4356-8727-47d3298c00e5} - {ba5872d1-739f-4815-8e2f-06d9e27ac4aa} + {e7f9d0c1-ae68-4c6e-8814-81724a1662ca} - {1059ef14-1fcf-478d-ab23-c5503e42a679} + {597875d6-a827-49d3-b0e1-2313de020ef8} - {11ec7246-2e9f-46e4-af40-558cc128f9d9} + {e27da853-1946-44e4-b200-f53a773e1134} - {2d1f22a5-fa02-4d66-9a2a-12ab39eba27c} + {ee93df46-e21d-433c-b500-2c4a130af4f6} - {66810fd8-8df3-45a8-99b7-4bcf92224038} + {d27baf62-7fd5-4f21-a096-a79b10887b53} - {31314d80-c80d-4e94-adcc-118125ff9a35} + {4fbc8357-ff74-4ae2-8ba4-88d677cd35a6} - {cde63aa2-178d-4f4f-a0f3-71b9ec5d568b} + {1e296277-0844-4bcb-8913-84097f9ea347} - {b4ce461e-5b9d-4571-9cde-607d8bea3442} + {fdcd64c6-3670-475c-b6ef-24dc1b5254ef} - {8406a20a-d687-49e1-b547-f501873ee45c} + {e02e5e88-f17a-4adf-9ad0-6e951bccb754} - {ad27901a-89e3-4666-aabd-cdc836a1fc17} + {22c8acd6-e2b4-4135-834f-6559c40b8456} - {99ce5375-3565-4add-a133-233d46ee006e} + {6dd6b69f-a286-4491-9e64-e4bfd76501ed} - {7d617013-451c-4f49-9b3c-2f14336af909} + {08210efd-f79f-4982-b94c-38405588e32c} - {8db98792-b008-4859-b1b9-eeab8e0980dd} + {942eb908-d116-4aad-9854-162dbd92116f} - {e6241b6d-3b96-4355-a613-110c07c4863f} + {dcd9985c-7c22-4900-917d-a3826ca33b75} diff --git a/Util/samples/SampleApp/SampleApp.progen b/Util/samples/SampleApp/SampleApp.progen index b1d2420a5..36407c412 100644 --- a/Util/samples/SampleApp/SampleApp.progen +++ b/Util/samples/SampleApp/SampleApp.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Util/samples/SampleServer/SampleServer.progen b/Util/samples/SampleServer/SampleServer.progen index b1d2420a5..36407c412 100644 --- a/Util/samples/SampleServer/SampleServer.progen +++ b/Util/samples/SampleServer/SampleServer.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Util/samples/Units/Units.progen b/Util/samples/Units/Units.progen index 80c2d2653..bb80bca91 100644 --- a/Util/samples/Units/Units.progen +++ b/Util/samples/Units/Units.progen @@ -7,4 +7,4 @@ 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;..\\..\\..\\Util\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus diff --git a/Util/samples/pkill/pkill.progen b/Util/samples/pkill/pkill.progen index b1d2420a5..36407c412 100644 --- a/Util/samples/pkill/pkill.progen +++ b/Util/samples/pkill/pkill.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Util/testsuite/TestSuite.progen b/Util/testsuite/TestSuite.progen index 2280fee75..c734b414d 100644 --- a/Util/testsuite/TestSuite.progen +++ b/Util/testsuite/TestSuite.progen @@ -7,5 +7,5 @@ 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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\JSON\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = iphlpapi.lib diff --git a/Util/testsuite/TestSuite_vs170.vcxproj b/Util/testsuite/TestSuite_vs170.vcxproj index 18b2f8709..b8b109c88 100644 --- a/Util/testsuite/TestSuite_vs170.vcxproj +++ b/Util/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 TestSuited TestSuited TestSuited @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,11 +392,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -417,15 +425,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,11 +461,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -478,15 +494,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -921,87 +993,143 @@ 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 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/Util/testsuite/TestSuite_vs170.vcxproj.filters b/Util/testsuite/TestSuite_vs170.vcxproj.filters index 9782f4318..2a33cd3da 100644 --- a/Util/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,64 +2,64 @@ - {6da2c515-b00e-4fae-b2b5-aa3588fa9ee5} + {bf120474-4445-4697-b471-7c39e2d38eda} - {363beeac-3d37-4eda-b2af-967dd3500746} + {a4f8d012-57ef-474e-9064-b8a9e0677f66} - {b6d3f832-90b4-4893-b5c5-50c92c2222da} + {7b1608c9-d746-4dd0-9cab-644082d5da39} - {6e72e80f-b934-4f32-a093-9fcdaa489717} + {cbc96e3c-3fa6-411f-838d-3a3b70bd4c61} - {24d80eaa-600a-4289-8049-251db65b6a04} + {adaeedcf-dc9f-4344-8f11-7822e4f05f68} - {c89f0423-2a46-41e7-8e44-9e0c722e1a2f} + {f1628bfe-3122-4150-8507-005bb1fe7a48} - {1ef062b8-43ea-4e20-a3b4-8100dbf5d3f5} + {a1aa1385-3f4a-4e93-a3b7-8acb6bcfca47} - {2e9a3808-48c8-4169-b04e-29635ebc21af} + {d8941f75-b04e-42af-92e5-23547495c0be} - {da024c3a-2123-4f46-a0f6-9c83ea0dd02e} + {711b44f4-7b07-4bb4-af7f-3f411eaa399d} - {00043fe8-b671-499b-b347-08ba31776766} + {05bb7ce7-8584-4ef7-9eea-9729eb085346} - {2f873f5e-88f6-4eb0-99e5-090c792c425e} + {e1b9169e-7428-4feb-bae2-66cc9f692314} - {dd6f9455-e392-4e80-b23d-b960a7c3ae7e} + {ff7d389a-f0b6-4743-ac01-ea5914efc867} - {3fbdada5-c2d5-492e-809d-e0d1a75ce544} + {d49d5ed0-1d68-4307-8a74-31618cab5b25} - {7e4998f0-fb0a-449f-8e1d-756f8e096e55} + {f4cd4c4a-54b2-4770-b9bc-c0530ffc8cdb} - {9bc91c8d-03d5-4ab3-b5c6-f45d2d73ef9c} + {941b0937-9f2e-4c77-b23c-a972c206ef70} - {eccedab4-9508-4718-b7bf-3e1e1d8bd76d} + {929ec79c-9067-4356-8107-fb26be88d136} - {d41c00e9-b185-4b54-8b48-410f9fae9fb3} + {864bc194-232f-4b00-9e63-6b305a51ae44} - {2656a8b9-839b-4c6c-ad8f-f6f08d85e6e1} + {c4b4debe-4e1b-4c83-97e1-77a99a19965d} - {74c99947-4001-4143-b46f-12fc00f1bb3e} + {d8aa3a59-3d88-43eb-96a2-95d560d02296} - {6f467c16-7a22-4a9e-ba79-6d5025cf2666} + {ad1052ce-ef60-4667-ad7b-826b3cdcb206} @@ -90,10 +90,10 @@ Configuration\Header Files - + Configuration\Header Files - + Configuration\Header Files diff --git a/XML/XML.progen b/XML/XML.progen index da5e6529f..e8b0f0645 100644 --- a/XML/XML.progen +++ b/XML/XML.progen @@ -12,6 +12,6 @@ vc.project.compiler.defines = XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H 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} -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/XML/XML_vs170.vcxproj b/XML/XML_vs170.vcxproj index 426d505ef..7dafeecd3 100644 --- a/XML/XML_vs170.vcxproj +++ b/XML/XML_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoXMLA64d PocoXMLmdd PocoXMLmtd @@ -344,13 +344,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoXMLA64d.dll true true - ..\binA64\PocoXMLA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoXMLd.lib @@ -376,7 +380,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\binA64\PocoXMLA64.dll @@ -403,11 +411,14 @@ true true - ..\libA64\PocoXMLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoXMLmtd.lib @@ -432,7 +443,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoXMLmt.lib @@ -451,11 +466,14 @@ true true - ..\libA64\PocoXMLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoXMLmdd.lib @@ -480,7 +498,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoXMLmd.lib @@ -502,13 +524,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoXMLd.dll true true - ..\bin\PocoXMLd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoXMLd.lib @@ -534,7 +560,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin\PocoXML.dll @@ -561,11 +591,14 @@ true true - ..\lib\PocoXMLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoXMLmtd.lib @@ -590,7 +623,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoXMLmt.lib @@ -609,11 +646,14 @@ true true - ..\lib\PocoXMLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoXMLmdd.lib @@ -635,11 +675,14 @@ true true - ..\lib\PocoXMLmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoXMLmd.lib @@ -661,13 +704,17 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoXML64d.dll true true - ..\bin64\PocoXML64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoXMLd.lib @@ -693,7 +740,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\bin64\PocoXML64.dll @@ -720,11 +771,14 @@ true true - ..\lib64\PocoXMLmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoXMLmtd.lib @@ -749,7 +803,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoXMLmt.lib @@ -768,11 +826,14 @@ true true - ..\lib64\PocoXMLmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoXMLmdd.lib @@ -797,7 +858,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoXMLmd.lib @@ -896,216 +961,358 @@ 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 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 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 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 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 @@ -1127,9 +1334,13 @@ true true true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true @@ -1151,6 +1362,8 @@ true true true + stdcpp17 + stdc11 true @@ -1172,9 +1385,13 @@ true true true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/XML/XML_vs170.vcxproj.filters b/XML/XML_vs170.vcxproj.filters index e45ae3154..81978313e 100644 --- a/XML/XML_vs170.vcxproj.filters +++ b/XML/XML_vs170.vcxproj.filters @@ -2,40 +2,40 @@ - {feb3617d-329e-4cb2-81b7-f593a45bd868} + {01b91afa-ebf6-4ac8-9b98-0d68c6421a50} - {e41ab930-494b-45f0-8541-adadbd6d198b} + {b21671d7-0a08-4d01-9af9-01a120046a89} - {a5f675cc-0c1b-430f-8b9d-e7646d2d78c0} + {dfb379de-c6dc-462b-bea7-b3cb8afc0e67} - {455142d1-3044-4ed6-90ad-401072daa75a} + {67f6a500-649c-498b-8367-2c8ebea0eb99} - {41313b80-122b-49c0-bf8f-0136f157dd3b} + {fa07dc3c-aa0b-4a1c-94a4-bbb95c13081c} - {ad710bdd-0fe9-4f59-87db-86e16c2290b9} + {c42c455b-1085-4ecd-b251-d7f635d685b7} - {91ee4cd9-5574-4591-b3e4-604182e2afd0} + {815e94e8-d409-4af9-b5c3-76ad5bc4c888} - {796bed3f-d216-446a-b113-ace2e0a482ba} + {f9c0dece-6a1a-4bbb-9770-72d2b41ba798} - {b1cb98da-d465-4ce1-b42a-5e94f249cf3c} + {13676f85-7b77-4e42-b347-781fba0cd0b1} - {2f86ca57-6710-444c-8667-c3049841000e} + {7e1f7f43-19ab-4eea-8d8f-c7b220a29012} - {3e5dc539-a989-4a9c-a369-32ddc61f8abe} + {1a0c5add-b2e4-4db9-9cbe-a914bf252995} - {da060f69-71ca-4905-9a5c-37e527417b1c} + {740021f0-b269-4cd7-9f74-81a03e30bd11} diff --git a/XML/samples/DOMParser/DOMParser.progen b/XML/samples/DOMParser/DOMParser.progen index 299a2da6e..cd5b15cf0 100644 --- a/XML/samples/DOMParser/DOMParser.progen +++ b/XML/samples/DOMParser/DOMParser.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/XML/samples/DOMParser/DOMParser_vs170.vcxproj b/XML/samples/DOMParser/DOMParser_vs170.vcxproj index 4d33387c1..5c7e5d7b4 100644 --- a/XML/samples/DOMParser/DOMParser_vs170.vcxproj +++ b/XML/samples/DOMParser/DOMParser_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 DOMParser {70F2F655-67D5-32A1-A99B-D4903547DB3E} DOMParser @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 + DOMParserd + DOMParserd + DOMParserd + DOMParser + DOMParser + DOMParser DOMParserd DOMParserd DOMParserd @@ -171,6 +250,36 @@ DOMParser DOMParser + + binA64\ + objA64\DOMParser\$(Configuration)\ + true + + + binA64\ + objA64\DOMParser\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\DOMParser\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\DOMParser\$(Configuration)\ + false + + + binA64\static_md\ + objA64\DOMParser\$(Configuration)\ + true + + + binA64\static_md\ + objA64\DOMParser\$(Configuration)\ + false + bin\ obj\DOMParser\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\DOMParser\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\DOMParser.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\DOMParserd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\DOMParser.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\DOMParserd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\DOMParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\DOMParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\DOMParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\DOMParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\DOMParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\DOMParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/XML/samples/DOMParser/DOMParser_vs170.vcxproj.filters b/XML/samples/DOMParser/DOMParser_vs170.vcxproj.filters index a4b900710..6731b18de 100644 --- a/XML/samples/DOMParser/DOMParser_vs170.vcxproj.filters +++ b/XML/samples/DOMParser/DOMParser_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {b084966b-1ad2-4ccf-bbe5-efe179f83df9} + {8a08200a-1a12-4da5-a4cb-d6adf507aba0} - {06049f87-a968-4fc6-a990-d21962913391} + {d2160a53-12e9-4ffd-ad35-0d25d4bf92b1} diff --git a/XML/samples/DOMWriter/DOMWriter.progen b/XML/samples/DOMWriter/DOMWriter.progen index 299a2da6e..cd5b15cf0 100644 --- a/XML/samples/DOMWriter/DOMWriter.progen +++ b/XML/samples/DOMWriter/DOMWriter.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj b/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj index 3eb1e1a37..d9c5f386b 100644 --- a/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj +++ b/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 DOMWriter {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8} DOMWriter @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 + DOMWriterd + DOMWriterd + DOMWriterd + DOMWriter + DOMWriter + DOMWriter DOMWriterd DOMWriterd DOMWriterd @@ -171,6 +250,36 @@ DOMWriter DOMWriter + + binA64\ + objA64\DOMWriter\$(Configuration)\ + true + + + binA64\ + objA64\DOMWriter\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\DOMWriter\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\DOMWriter\$(Configuration)\ + false + + + binA64\static_md\ + objA64\DOMWriter\$(Configuration)\ + true + + + binA64\static_md\ + objA64\DOMWriter\$(Configuration)\ + false + bin\ obj\DOMWriter\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\DOMWriter\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\DOMWriter.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\DOMWriterd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\DOMWriter.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\DOMWriterd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\DOMWriterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\DOMWriterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\DOMWriterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\DOMWriterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\DOMWriterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\DOMWriterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj.filters b/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj.filters index 30c4e0ea8..1f07e8c83 100644 --- a/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj.filters +++ b/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {e01f4712-0b85-4fa6-9ba1-152c87a9dd29} + {60a029ee-84d0-4105-9e6e-d95555057208} - {5388bcc0-ea86-4b35-8764-874f3eb21963} + {c072432c-7405-4762-aa49-4eab4b357375} diff --git a/XML/samples/PrettyPrint/PrettyPrint.progen b/XML/samples/PrettyPrint/PrettyPrint.progen index 299a2da6e..cd5b15cf0 100644 --- a/XML/samples/PrettyPrint/PrettyPrint.progen +++ b/XML/samples/PrettyPrint/PrettyPrint.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/XML/samples/SAXParser/SAXParser.progen b/XML/samples/SAXParser/SAXParser.progen index 299a2da6e..cd5b15cf0 100644 --- a/XML/samples/SAXParser/SAXParser.progen +++ b/XML/samples/SAXParser/SAXParser.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/XML/samples/SAXParser/SAXParser_vs170.vcxproj b/XML/samples/SAXParser/SAXParser_vs170.vcxproj index d40401fa5..466f72605 100644 --- a/XML/samples/SAXParser/SAXParser_vs170.vcxproj +++ b/XML/samples/SAXParser/SAXParser_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 SAXParser {2A54653D-9F55-348B-8F79-A3E454563AE3} SAXParser @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34322.80 + SAXParserd + SAXParserd + SAXParserd + SAXParser + SAXParser + SAXParser SAXParserd SAXParserd SAXParserd @@ -171,6 +250,36 @@ SAXParser SAXParser + + binA64\ + objA64\SAXParser\$(Configuration)\ + true + + + binA64\ + objA64\SAXParser\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\SAXParser\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\SAXParser\$(Configuration)\ + false + + + binA64\static_md\ + objA64\SAXParser\$(Configuration)\ + true + + + binA64\static_md\ + objA64\SAXParser\$(Configuration)\ + false + bin\ obj\SAXParser\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\SAXParser\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\SAXParser.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SAXParserd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SAXParser.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\SAXParserd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\SAXParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\SAXParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\SAXParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\SAXParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\SAXParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\SAXParserd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/XML/samples/SAXParser/SAXParser_vs170.vcxproj.filters b/XML/samples/SAXParser/SAXParser_vs170.vcxproj.filters index 34e4e43a3..5d4bdb707 100644 --- a/XML/samples/SAXParser/SAXParser_vs170.vcxproj.filters +++ b/XML/samples/SAXParser/SAXParser_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {98229444-1ff8-449c-bda1-8f6c0a9a9beb} + {f72f6939-cdf6-4d4b-8201-9f02e0055e05} - {897b1590-82e5-4f34-8ba3-7ebc82ed8879} + {dd54e283-1535-4069-a9d9-34be10276285} diff --git a/XML/samples/samples_vs170.sln b/XML/samples/samples_vs170.sln index f8ba4b079..d32cc1f93 100644 --- a/XML/samples/samples_vs170.sln +++ b/XML/samples/samples_vs170.sln @@ -10,6 +10,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SAXParser", "SAXParser\SAXP 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 @@ -24,6 +30,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|Win32.Build.0 = debug_shared|Win32 {70F2F655-67D5-32A1-A99B-D4903547DB3E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -60,6 +84,24 @@ Global {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|x64.ActiveCfg = release_static_md|x64 {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|x64.Build.0 = release_static_md|x64 {70F2F655-67D5-32A1-A99B-D4903547DB3E}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|Win32.Build.0 = debug_shared|Win32 {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -96,6 +138,24 @@ Global {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|x64.ActiveCfg = release_static_md|x64 {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|x64.Build.0 = release_static_md|x64 {A3CBDFA6-6261-3C04-B1FD-51AA20763BB8}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|Win32.Build.0 = debug_shared|Win32 {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -132,6 +192,24 @@ Global {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|x64.ActiveCfg = release_static_md|x64 {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|x64.Build.0 = release_static_md|x64 {DFA97011-8DD4-3A84-A0C9-EB2101BD6082}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {2A54653D-9F55-348B-8F79-A3E454563AE3}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|Win32.Build.0 = debug_shared|Win32 {2A54653D-9F55-348B-8F79-A3E454563AE3}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 diff --git a/XML/testsuite/TestSuite.progen b/XML/testsuite/TestSuite.progen index 99ba45b05..09d789f80 100644 --- a/XML/testsuite/TestSuite.progen +++ b/XML/testsuite/TestSuite.progen @@ -7,5 +7,5 @@ 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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = iphlpapi.lib diff --git a/Zip/Zip.progen b/Zip/Zip.progen index c3cddae59..fbcba85bf 100644 --- a/Zip/Zip.progen +++ b/Zip/Zip.progen @@ -13,7 +13,7 @@ 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} vc.project.compiler.disableWarnings = 4244;4267 -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Zip/Zip_vs170.vcxproj b/Zip/Zip_vs170.vcxproj index b0d0ea11e..af0765c63 100644 --- a/Zip/Zip_vs170.vcxproj +++ b/Zip/Zip_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34322.80 PocoZipA64d PocoZipmdd PocoZipmtd @@ -344,15 +344,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\binA64\PocoZipA64d.dll true true - ..\binA64\PocoZipA64d.pdb + $(OutDir)$(TargetName).pdb ..\libA64;%(AdditionalLibraryDirectories) Console ..\libA64\PocoZipd.lib @@ -378,8 +382,12 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -407,12 +415,15 @@ true true - ..\libA64\PocoZipmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoZipmtd.lib @@ -437,8 +448,12 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoZipmt.lib @@ -457,12 +472,15 @@ true true - ..\libA64\PocoZipmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoZipmdd.lib @@ -487,8 +505,12 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\libA64\PocoZipmd.lib @@ -510,15 +532,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoZipd.dll true true - ..\bin\PocoZipd.pdb + $(OutDir)$(TargetName).pdb ..\lib;%(AdditionalLibraryDirectories) Console ..\lib\PocoZipd.lib @@ -544,8 +570,12 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -573,12 +603,15 @@ true true - ..\lib\PocoZipmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoZipmtd.lib @@ -603,8 +636,12 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoZipmt.lib @@ -623,12 +660,15 @@ true true - ..\lib\PocoZipmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib\PocoZipmdd.lib @@ -650,12 +690,15 @@ true true - ..\lib\PocoZipmd.pdb + $(OutDir)$(TargetName).pdb Level3 Default 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -678,15 +721,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) ..\bin64\PocoZip64d.dll true true - ..\bin64\PocoZip64d.pdb + $(OutDir)$(TargetName).pdb ..\lib64;%(AdditionalLibraryDirectories) Console ..\lib64\PocoZipd.lib @@ -712,8 +759,12 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -741,12 +792,15 @@ true true - ..\lib64\PocoZipmtd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoZipmtd.lib @@ -771,8 +825,12 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoZipmt.lib @@ -791,12 +849,15 @@ true true - ..\lib64\PocoZipmdd.pdb + $(OutDir)$(TargetName).pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoZipmdd.lib @@ -821,8 +882,12 @@ Level3 Default + $(OutDir)$(TargetName).pdb 4244;4267;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ..\lib64\PocoZipmd.lib @@ -856,69 +921,113 @@ 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 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Zip/Zip_vs170.vcxproj.filters b/Zip/Zip_vs170.vcxproj.filters index 5b4ba506f..5b761c9f0 100644 --- a/Zip/Zip_vs170.vcxproj.filters +++ b/Zip/Zip_vs170.vcxproj.filters @@ -2,22 +2,22 @@ - {1132c396-4c68-4f9c-a114-dc58e197eb75} + {b93d89ba-f62a-4cec-b531-d1ebbb43cf72} - {35246ee0-7a15-4c85-acb7-ec7ea4739eb1} + {dd3162fa-9348-4495-871f-9ce5a78be181} - {6066923c-48b9-45a3-924e-b6756cfb26ea} + {b5c6e1af-a887-4a12-847b-aac19cad216f} - {e42e0200-5517-4ee4-8258-a7af55d8568a} + {fee1c853-3a9a-4ad7-9eb8-4e0959442ebd} - {845786c4-d8e0-4b43-a0a6-14e30b863a08} + {347bae64-89a9-4e25-8672-d0eb5ce7b967} - {9e91e8a0-d142-4101-81d4-28bb0fdfcfc6} + {a83f3972-4019-4d5f-b8d8-3404d84478aa} diff --git a/Zip/samples/unzip/unzip.progen b/Zip/samples/unzip/unzip.progen index 32577f864..2df44952a 100644 --- a/Zip/samples/unzip/unzip.progen +++ b/Zip/samples/unzip/unzip.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Zip\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Zip/samples/zip/zip.progen b/Zip/samples/zip/zip.progen index 32577f864..2df44952a 100644 --- a/Zip/samples/zip/zip.progen +++ b/Zip/samples/zip/zip.progen @@ -7,5 +7,5 @@ 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Zip\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Zip/testsuite/TestSuite.progen b/Zip/testsuite/TestSuite.progen index 1617f52d8..132ab0546 100644 --- a/Zip/testsuite/TestSuite.progen +++ b/Zip/testsuite/TestSuite.progen @@ -7,6 +7,6 @@ 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 = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include -vc.project.compiler.additionalOptions = /Zc:__cplusplus /std:c++17 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = iphlpapi.lib diff --git a/build/config/AIX-GCC b/build/config/AIX-GCC index d039e8ac8..285db360a 100644 --- a/build/config/AIX-GCC +++ b/build/config/AIX-GCC @@ -20,7 +20,7 @@ CXX = ${CROSS_COMPILE}g++ LINK = $(CXX) LIB = $(CROSS_COMPILE)ar -cr -X32_64 RANLIB = $(CROSS_COMPILE)ranlib -## Please note: AIX does NOT have library versioning per se (there is no 'SONAME' capability). +## Please note: AIX does NOT have library versioning per se (there is no 'SONAME' capability). SHLIB = $(CXX) $(LDFLAGS) -shared -Wl,-bexpfull -o $@ SHLIBLN = $(POCO_BASE)/build/script/shlibln STRIP = $(CROSS_COMPILE)strip -X32_64 @@ -32,7 +32,7 @@ MKDIR = mkdir -p LDFLAGS += -Wl,-bbigtoc ## http://www.ibm.com/developerworks/aix/library/au-gnu.html: -## > "/Using -brtl, the AIX linker will look for libraries with both the .a and +## > "/Using -brtl, the AIX linker will look for libraries with both the .a and ## > .so extensions, such as libfoo.a and libfoo.so. ## > Without -brtl, the AIX linker looks only for libfoo.a # @@ -47,7 +47,7 @@ SHAREDLIBLINKEXT = .a CFLAGS = $(SANITIZEFLAGS) -std=c11 CFLAGS32 = -maix32 CFLAGS64 = -maix64 -CXXFLAGS = $(SANITIZEFLAGS) -std=c++14 -Wno-sign-compare +CXXFLAGS = $(SANITIZEFLAGS) -std=c++17 -Wno-sign-compare CXXFLAGS32 = -maix32 CXXFLAGS64 = -maix64 SHLIBFLAGS = -Wl,-bh:5 -Wl,-bnoipath -Wl,-blibpath:/usr/lib:/lib -Wl,-blibsuff:so -Wl,-bautoexp -Wl,-bnoentry -Wl,-bM:SRE @@ -58,7 +58,7 @@ LINKFLAGS32 = -maix32 LINKFLAGS64 = -maix64 STATICOPT_CC = STATICOPT_CXX = -STATICOPT_LINK = +STATICOPT_LINK = SHAREDOPT_CC = -fPIC SHAREDOPT_CXX = -fPIC SHAREDOPT_LINK = diff --git a/build/config/AppleTV b/build/config/AppleTV index 8f916a3e7..d686c147e 100644 --- a/build/config/AppleTV +++ b/build/config/AppleTV @@ -66,7 +66,7 @@ SHAREDLIBLINKEXT = .dylib CFLAGS = $(OSFLAGS) -std=gnu99 CFLAGS32 = CFLAGS64 = -CXXFLAGS = $(OSFLAGS) -std=c++11 -stdlib=libc++ -Wall -Wno-sign-compare +CXXFLAGS = $(OSFLAGS) -std=c++17 -stdlib=libc++ -Wall -Wno-sign-compare CXXFLAGS32 = CXXFLAGS64 = LINKFLAGS = $(OSFLAGS) -stdlib=libc++ diff --git a/build/config/BeagleBoard b/build/config/BeagleBoard index c3e6784fc..eb43943e0 100644 --- a/build/config/BeagleBoard +++ b/build/config/BeagleBoard @@ -38,7 +38,7 @@ SHAREDLIBLINKEXT = .so # # Compiler and Linker Flags # -CFLAGS = -std=c99 -mfpu=neon -mfloat-abi=softfp -march=armv7-a +CFLAGS = -std=c11 -mfpu=neon -mfloat-abi=softfp -march=armv7-a CFLAGS32 = CFLAGS64 = CXXFLAGS = -mfpu=neon -mfloat-abi=softfp -march=armv7-a diff --git a/build/config/ELDK b/build/config/ELDK index de0ffaa15..0594d1dd4 100644 --- a/build/config/ELDK +++ b/build/config/ELDK @@ -38,7 +38,7 @@ SHAREDLIBLINKEXT = .so # # Compiler and Linker Flags # -CFLAGS = -std=c99 -Isrc +CFLAGS = -std=c11 -Isrc CFLAGS32 = CFLAGS64 = CXXFLAGS = diff --git a/build/config/Linux-SolarisStudio b/build/config/Linux-SolarisStudio index e50c865d1..bf2f035fc 100644 --- a/build/config/Linux-SolarisStudio +++ b/build/config/Linux-SolarisStudio @@ -39,10 +39,10 @@ SHAREDLIBLINKEXT = .so CFLAGS = -mt CFLAGS32 = CFLAGS64 = -CXXFLAGS = -mt -std=c++03 -erroff=hidevf +CXXFLAGS = -mt -std=c++17 -erroff=hidevf CXXFLAGS32 = CXXFLAGS64 = -LINKFLAGS = -mt -std=c++03 +LINKFLAGS = -mt -std=c++17 LINKFLAGS32 = LINKFLAGS64 = STATICOPT_CC = diff --git a/build/config/Linux-clang b/build/config/Linux-clang index 43ac30d71..d84617dd8 100644 --- a/build/config/Linux-clang +++ b/build/config/Linux-clang @@ -10,6 +10,10 @@ # LINKMODE ?= SHARED +ARCHFLAGS ?= -arch $(POCO_HOST_OSARCH) +SANITIZEFLAGS ?= +OSFLAGS ?= + # # Define Tools # @@ -36,13 +40,13 @@ SHAREDLIBLINKEXT = .so # # Compiler and Linker Flags # -CFLAGS = -std=c99 -CFLAGS32 = -CFLAGS64 = -CXXFLAGS = -Wall -Wno-sign-compare -CXXFLAGS32 = -CXXFLAGS64 = -LINKFLAGS = +CFLAGS = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) -std=c11 +CFLAGS32 = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) +CFLAGS64 = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) +CXXFLAGS = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) -std=c++17 -Wall -Wno-sign-compare +CXXFLAGS32 = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) +CXXFLAGS64 = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) +LINKFLAGS = $(ARCHFLAGS) $(OSFLAGS) $(SANITIZEFLAGS) LINKFLAGS32 = LINKFLAGS64 = STATICOPT_CC = diff --git a/build/config/PPC-Linux b/build/config/PPC-Linux index 338050741..fd2f82c9d 100644 --- a/build/config/PPC-Linux +++ b/build/config/PPC-Linux @@ -38,7 +38,7 @@ SHAREDLIBLINKEXT = .so # # Compiler and Linker Flags # -CFLAGS = -std=c99 -Isrc +CFLAGS = -std=c11 -Isrc CFLAGS32 = CFLAGS64 = CXXFLAGS = diff --git a/build/config/SmartOS-gcc b/build/config/SmartOS-gcc index cea8bfef9..349733dd8 100644 --- a/build/config/SmartOS-gcc +++ b/build/config/SmartOS-gcc @@ -36,7 +36,7 @@ SHAREDLIBLINKEXT = .so # # Compiler and Linker Flags # -CFLAGS = -std=gnu99 +CFLAGS = -std=c11 CFLAGS32 = CFLAGS64 = CXXFLAGS = -Wall -Wno-sign-compare diff --git a/build/config/WatchOS b/build/config/WatchOS index c64865ae0..e0cb3235e 100644 --- a/build/config/WatchOS +++ b/build/config/WatchOS @@ -66,7 +66,7 @@ SHAREDLIBLINKEXT = .dylib CFLAGS = $(OSFLAGS) CFLAGS32 = CFLAGS64 = -CXXFLAGS = $(OSFLAGS) -std=c++11 -stdlib=libc++ -Wall -Wno-sign-compare +CXXFLAGS = $(OSFLAGS) -std=c++17 -stdlib=libc++ -Wall -Wno-sign-compare CXXFLAGS32 = CXXFLAGS64 = LINKFLAGS = $(OSFLAGS) -stdlib=libc++ diff --git a/build/config/Yocto b/build/config/Yocto index f066e8974..af8025229 100644 --- a/build/config/Yocto +++ b/build/config/Yocto @@ -39,7 +39,7 @@ SHAREDLIBLINKEXT = .so # # Compiler and Linker Flags # -CFLAGS = -std=c99 +CFLAGS = -std=c11 CFLAGS32 = CFLAGS64 = CXXFLAGS = -Wall -Wno-sign-compare diff --git a/build_vs140.cmd b/build_vs140.cmd deleted file mode 100644 index abe604d88..000000000 --- a/build_vs140.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -buildwin 140 build shared both Win32 samples tests diff --git a/build_vs150.cmd b/build_vs150.cmd deleted file mode 100644 index 4bc4a3180..000000000 --- a/build_vs150.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -buildwin 150 build shared both Win32 samples tests diff --git a/buildwin.ps1 b/buildwin.ps1 index 6025f3244..9ff172a0b 100644 --- a/buildwin.ps1 +++ b/buildwin.ps1 @@ -4,7 +4,7 @@ # Usage: # ------ # buildwin.ps1 [-poco_base dir] -# [-vs 140 | 150 | 160| 170] +# [-vs 160| 170] # [-action build | rebuild | clean] # [-linkmode shared | static_mt | static_md | all] # [-config release | debug | both] @@ -26,8 +26,8 @@ Param [string] $poco_base = $([System.Environment]::GetEnvironmentVariable('POCO_BASE')), [Parameter()] - [ValidateSet(140, 150, 160, 170)] - [int] $vs = 140, + [ValidateSet(160, 170)] + [int] $vs = 170, [Parameter()] [ValidateSet('build', 'rebuild', 'clean')] @@ -73,7 +73,7 @@ Param function Add-VSCOMNTOOLS([int] $vsver) { - if ($vsver -ge 150) + if ($vsver -ge 160) { $vssetup= $([Environment]::GetFolderPath("MyDocuments")) $vssetup= Join-Path $vssetup "WindowsPowerShell" @@ -83,10 +83,6 @@ function Add-VSCOMNTOOLS([int] $vsver) { Install-Module VSSetup -Scope CurrentUser -Force } - if ($vsver -eq 150) - { - $range='[15.0,16.0)' - } if ($vsver -eq 160) { $range='[16.0,17.0)' @@ -110,14 +106,6 @@ function Add-VSCOMNTOOLS([int] $vsver) } $vscomntools = $installationPath.psobject.properties.Value; - if ($vsver -eq 150) - { - set-item -force -path "ENV:VS150COMNTOOLS" -value "$vscomntools\Common7\Tools\" - Write-Host "`n----------------------------------------" -ForegroundColor Yellow - Write-Host "VS150COMNTOOLS=$env:VS150COMNTOOLS" -ForegroundColor Yellow - Write-Host "----------------------------------------" -ForegroundColor Yellow - Write-Host "" - } if ($vsver -eq 160) { set-item -force -path "ENV:VS160COMNTOOLS" -value "$vscomntools\Common7\Tools\" @@ -144,7 +132,7 @@ function Add-Env-Var([string] $lib, [string] $var) $libvar = Get-Content "Env:${lib}_$var" if (-not $envvar.Contains($libvar)) { - $envvar = $envvar + ";$libvar" + $envvar = $envvar + ";$libvar" Set-Content "Env:${var}" $envvar } } @@ -154,11 +142,7 @@ function Set-Environment { if ($poco_base -eq '') { $script:poco_base = Get-Location } - switch ( $vs ) - { - 140 { } - default { Add-VSCOMNTOOLS $vs } - } + Add-VSCOMNTOOLS $vs if (-Not $Env:PATH.Contains("$Env:POCO_BASE\bin64;$Env:POCO_BASE\bin;")) { $Env:PATH = "$Env:POCO_BASE\bin64;$Env:POCO_BASE\bin;$Env:PATH" } @@ -191,11 +175,7 @@ function Set-Environment if ($platform -eq 'x64') { $CommandArg = "amd64" } elseif ($platform -eq 'ARM64') { $CommandArg = "ARM64" } else { $CommandArg = "x86" } - if ($vs -eq 150) - { - $Command = Resolve-Path "$($vsdir)\..\..\VC\Auxiliary\Build\vcvarsall.bat" - $script:msbuild_exe = Resolve-Path "$($vsdir)\..\..\MSBuild\15.0\Bin\MSBuild.exe" - } else { + if ($vs -eq 160) { $Command = Resolve-Path "$($vsdir)\..\..\VC\Auxiliary\Build\vcvarsall.bat" @@ -213,7 +193,7 @@ function Set-Environment $Command = Resolve-Path "$($vsdir)\..\..\VC\vcvarsall.bat" $script:msbuild_exe = "MSBuild.exe" } - }} + } $tempFile = [IO.Path]::GetTempFileName() cmd /c " `"$Command`" $CommandArg && set > `"$tempFile`" " @@ -234,7 +214,7 @@ function Process-Input Write-Host 'Usage:' Write-Host '------' Write-Host 'buildwin.ps1 [-poco_base ]' - Write-Host ' [-vs 140 | 150 | 160 | 170]' + Write-Host ' [-vs 160 | 170]' Write-Host ' [-action build | rebuild | clean]' Write-Host ' [-linkmode shared | static_mt | static_md | all]' Write-Host ' [-config release | debug | both]' @@ -562,9 +542,7 @@ function Build { Process-Input - if ($vs -lt 100) { $extension = 'vcproj' } - else { $extension = 'vcxproj' } - + $extension = 'vcxproj' BuildComponents $extension "lib" BuildComponents $extension "test" BuildComponents $extension "sample" diff --git a/doc/00200-GettingStarted.page b/doc/00200-GettingStarted.page index 7732b8743..fba509ff6 100644 --- a/doc/00200-GettingStarted.page +++ b/doc/00200-GettingStarted.page @@ -168,11 +168,21 @@ system. This requires Windows PowerShell. Usage: - C:\%POCO_BASE%\openssl\build.ps1 [-openssl_release 1.0.0 | 1.1.0] - [-vs_version 150 | 140 | 120 | 110 | 100 | 90] - [-config release | debug | both] - [-platform Win32 | x64] - [-library shared | static] + C:\%POCO_BASE%\openssl\buildwin.ps1 [-poco_base dir] + [-vs 160| 170] + [-action build | rebuild | clean] + [-linkmode shared | static_mt | static_md | all] + [-config release | debug | both] + [-platform Win32 | x64 | ARM64 | WEC2013] + [-samples] + [-tests] + [-omit "Lib1X,LibY,LibZ,..."] + [-components "Lib1X,LibY,LibZ,..."] + [-tool msbuild | devenv] + [-useenv env | noenv] + [-verbosity minimal | quiet | normal | detailed | diagnostic] + [-openssl_base dir] + [-mysql_base dir] ---- Example: Building OpenSSL 1.1.0, DLL release build for x64 with Visual Studio 2015: diff --git a/progen.ps1 b/progen.ps1 index 94831359c..4832923d2 100644 --- a/progen.ps1 +++ b/progen.ps1 @@ -4,7 +4,7 @@ # Usage: # ------ # progen.ps1 [-poco_base dir] -# [-vs 140 | 150 | 160| 170] +# [-vs 160| 170] # [-omit "Lib1X,LibY,LibZ,..."] # [-components "Lib1X,LibY,LibZ,..."] # [-platform Win32 | x64 | ARM64 | WEC2013] @@ -19,7 +19,7 @@ Param [string] $poco_base = $([System.Environment]::GetEnvironmentVariable('POCO_BASE')), [Parameter()] - [ValidateSet(140, 150, 160, 170)] + [ValidateSet(160, 170)] [int] $vs = 170, [string] $omit, @@ -44,7 +44,7 @@ function ProcessInput Write-Host 'Usage:' Write-Host '------' Write-Host 'progen.ps1 [-poco_base ]' - Write-Host ' [-vs 140 | 150 | 160 | 170]' + Write-Host ' [-vs 160 | 170]' Write-Host ' [-omit "Lib1X,LibY,LibZ,..."]' Write-Host ' [-components "Lib1X,LibY,LibZ,..."]' Write-Host ' [-samples]'