diff --git a/ApacheConnector/ApacheConnector_vs100.vcxproj b/ApacheConnector/ApacheConnector_vs100.vcxproj
index 509c1737c..4c87f6010 100644
--- a/ApacheConnector/ApacheConnector_vs100.vcxproj
+++ b/ApacheConnector/ApacheConnector_vs100.vcxproj
@@ -17,35 +17,35 @@
Win32Proj
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\bin\
- obj\$(Configuration)\
- true
- ..\bin\
- obj\$(Configuration)\
- false
- mod_pocod
- mod_poco
+ ..\bin\
+ obj\$(Configuration)\
+ true
+ ..\bin\
+ obj\$(Configuration)\
+ false
+ mod_pocod
+ mod_poco
-
+ Disabled.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)
@@ -76,7 +76,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
diff --git a/ApacheConnector/ApacheConnector_vs100.vcxproj.filters b/ApacheConnector/ApacheConnector_vs100.vcxproj.filters
index a0651b74b..660580810 100644
--- a/ApacheConnector/ApacheConnector_vs100.vcxproj.filters
+++ b/ApacheConnector/ApacheConnector_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
- {1b41dc76-2d5c-4abc-9fcf-40bf92616da2}
+ {b35eef93-0aad-40f5-9896-81336fb3f060}
- {f4221366-b450-4113-b43d-1303b840e629}
+ {5f7f785a-7d85-48e8-b553-a4f744155516}
diff --git a/ApacheConnector/ApacheConnector_vs110.vcxproj b/ApacheConnector/ApacheConnector_vs110.vcxproj
index daf278cd4..7760bf915 100644
--- a/ApacheConnector/ApacheConnector_vs110.vcxproj
+++ b/ApacheConnector/ApacheConnector_vs110.vcxproj
@@ -17,37 +17,41 @@
Win32Proj
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin\
- obj\$(Configuration)\
- true
- ..\bin\
- obj\$(Configuration)\
- false
- mod_pocod
- mod_poco
+ <_ProjectFileVersion>11.0.61030.0
+ mod_pocod
+ mod_poco
-
+
+ ..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\bin\
+ obj\$(Configuration)\
+ false
+
+ Disabled.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)
@@ -64,7 +68,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -78,7 +81,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -97,7 +100,6 @@
Level3Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
diff --git a/ApacheConnector/ApacheConnector_vs110.vcxproj.filters b/ApacheConnector/ApacheConnector_vs110.vcxproj.filters
index 28f1e219d..30e1e3c64 100644
--- a/ApacheConnector/ApacheConnector_vs110.vcxproj.filters
+++ b/ApacheConnector/ApacheConnector_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {bcfcc66b-9862-4e2e-a0b5-8fd70d179069}
+ {24141156-1824-417c-99d8-f66a365931ca}
- {8a381554-1ddd-46c8-b39c-998aff696f9e}
+ {85c68977-69ae-4eb0-a829-2e7038866515}
diff --git a/ApacheConnector/ApacheConnector_vs120.sln b/ApacheConnector/ApacheConnector_vs120.sln
index 178af66d8..21e16d63e 100644
--- a/ApacheConnector/ApacheConnector_vs120.sln
+++ b/ApacheConnector/ApacheConnector_vs120.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApacheConnector", "ApacheConnector_vs120.vcxproj", "{9866EE28-0612-4746-BD35-3B15B0AF7267}"
EndProject
Global
@@ -12,8 +10,10 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.Build.0 = debug_shared|Win32
+ {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.ActiveCfg = release_shared|Win32
{9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.Build.0 = release_shared|Win32
+ {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|Win32.Deploy.0 = release_shared|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ApacheConnector/ApacheConnector_vs120.vcxproj b/ApacheConnector/ApacheConnector_vs120.vcxproj
index ee5a0cb8d..bafa64ae2 100644
--- a/ApacheConnector/ApacheConnector_vs120.vcxproj
+++ b/ApacheConnector/ApacheConnector_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -16,7 +16,7 @@
ApacheConnectorWin32Proj
-
+ DynamicLibraryMultiByte
@@ -27,26 +27,30 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin\
- obj\$(Configuration)\
- true
- ..\bin\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
mod_pocodmod_poco
+
+ ..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\bin\
+ obj\$(Configuration)\
+ false
+ Disabled
@@ -60,11 +64,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -93,11 +96,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -113,23 +115,23 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/ApacheConnector/ApacheConnector_vs120.vcxproj.filters b/ApacheConnector/ApacheConnector_vs120.vcxproj.filters
index 28f1e219d..d00925d42 100644
--- a/ApacheConnector/ApacheConnector_vs120.vcxproj.filters
+++ b/ApacheConnector/ApacheConnector_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
- {bcfcc66b-9862-4e2e-a0b5-8fd70d179069}
+ {272e22ef-6c97-4767-93c3-20e1ddfcb73e}
- {8a381554-1ddd-46c8-b39c-998aff696f9e}
+ {01268de1-d0b2-4c05-a9c1-a73c6846b48d}
diff --git a/ApacheConnector/ApacheConnector_x64_vs100.vcxproj b/ApacheConnector/ApacheConnector_x64_vs100.vcxproj
index 2583983fb..1abc67309 100644
--- a/ApacheConnector/ApacheConnector_x64_vs100.vcxproj
+++ b/ApacheConnector/ApacheConnector_x64_vs100.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -16,7 +16,7 @@
ApacheConnectorWin32Proj
-
+ DynamicLibraryMultiByte
@@ -25,15 +25,15 @@
DynamicLibraryMultiByte
-
-
+
+
-
+
-
+
-
+
<_ProjectFileVersion>10.0.40219.1
..\bin64\
@@ -49,7 +49,7 @@
Disabled.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)
- WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -58,7 +58,7 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
@@ -84,16 +84,16 @@
Speedtrue.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)
- WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;ApacheHandlers_EXPORTS;%(PreprocessorDefinitions)trueMultiThreadedDLLfalsetruetruetrue
-
+ Level3
-
+ Default%(DisableSpecificWarnings)
@@ -111,23 +111,23 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/ApacheConnector/ApacheConnector_x64_vs100.vcxproj.filters b/ApacheConnector/ApacheConnector_x64_vs100.vcxproj.filters
index a391401a2..a2694cb07 100644
--- a/ApacheConnector/ApacheConnector_x64_vs100.vcxproj.filters
+++ b/ApacheConnector/ApacheConnector_x64_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
- {8ea424b5-ec7e-439b-a7be-1597c51e51ed}
+ {943f369b-ddd8-46a6-b093-c20987f49f5c}
- {bcfc1d48-58d4-4a01-9e80-15f35f162748}
+ {b0e12e37-8346-4862-b245-73460cac9e9f}
diff --git a/ApacheConnector/ApacheConnector_x64_vs110.vcxproj b/ApacheConnector/ApacheConnector_x64_vs110.vcxproj
index 6601aa7e3..3058c7e22 100644
--- a/ApacheConnector/ApacheConnector_x64_vs110.vcxproj
+++ b/ApacheConnector/ApacheConnector_x64_vs110.vcxproj
@@ -17,37 +17,41 @@
Win32Proj
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
- mod_poco64d
- mod_poco64
+ <_ProjectFileVersion>11.0.61030.0
+ mod_poco64d
+ mod_poco64
-
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
+
+ Disabled.\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories)
@@ -64,7 +68,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -78,7 +81,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -97,7 +100,6 @@
Level3Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
diff --git a/ApacheConnector/ApacheConnector_x64_vs110.vcxproj.filters b/ApacheConnector/ApacheConnector_x64_vs110.vcxproj.filters
index 1297e7b77..7eb40d2b2 100644
--- a/ApacheConnector/ApacheConnector_x64_vs110.vcxproj.filters
+++ b/ApacheConnector/ApacheConnector_x64_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {57457cff-8b1a-4dbc-9f41-a4e0cbb23577}
+ {c2481db8-8fd6-452b-9f71-0722bcd42816}
- {4c3f92e0-ae8b-4e62-a48a-e1555236766c}
+ {2f89aade-1adf-4a27-a0d5-1c9447b5f439}
diff --git a/ApacheConnector/ApacheConnector_x64_vs120.sln b/ApacheConnector/ApacheConnector_x64_vs120.sln
index ff81b9ba5..56cadf22f 100644
--- a/ApacheConnector/ApacheConnector_x64_vs120.sln
+++ b/ApacheConnector/ApacheConnector_x64_vs120.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApacheConnector", "ApacheConnector_x64_vs120.vcxproj", "{9866EE28-0612-4746-BD35-3B15B0AF7267}"
EndProject
Global
@@ -12,8 +10,10 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.ActiveCfg = debug_shared|x64
{9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.Build.0 = debug_shared|x64
+ {9866EE28-0612-4746-BD35-3B15B0AF7267}.debug_shared|x64.Deploy.0 = debug_shared|x64
{9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.ActiveCfg = release_shared|x64
{9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.Build.0 = release_shared|x64
+ {9866EE28-0612-4746-BD35-3B15B0AF7267}.release_shared|x64.Deploy.0 = release_shared|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ApacheConnector/ApacheConnector_x64_vs120.vcxproj b/ApacheConnector/ApacheConnector_x64_vs120.vcxproj
index 46e280d2f..422f524c6 100644
--- a/ApacheConnector/ApacheConnector_x64_vs120.vcxproj
+++ b/ApacheConnector/ApacheConnector_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -16,7 +16,7 @@
ApacheConnectorWin32Proj
-
+ DynamicLibraryMultiByte
@@ -27,26 +27,30 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
mod_poco64dmod_poco64
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
+ Disabled
@@ -60,11 +64,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -93,11 +96,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -113,23 +115,23 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/ApacheConnector/ApacheConnector_x64_vs120.vcxproj.filters b/ApacheConnector/ApacheConnector_x64_vs120.vcxproj.filters
index 1297e7b77..adf5dc17b 100644
--- a/ApacheConnector/ApacheConnector_x64_vs120.vcxproj.filters
+++ b/ApacheConnector/ApacheConnector_x64_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
- {57457cff-8b1a-4dbc-9f41-a4e0cbb23577}
+ {0048e337-4ac1-4bc0-a27a-363f532ae734}
- {4c3f92e0-ae8b-4e62-a48a-e1555236766c}
+ {70473c59-1b66-4809-b369-d827f40f3074}
diff --git a/ApacheConnector/include/ApacheApplication.h b/ApacheConnector/include/ApacheApplication.h
old mode 100644
new mode 100755
index 0aabd1eae..3450bc1a5
--- a/ApacheConnector/include/ApacheApplication.h
+++ b/ApacheConnector/include/ApacheApplication.h
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/include/ApacheChannel.h b/ApacheConnector/include/ApacheChannel.h
old mode 100644
new mode 100755
index 8cf3f266a..cc66d3d00
--- a/ApacheConnector/include/ApacheChannel.h
+++ b/ApacheConnector/include/ApacheChannel.h
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/include/ApacheConnector.h b/ApacheConnector/include/ApacheConnector.h
old mode 100644
new mode 100755
index 4fa9d5f03..48ea96cef
--- a/ApacheConnector/include/ApacheConnector.h
+++ b/ApacheConnector/include/ApacheConnector.h
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/include/ApacheRequestHandlerFactory.h b/ApacheConnector/include/ApacheRequestHandlerFactory.h
old mode 100644
new mode 100755
index d746c0e22..f5fdc6e03
--- a/ApacheConnector/include/ApacheRequestHandlerFactory.h
+++ b/ApacheConnector/include/ApacheRequestHandlerFactory.h
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/include/ApacheServerRequest.h b/ApacheConnector/include/ApacheServerRequest.h
old mode 100644
new mode 100755
index ef05f6dd7..e28b953a5
--- a/ApacheConnector/include/ApacheServerRequest.h
+++ b/ApacheConnector/include/ApacheServerRequest.h
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/include/ApacheServerResponse.h b/ApacheConnector/include/ApacheServerResponse.h
old mode 100644
new mode 100755
index c24bab31a..7518f62ee
--- a/ApacheConnector/include/ApacheServerResponse.h
+++ b/ApacheConnector/include/ApacheServerResponse.h
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/include/ApacheStream.h b/ApacheConnector/include/ApacheStream.h
old mode 100644
new mode 100755
index 8b26c9c8b..634794cc7
--- a/ApacheConnector/include/ApacheStream.h
+++ b/ApacheConnector/include/ApacheStream.h
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/samples/FormServer/FormServer_vs100.vcxproj b/ApacheConnector/samples/FormServer/FormServer_vs100.vcxproj
index f9e23751e..f933327df 100644
--- a/ApacheConnector/samples/FormServer/FormServer_vs100.vcxproj
+++ b/ApacheConnector/samples/FormServer/FormServer_vs100.vcxproj
@@ -17,35 +17,35 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- FormServerd
- FormServer
+ bin\
+ obj\$(Configuration)\
+ true
+ bin\
+ obj\$(Configuration)\
+ false
+ FormServerd
+ FormServer
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)
@@ -75,7 +75,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
diff --git a/ApacheConnector/samples/FormServer/FormServer_vs100.vcxproj.filters b/ApacheConnector/samples/FormServer/FormServer_vs100.vcxproj.filters
index 5743ec362..3540f058d 100644
--- a/ApacheConnector/samples/FormServer/FormServer_vs100.vcxproj.filters
+++ b/ApacheConnector/samples/FormServer/FormServer_vs100.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {f15b6455-ee37-47e9-adb8-a9f91180df9b}
+ {209bc63a-ce20-4978-ae58-4a6e787a1ddd}
diff --git a/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj b/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj
index a1dd22da6..12865ca35 100644
--- a/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj
+++ b/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj
@@ -17,37 +17,41 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- FormServerd
- FormServer
+ <_ProjectFileVersion>11.0.61030.0
+ FormServerd
+ FormServer
-
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)
@@ -64,7 +68,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -77,7 +80,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -96,7 +99,6 @@
Level3Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
diff --git a/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.filters b/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.filters
index 3831b4543..756e31d62 100644
--- a/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.filters
+++ b/ApacheConnector/samples/FormServer/FormServer_vs110.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {f04495ba-92b9-4f76-9a8b-320a860f09f6}
+ {227f9697-5f24-43c5-9a15-66c13d3f0656}
diff --git a/ApacheConnector/samples/FormServer/FormServer_vs120.vcxproj b/ApacheConnector/samples/FormServer/FormServer_vs120.vcxproj
index 580bb4896..df372fea6 100644
--- a/ApacheConnector/samples/FormServer/FormServer_vs120.vcxproj
+++ b/ApacheConnector/samples/FormServer/FormServer_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -16,7 +16,7 @@
FormServerWin32Proj
-
+ ApplicationMultiByte
@@ -27,26 +27,30 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
FormServerdFormServer
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+ Disabled
@@ -60,11 +64,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -92,11 +95,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -110,8 +112,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/ApacheConnector/samples/FormServer/FormServer_vs120.vcxproj.filters b/ApacheConnector/samples/FormServer/FormServer_vs120.vcxproj.filters
index 3831b4543..c935265d8 100644
--- a/ApacheConnector/samples/FormServer/FormServer_vs120.vcxproj.filters
+++ b/ApacheConnector/samples/FormServer/FormServer_vs120.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {f04495ba-92b9-4f76-9a8b-320a860f09f6}
+ {1823d1bd-b7f9-4a71-94c6-59367ddaa603}
diff --git a/ApacheConnector/samples/FormServer/FormServer_x64_vs100.vcxproj b/ApacheConnector/samples/FormServer/FormServer_x64_vs100.vcxproj
index 8d32c35fe..968ced398 100644
--- a/ApacheConnector/samples/FormServer/FormServer_x64_vs100.vcxproj
+++ b/ApacheConnector/samples/FormServer/FormServer_x64_vs100.vcxproj
@@ -17,35 +17,35 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- FormServerd
- FormServer
+ bin64\
+ obj64\$(Configuration)\
+ true
+ bin64\
+ obj64\$(Configuration)\
+ false
+ FormServerd
+ FormServer
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)
@@ -75,7 +75,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
diff --git a/ApacheConnector/samples/FormServer/FormServer_x64_vs100.vcxproj.filters b/ApacheConnector/samples/FormServer/FormServer_x64_vs100.vcxproj.filters
index 980bfa4ca..0888be4b4 100644
--- a/ApacheConnector/samples/FormServer/FormServer_x64_vs100.vcxproj.filters
+++ b/ApacheConnector/samples/FormServer/FormServer_x64_vs100.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {274d01a8-2c80-4883-9261-c41efe4e0328}
+ {a1049034-f788-4075-b768-4ccd7f218431}
diff --git a/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj b/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj
index aa3ad0c98..3a3fb6d9e 100644
--- a/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj
+++ b/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj
@@ -17,37 +17,41 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- FormServerd
- FormServer
+ <_ProjectFileVersion>11.0.61030.0
+ FormServerd
+ FormServer
-
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)
@@ -64,7 +68,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -77,7 +80,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -96,7 +99,6 @@
Level3Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
diff --git a/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.filters b/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.filters
index 26866cd09..889a183d0 100644
--- a/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.filters
+++ b/ApacheConnector/samples/FormServer/FormServer_x64_vs110.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {cf61aa07-a25d-472f-8e40-4dfb7177eee9}
+ {5c84b518-546a-40cd-9ce5-6edd742b9647}
diff --git a/ApacheConnector/samples/FormServer/FormServer_x64_vs120.vcxproj b/ApacheConnector/samples/FormServer/FormServer_x64_vs120.vcxproj
index 5b0cc1a68..5eda3ec13 100644
--- a/ApacheConnector/samples/FormServer/FormServer_x64_vs120.vcxproj
+++ b/ApacheConnector/samples/FormServer/FormServer_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -16,7 +16,7 @@
FormServerWin32Proj
-
+ ApplicationMultiByte
@@ -27,26 +27,30 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
FormServerdFormServer
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+ Disabled
@@ -60,11 +64,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -92,11 +95,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -110,8 +112,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/ApacheConnector/samples/FormServer/FormServer_x64_vs120.vcxproj.filters b/ApacheConnector/samples/FormServer/FormServer_x64_vs120.vcxproj.filters
index 26866cd09..780116635 100644
--- a/ApacheConnector/samples/FormServer/FormServer_x64_vs120.vcxproj.filters
+++ b/ApacheConnector/samples/FormServer/FormServer_x64_vs120.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {cf61aa07-a25d-472f-8e40-4dfb7177eee9}
+ {79d5357d-fe71-4677-8376-c3e132346c4d}
diff --git a/ApacheConnector/samples/FormServer/src/FormServer.cpp b/ApacheConnector/samples/FormServer/src/FormServer.cpp
old mode 100644
new mode 100755
index 04992d352..e08ff07b3
--- a/ApacheConnector/samples/FormServer/src/FormServer.cpp
+++ b/ApacheConnector/samples/FormServer/src/FormServer.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs100.vcxproj b/ApacheConnector/samples/TimeServer/TimeServer_vs100.vcxproj
index 6ac623cfd..516b3c63f 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_vs100.vcxproj
+++ b/ApacheConnector/samples/TimeServer/TimeServer_vs100.vcxproj
@@ -17,35 +17,35 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- TimeServerd
- TimeServer
+ bin\
+ obj\$(Configuration)\
+ true
+ bin\
+ obj\$(Configuration)\
+ false
+ TimeServerd
+ TimeServer
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)
@@ -75,7 +75,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs100.vcxproj.filters b/ApacheConnector/samples/TimeServer/TimeServer_vs100.vcxproj.filters
index 927adb421..a866d86d7 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_vs100.vcxproj.filters
+++ b/ApacheConnector/samples/TimeServer/TimeServer_vs100.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {29521eeb-44f6-411c-86be-29354be3718e}
+ {612eae0d-ce89-4a1c-bd0e-f2aa6f213300}
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj b/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj
index 159fa5f81..f90f600bf 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj
+++ b/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj
@@ -17,37 +17,41 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- TimeServerd
- TimeServer
+ <_ProjectFileVersion>11.0.61030.0
+ TimeServerd
+ TimeServer
-
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)
@@ -64,7 +68,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -77,7 +80,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -96,7 +99,6 @@
Level3Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.filters b/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.filters
index bc1ba1391..808f2a938 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.filters
+++ b/ApacheConnector/samples/TimeServer/TimeServer_vs110.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {6b63f475-55cd-49a0-bcea-bcf2786135f0}
+ {24980eb0-5ad3-4acc-9e07-8de774a05ba7}
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs120.vcxproj b/ApacheConnector/samples/TimeServer/TimeServer_vs120.vcxproj
index bb4f096ca..2a02294a2 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_vs120.vcxproj
+++ b/ApacheConnector/samples/TimeServer/TimeServer_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -16,7 +16,7 @@
TimeServerWin32Proj
-
+ ApplicationMultiByte
@@ -27,26 +27,30 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TimeServerdTimeServer
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+ Disabled
@@ -60,11 +64,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -92,11 +95,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -110,8 +112,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_vs120.vcxproj.filters b/ApacheConnector/samples/TimeServer/TimeServer_vs120.vcxproj.filters
index bc1ba1391..f8dd42bd2 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_vs120.vcxproj.filters
+++ b/ApacheConnector/samples/TimeServer/TimeServer_vs120.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {6b63f475-55cd-49a0-bcea-bcf2786135f0}
+ {ba03e747-bf6c-41cb-ad7c-1b31c6ac3ca7}
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs100.vcxproj b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs100.vcxproj
index 3f29c7543..147be1a93 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs100.vcxproj
+++ b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs100.vcxproj
@@ -17,35 +17,35 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- TimeServerd
- TimeServer
+ bin64\
+ obj64\$(Configuration)\
+ true
+ bin64\
+ obj64\$(Configuration)\
+ false
+ TimeServerd
+ TimeServer
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)
@@ -75,7 +75,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs100.vcxproj.filters b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs100.vcxproj.filters
index 69aaa26f8..9659b5c14 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs100.vcxproj.filters
+++ b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs100.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {2b9f99c8-e72f-4c5b-8970-bc695d6b055d}
+ {2539dff5-e15b-400f-b11d-a6667448b51e}
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj
index d0cf80303..ce53af5b8 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj
+++ b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj
@@ -17,37 +17,41 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- TimeServerd
- TimeServer
+ <_ProjectFileVersion>11.0.61030.0
+ TimeServerd
+ TimeServer
-
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)
@@ -64,7 +68,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -77,7 +80,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -96,7 +99,6 @@
Level3Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters
index 55f11c915..c6b4b08db 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters
+++ b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs110.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {48644633-75a0-496d-a852-1916511051e0}
+ {bfaed7f5-e01b-43c0-a405-ce55a78a8376}
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs120.vcxproj b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs120.vcxproj
index 07a503812..9936156f2 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs120.vcxproj
+++ b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -16,7 +16,7 @@
TimeServerWin32Proj
-
+ ApplicationMultiByte
@@ -27,26 +27,30 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TimeServerdTimeServer
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+ Disabled
@@ -60,11 +64,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -92,11 +95,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)
@@ -110,8 +112,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs120.vcxproj.filters b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs120.vcxproj.filters
index 55f11c915..581042a04 100644
--- a/ApacheConnector/samples/TimeServer/TimeServer_x64_vs120.vcxproj.filters
+++ b/ApacheConnector/samples/TimeServer/TimeServer_x64_vs120.vcxproj.filters
@@ -6,7 +6,7 @@
cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx
- {48644633-75a0-496d-a852-1916511051e0}
+ {e55b8e97-aa26-48ed-b076-c24a7fb3ac89}
diff --git a/ApacheConnector/samples/TimeServer/src/TimeServer.cpp b/ApacheConnector/samples/TimeServer/src/TimeServer.cpp
old mode 100644
new mode 100755
index 9c41565f4..6e40e900d
--- a/ApacheConnector/samples/TimeServer/src/TimeServer.cpp
+++ b/ApacheConnector/samples/TimeServer/src/TimeServer.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/samples/samples_vs120.sln b/ApacheConnector/samples/samples_vs120.sln
index f96452c56..1fd8c6a4f 100644
--- a/ApacheConnector/samples/samples_vs120.sln
+++ b/ApacheConnector/samples/samples_vs120.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormServer", "FormServer\FormServer_vs120.vcxproj", "{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_vs120.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}"
@@ -14,12 +12,16 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.Build.0 = debug_shared|Win32
+ {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.ActiveCfg = release_shared|Win32
{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.Build.0 = release_shared|Win32
+ {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|Win32.Deploy.0 = release_shared|Win32
{59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Build.0 = debug_shared|Win32
+ {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.ActiveCfg = release_shared|Win32
{59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Build.0 = release_shared|Win32
+ {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|Win32.Deploy.0 = release_shared|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ApacheConnector/samples/samples_x64_vs120.sln b/ApacheConnector/samples/samples_x64_vs120.sln
index d674d67e4..1b5f002a3 100644
--- a/ApacheConnector/samples/samples_x64_vs120.sln
+++ b/ApacheConnector/samples/samples_x64_vs120.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormServer", "FormServer\FormServer_x64_vs120.vcxproj", "{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TimeServer", "TimeServer\TimeServer_x64_vs120.vcxproj", "{59EDFD20-9968-30F7-9532-44C08DA58C6E}"
@@ -14,12 +12,16 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.ActiveCfg = debug_shared|x64
{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.Build.0 = debug_shared|x64
+ {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.debug_shared|x64.Deploy.0 = debug_shared|x64
{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.ActiveCfg = release_shared|x64
{CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.Build.0 = release_shared|x64
+ {CD77A9BA-6E9B-39EF-801A-1C7E66B19106}.release_shared|x64.Deploy.0 = release_shared|x64
{59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.ActiveCfg = debug_shared|x64
{59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Build.0 = debug_shared|x64
+ {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|x64.Deploy.0 = debug_shared|x64
{59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.ActiveCfg = release_shared|x64
{59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Build.0 = release_shared|x64
+ {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|x64.Deploy.0 = release_shared|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ApacheConnector/src/ApacheApplication.cpp b/ApacheConnector/src/ApacheApplication.cpp
old mode 100644
new mode 100755
index e5b3830e8..d187b3b94
--- a/ApacheConnector/src/ApacheApplication.cpp
+++ b/ApacheConnector/src/ApacheApplication.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/src/ApacheChannel.cpp b/ApacheConnector/src/ApacheChannel.cpp
old mode 100644
new mode 100755
index 4c8d603de..881ece3f5
--- a/ApacheConnector/src/ApacheChannel.cpp
+++ b/ApacheConnector/src/ApacheChannel.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/src/ApacheConnector.cpp b/ApacheConnector/src/ApacheConnector.cpp
old mode 100644
new mode 100755
index 62eb29ba8..725cffd23
--- a/ApacheConnector/src/ApacheConnector.cpp
+++ b/ApacheConnector/src/ApacheConnector.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/src/ApacheRequestHandlerFactory.cpp b/ApacheConnector/src/ApacheRequestHandlerFactory.cpp
old mode 100644
new mode 100755
index 18e1832ca..f8ddb04ec
--- a/ApacheConnector/src/ApacheRequestHandlerFactory.cpp
+++ b/ApacheConnector/src/ApacheRequestHandlerFactory.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/src/ApacheServerRequest.cpp b/ApacheConnector/src/ApacheServerRequest.cpp
old mode 100644
new mode 100755
index a836f74ad..14d16931b
--- a/ApacheConnector/src/ApacheServerRequest.cpp
+++ b/ApacheConnector/src/ApacheServerRequest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/src/ApacheServerResponse.cpp b/ApacheConnector/src/ApacheServerResponse.cpp
old mode 100644
new mode 100755
index 3906bac8b..17ce2db6b
--- a/ApacheConnector/src/ApacheServerResponse.cpp
+++ b/ApacheConnector/src/ApacheServerResponse.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/ApacheConnector/src/ApacheStream.cpp b/ApacheConnector/src/ApacheStream.cpp
old mode 100644
new mode 100755
index 3ec484045..4e00e078f
--- a/ApacheConnector/src/ApacheStream.cpp
+++ b/ApacheConnector/src/ApacheStream.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006-2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CHANGELOG b/CHANGELOG
index ad60900ca..60daef91f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -33,10 +33,35 @@ Release 1.5.3 (2014-05-xx)
- fixed GH #380: SecureSocket+DialogSocket crashes with SIGSEGV when timeout occours
- Improve RSADigestEngine, using Poco::Crypto::DigestEngine to calculate hash before signing
- added Poco::PBKDF2Engine
+- Fixed GH #380: SecureSocket+DialogSocket crashes with SIGSEGV when timeout occours
- added support for a 'Priority' attribute on cookies.
- GH #386: fixed bug in MailMessage without content-transfer-encoding header
- GH #384: ew hash algorithms support for RSADigestEngine
-
+- fixed Clock overflow bug on Windows
+- Poco::ByteOrder now uses intrinsics, if available
+- CMake: added /bigobj option for msvc
+- Fix typo to restore Net/TestSuite_x64_vs120 build
+- correct path for CONFIGURE_FILE in CMakeLists.txt
+- Building Poco 1.5.2 for Synology RS812+ (Intel Atom) (honor POCO_NO_INOTIFY)
+- added WEC2013 support to buildwin.cmd and buildwin.ps1
+- HTMLForm: in URL encoding, percent-encode more characters
+- Fixed #include conflict with other libraries
+- Poco::Net::X509Certificate::verify() no longer uses DNS reverse lookups to validate host names
+- cert hostname validation is case insensitive and stricter for wildcard certificates
+- TCPServer: do not reduce the capacity of the default ThreadPool
+- added POCO_LOG_DEBUG flag
+- Zip: fixed a crash caused by an I/O error
+- added runtest script for windows
+- added SQlite Full Text Search support
+- added Thread::trySleep() and Thread::wakeUp()
+- fixed GH #410: Bug in JSON::Object.stringify() in 1.5.2
+- fixed GH #362: Defect in Var::parseString when there is no space between value and newline
+- fixed GH #314: JSON parsing bug
+- added GH #313: MetaColumn additions for Data::ODBC and Data::SQLite
+- fixed GH #346: Make Poco::Data::Date and Poco::Data::Time compare functions const.
+- fixed GH #341: Compiling poco-1.5.2 for Cygwin
+- fixed GH #305: There are bugs in Buffer.h
+- fixed GH #321: trivial build fixes (BB QNX build)
Release 1.5.2 (2013-09-16)
==========================
diff --git a/CppParser/CppParser.progen b/CppParser/CppParser.progen
index 0739d4568..b8097e2eb 100644
--- a/CppParser/CppParser.progen
+++ b/CppParser/CppParser.progen
@@ -4,7 +4,7 @@ vc.project.target = Poco${vc.project.name}
vc.project.type = library
vc.project.pocobase = ..
vc.project.outdir = ${vc.project.pocobase}
-vc.project.platforms = Win32, x64, WinCE
+vc.project.platforms = Win32, x64
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
diff --git a/CppParser/CppParser_vs100.vcxproj b/CppParser/CppParser_vs100.vcxproj
index fb45e5001..da9c95731 100644
--- a/CppParser/CppParser_vs100.vcxproj
+++ b/CppParser/CppParser_vs100.vcxproj
@@ -33,75 +33,75 @@
Win32Proj
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\bin\
- obj\$(Configuration)\
- true
- ..\bin\
- obj\$(Configuration)\
- false
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- PocoCppParserd
- PocoCppParsermdd
- PocoCppParsermtd
- PocoCppParser
- PocoCppParsermd
- PocoCppParsermt
+ ..\bin\
+ obj\$(Configuration)\
+ true
+ ..\bin\
+ obj\$(Configuration)\
+ false
+ ..\lib\
+ obj\$(Configuration)\
+ ..\lib\
+ obj\$(Configuration)\
+ ..\lib\
+ obj\$(Configuration)\
+ ..\lib\
+ obj\$(Configuration)\
+ PocoCppParserd
+ PocoCppParsermdd
+ PocoCppParsermtd
+ PocoCppParser
+ PocoCppParsermd
+ PocoCppParsermt
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -132,7 +132,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -166,7 +166,7 @@
MachineX86
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -190,7 +190,7 @@
..\lib\PocoCppParsermtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,7 +215,7 @@
..\lib\PocoCppParsermt.lib
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -239,7 +239,7 @@
..\lib\PocoCppParsermdd.lib
-
+ DisabledOnlyExplicitInline
diff --git a/CppParser/CppParser_vs100.vcxproj.filters b/CppParser/CppParser_vs100.vcxproj.filters
index 25133b258..f22794922 100644
--- a/CppParser/CppParser_vs100.vcxproj.filters
+++ b/CppParser/CppParser_vs100.vcxproj.filters
@@ -2,31 +2,31 @@
- {0de1e4c2-7981-448e-8fa7-dd860a0bf734}
+ {9f4a6f27-bd06-4f26-8397-6eb7e4ad2ec9}
- {b646c19b-967a-48c7-9dc9-8b073b84c071}
+ {3318b9f4-5975-464a-abe9-daff81bcb26a}
- {9f794384-3146-4a72-ba9c-f60346a9f55c}
+ {39b67b11-900d-4e5f-ac08-5359e048c1b4}
- {0d441282-2c28-4d3f-9c80-066f3fb5c156}
+ {26dd4d56-e131-4e38-b0a7-c8044b604cc9}
- {6a8d173b-488c-4aec-8d4e-83b687680088}
+ {422e5157-748d-4656-9202-d7c7e6df9fe5}
- {b062fe72-2363-4b1e-a71c-e986d95a20eb}
+ {d0edc27c-7001-45e9-8209-a1f1ea2fed40}
- {2ec881d9-fe2a-4f0e-ac28-e61d01eadac0}
+ {20a9aedd-4896-4823-aa51-1660fcda8f00}
- {2326fad4-7fe9-4ddb-84ef-563f605b8d5e}
+ {2a127470-866f-4b5e-9d8e-4bceda146dde}
- {e6601398-0222-4e2c-85f6-0e9070610b26}
+ {cc936f9f-c2af-4680-bf2d-192e61e5fcd5}
diff --git a/CppParser/CppParser_vs110.vcxproj b/CppParser/CppParser_vs110.vcxproj
index b49e01a4f..82c522af1 100644
--- a/CppParser/CppParser_vs110.vcxproj
+++ b/CppParser/CppParser_vs110.vcxproj
@@ -33,81 +33,93 @@
Win32Proj
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin\
- obj\$(Configuration)\
- true
- ..\bin\
- obj\$(Configuration)\
- false
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- PocoCppParserd
- PocoCppParsermdd
- PocoCppParsermtd
- PocoCppParser
- PocoCppParsermd
- PocoCppParsermt
+ <_ProjectFileVersion>11.0.61030.0
+ PocoCppParserd
+ PocoCppParsermdd
+ PocoCppParsermtd
+ PocoCppParser
+ PocoCppParsermd
+ PocoCppParsermt
-
+
+ ..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\bin\
+ obj\$(Configuration)\
+ false
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -124,10 +136,8 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin\PocoCppParserd.dlltruetrue
@@ -138,7 +148,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -157,10 +167,8 @@
Level3Default
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin\PocoCppParser.dlltruefalse
@@ -172,7 +180,7 @@
MachineX86
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -190,13 +198,12 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoCppParsermtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,13 +222,12 @@
Level3Default
- %(DisableSpecificWarnings)..\lib\PocoCppParsermt.lib
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -239,13 +245,12 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoCppParsermdd.lib
-
+ DisabledOnlyExplicitInline
@@ -265,10 +270,8 @@
Level3Default
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\lib\PocoCppParsermd.lib
diff --git a/CppParser/CppParser_vs110.vcxproj.filters b/CppParser/CppParser_vs110.vcxproj.filters
index 43db4928e..7380f5c8b 100644
--- a/CppParser/CppParser_vs110.vcxproj.filters
+++ b/CppParser/CppParser_vs110.vcxproj.filters
@@ -2,31 +2,31 @@
- {cbc61880-2fcb-4c75-80cc-e49543522474}
+ {32507dce-f373-464f-bdd0-a314490d53a6}
- {5c023da7-8192-46c0-afd0-befffaa493b7}
+ {43bd78b2-17f2-4afd-a222-0e89a7b2c193}
- {ad5d25e9-fad4-432f-b697-36e1a3314b40}
+ {8e35d146-0ccf-4096-87d0-689002ad4418}
- {636ad43b-5fe3-4edf-9b7b-2581ef8c87fa}
+ {bb86f6f5-9a62-4d48-9ab8-0ac4fced21a7}
- {3b40acd4-2766-4dd5-840e-273c3d5936a8}
+ {6ad36d07-6c9e-46d5-971b-f52298eb7ee0}
- {8e2c1098-1177-4d3b-9bf5-0e8f37aa9c6e}
+ {378a67aa-8ebe-425a-9f09-a563d92b3b85}
- {288a9d31-0b85-431a-86d0-8e1c74271041}
+ {bc32a97d-d355-449a-934f-7be7cdfc5dfc}
- {c529b477-caa5-4703-abfe-4f36171bad69}
+ {1284363b-c7f9-4347-94aa-d68e89b4a533}
- {13164377-cd24-4ea0-af3f-8f6c8ae5f456}
+ {ca44a19d-258a-443b-932c-235311b8a1af}
diff --git a/CppParser/CppParser_vs120.sln b/CppParser/CppParser_vs120.sln
index 3420ced8c..f6c1cb4e4 100644
--- a/CppParser/CppParser_vs120.sln
+++ b/CppParser/CppParser_vs120.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_vs120.vcxproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{C79112BD-EC91-11DA-A4CE-005056C00008}"
@@ -12,37 +10,49 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|Win32 = debug_shared|Win32
- debug_static_md|Win32 = debug_static_md|Win32
- debug_static_mt|Win32 = debug_static_mt|Win32
release_shared|Win32 = release_shared|Win32
- release_static_md|Win32 = release_static_md|Win32
+ debug_static_mt|Win32 = debug_static_mt|Win32
release_static_mt|Win32 = release_static_mt|Win32
+ debug_static_md|Win32 = debug_static_md|Win32
+ release_static_md|Win32 = release_static_md|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.ActiveCfg = release_shared|Win32
{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Build.0 = release_shared|Win32
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.ActiveCfg = release_shared|Win32
{C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Build.0 = release_shared|Win32
- {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/CppParser/CppParser_vs120.vcxproj b/CppParser/CppParser_vs120.vcxproj
index c917c757a..e618e79e6 100644
--- a/CppParser/CppParser_vs120.vcxproj
+++ b/CppParser/CppParser_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
CppParserWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin\
- obj\$(Configuration)\
- true
- ..\bin\
- obj\$(Configuration)\
- false
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoCppParserdPocoCppParsermddPocoCppParsermtd
@@ -107,6 +93,32 @@
PocoCppParsermdPocoCppParsermt
+
+ ..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\bin\
+ obj\$(Configuration)\
+ false
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+ Disabled
@@ -120,14 +132,12 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin\PocoCppParserd.dlltruetrue
@@ -153,14 +163,12 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin\PocoCppParser.dlltruefalse
@@ -185,12 +193,11 @@
truetruetrue
-
+ ..\lib\PocoCppParsermtd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoCppParsermtd.lib
@@ -211,11 +218,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\lib\PocoCppParsermt.lib
@@ -234,12 +240,11 @@
truetruetrue
-
+ ..\lib\PocoCppParsermdd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoCppParsermdd.lib
@@ -260,57 +265,55 @@
truetruetrue
-
+ ..\lib\PocoCppParsermd.pdbLevel3
-
+ Default
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\lib\PocoCppParsermd.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/CppParser/CppParser_vs120.vcxproj.filters b/CppParser/CppParser_vs120.vcxproj.filters
index 43db4928e..7e030a983 100644
--- a/CppParser/CppParser_vs120.vcxproj.filters
+++ b/CppParser/CppParser_vs120.vcxproj.filters
@@ -2,31 +2,31 @@
- {cbc61880-2fcb-4c75-80cc-e49543522474}
+ {906d3532-fdcf-4ba2-a1c0-ca689fdb7fe9}
- {5c023da7-8192-46c0-afd0-befffaa493b7}
+ {9c217fd6-406e-46ee-b03a-34592809ba90}
- {ad5d25e9-fad4-432f-b697-36e1a3314b40}
+ {3386fb69-b904-410f-8fe0-c9db10183762}
- {636ad43b-5fe3-4edf-9b7b-2581ef8c87fa}
+ {ae3d7b71-59a2-4a03-8434-2998b2494396}
- {3b40acd4-2766-4dd5-840e-273c3d5936a8}
+ {77ab7c91-f553-4b9a-b250-9832fc85d2d1}
- {8e2c1098-1177-4d3b-9bf5-0e8f37aa9c6e}
+ {ee6228e0-d5ad-4142-9cd3-815f5cb9c57b}
- {288a9d31-0b85-431a-86d0-8e1c74271041}
+ {8f83d24f-30b7-4be7-b5c3-540e587902d9}
- {c529b477-caa5-4703-abfe-4f36171bad69}
+ {e883924a-f5a2-426a-864f-248a0b6e5a29}
- {13164377-cd24-4ea0-af3f-8f6c8ae5f456}
+ {26e3687d-72a9-4fe1-863e-b049b8cc1db3}
diff --git a/CppParser/CppParser_x64_vs100.vcxproj b/CppParser/CppParser_x64_vs100.vcxproj
index 3917b9366..ee52f223c 100644
--- a/CppParser/CppParser_x64_vs100.vcxproj
+++ b/CppParser/CppParser_x64_vs100.vcxproj
@@ -33,75 +33,75 @@
Win32Proj
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- PocoCppParser64d
- PocoCppParsermdd
- PocoCppParsermtd
- PocoCppParser64
- PocoCppParsermd
- PocoCppParsermt
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ PocoCppParser64d
+ PocoCppParsermdd
+ PocoCppParsermtd
+ PocoCppParser64
+ PocoCppParsermd
+ PocoCppParsermt
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -132,7 +132,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -166,7 +166,7 @@
MachineX64
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -190,7 +190,7 @@
..\lib64\PocoCppParsermtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,7 +215,7 @@
..\lib64\PocoCppParsermt.lib
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -239,7 +239,7 @@
..\lib64\PocoCppParsermdd.lib
-
+ DisabledOnlyExplicitInline
diff --git a/CppParser/CppParser_x64_vs100.vcxproj.filters b/CppParser/CppParser_x64_vs100.vcxproj.filters
index 105992ab8..54d1f8153 100644
--- a/CppParser/CppParser_x64_vs100.vcxproj.filters
+++ b/CppParser/CppParser_x64_vs100.vcxproj.filters
@@ -2,31 +2,31 @@
- {ae1a4140-b96f-472a-80a4-4083ea787ba2}
+ {59b3a40b-1431-4053-9cbd-59e48576b624}
- {ee63f63c-180a-4699-bf75-5c666927fb32}
+ {d978112a-27fd-463f-b71c-cd237a515c5b}
- {6feff95f-1e00-4e0c-bc54-a402b6af4d9c}
+ {fb7ba022-7e99-4021-95a5-e31fe930fe32}
- {e9d3a912-179a-4763-849f-d527017b5921}
+ {badc08b1-e402-4c81-8757-93c5943b28ea}
- {90ddaeec-3f66-45ef-b3b7-df28262ea58b}
+ {d5c6c527-a5b0-4404-a737-746b22e166ad}
- {03696103-dbc7-4bec-ba70-defc6fa12a74}
+ {85e8d888-41a1-47e8-b7aa-84b24cdde5ab}
- {f008c3da-bc1d-4698-a22a-269dead7ef94}
+ {1c537d23-d6e5-42d2-abce-d935f240af7d}
- {b028b1bd-ff96-4979-9a30-b924df8eb682}
+ {84aee57f-59e2-4de0-a2d5-45eac9f1da17}
- {6fbbae37-a30e-4d51-be2d-3ffa673983cc}
+ {0f8d7982-c07e-4469-a48a-7c2172379796}
diff --git a/CppParser/CppParser_x64_vs110.vcxproj b/CppParser/CppParser_x64_vs110.vcxproj
index 2ba868a4f..5369d7ee2 100644
--- a/CppParser/CppParser_x64_vs110.vcxproj
+++ b/CppParser/CppParser_x64_vs110.vcxproj
@@ -33,81 +33,93 @@
Win32Proj
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- PocoCppParser64d
- PocoCppParsermdd
- PocoCppParsermtd
- PocoCppParser64
- PocoCppParsermd
- PocoCppParsermt
+ <_ProjectFileVersion>11.0.61030.0
+ PocoCppParser64d
+ PocoCppParsermdd
+ PocoCppParsermtd
+ PocoCppParser64
+ PocoCppParsermd
+ PocoCppParsermt
-
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -124,10 +136,8 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin64\PocoCppParser64d.dlltruetrue
@@ -138,7 +148,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -157,10 +167,8 @@
Level3Default
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin64\PocoCppParser64.dlltruefalse
@@ -172,7 +180,7 @@
MachineX64
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -190,13 +198,12 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\lib64\PocoCppParsermtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,13 +222,12 @@
Level3Default
- %(DisableSpecificWarnings)..\lib64\PocoCppParsermt.lib
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -239,13 +245,12 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\lib64\PocoCppParsermdd.lib
-
+ DisabledOnlyExplicitInline
@@ -264,7 +269,6 @@
Level3Default
- %(DisableSpecificWarnings)..\lib64\PocoCppParsermd.lib
diff --git a/CppParser/CppParser_x64_vs110.vcxproj.filters b/CppParser/CppParser_x64_vs110.vcxproj.filters
index e206f04ae..aed774931 100644
--- a/CppParser/CppParser_x64_vs110.vcxproj.filters
+++ b/CppParser/CppParser_x64_vs110.vcxproj.filters
@@ -2,31 +2,31 @@
- {e8760673-d3b5-471c-bc85-70cf7f616fb2}
+ {f7b4f6ad-2580-4528-ac17-3ee368eafdce}
- {af3f9c0e-e8f0-479b-8cad-7a047e43c766}
+ {c479411d-b981-4a5c-ac79-26d2e3332cc0}
- {89a1f718-71d9-45a4-aa0d-311566519b5e}
+ {36986a08-529c-4ad0-a048-9be54b69621e}
- {9c1279a9-0da5-4d1b-9c0a-9b46495e3e1f}
+ {514072b2-929b-4519-ad74-937077afd27e}
- {b668a5a4-b633-4bb5-92dc-06300d8d2751}
+ {df7a4b61-cf8e-4bbf-b0d9-052db6f3b08c}
- {1323e338-edb5-44a6-98d9-a89a8134014e}
+ {07682309-537f-41db-a041-f9e437110f8a}
- {f8209c51-044b-4146-88ff-5d794f593de5}
+ {c58448e2-47c4-4270-9464-4485d6acc17b}
- {2b99f023-a1d6-4eeb-a240-2a15ee2df0e0}
+ {faf0b1f7-d16c-430f-bee3-69bcf29af95f}
- {bfc33f86-8333-42da-9d6b-278944f30ed5}
+ {d02bd71d-b369-4d10-a09b-2e7cd74cb74a}
diff --git a/CppParser/CppParser_x64_vs120.sln b/CppParser/CppParser_x64_vs120.sln
index b2195a02f..b33dbd53e 100644
--- a/CppParser/CppParser_x64_vs120.sln
+++ b/CppParser/CppParser_x64_vs120.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppParser", "CppParser_x64_vs120.vcxproj", "{C77B9D92-EC91-11DA-A4CE-005056C00008}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs120.vcxproj", "{C79112BD-EC91-11DA-A4CE-005056C00008}"
@@ -12,37 +10,49 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|x64 = debug_shared|x64
- debug_static_md|x64 = debug_static_md|x64
- debug_static_mt|x64 = debug_static_mt|x64
release_shared|x64 = release_shared|x64
- release_static_md|x64 = release_static_md|x64
+ debug_static_mt|x64 = debug_static_mt|x64
release_static_mt|x64 = release_static_mt|x64
+ debug_static_md|x64 = debug_static_md|x64
+ release_static_md|x64 = release_static_md|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.ActiveCfg = debug_shared|x64
{C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Build.0 = debug_shared|x64
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Deploy.0 = debug_shared|x64
{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.ActiveCfg = release_shared|x64
{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Build.0 = release_shared|x64
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Deploy.0 = release_shared|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64
+ {C77B9D92-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64
{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.ActiveCfg = debug_shared|x64
{C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Build.0 = debug_shared|x64
- {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_shared|x64.Deploy.0 = debug_shared|x64
{C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.ActiveCfg = release_shared|x64
{C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Build.0 = release_shared|x64
- {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.release_shared|x64.Deploy.0 = release_shared|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Build.0 = release_static_md|x64
+ {C79112BD-EC91-11DA-A4CE-005056C00008}.release_static_md|x64.Deploy.0 = release_static_md|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/CppParser/CppParser_x64_vs120.vcxproj b/CppParser/CppParser_x64_vs120.vcxproj
index 963104668..b57db08c5 100644
--- a/CppParser/CppParser_x64_vs120.vcxproj
+++ b/CppParser/CppParser_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
CppParserWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoCppParser64dPocoCppParsermddPocoCppParsermtd
@@ -107,6 +93,32 @@
PocoCppParsermdPocoCppParsermt
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+ Disabled
@@ -120,14 +132,12 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin64\PocoCppParser64d.dlltruetrue
@@ -153,14 +163,12 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin64\PocoCppParser64.dlltruefalse
@@ -185,12 +193,11 @@
truetruetrue
-
+ ..\lib64\PocoCppParsermtd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\lib64\PocoCppParsermtd.lib
@@ -211,11 +218,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\lib64\PocoCppParsermt.lib
@@ -234,12 +240,11 @@
truetruetrue
-
+ ..\lib64\PocoCppParsermdd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\lib64\PocoCppParsermdd.lib
@@ -260,55 +265,54 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\lib64\PocoCppParsermd.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/CppParser/CppParser_x64_vs120.vcxproj.filters b/CppParser/CppParser_x64_vs120.vcxproj.filters
index e206f04ae..03b026f0b 100644
--- a/CppParser/CppParser_x64_vs120.vcxproj.filters
+++ b/CppParser/CppParser_x64_vs120.vcxproj.filters
@@ -2,31 +2,31 @@
- {e8760673-d3b5-471c-bc85-70cf7f616fb2}
+ {6a0aab7e-9c4c-43cb-966e-3eed69652e18}
- {af3f9c0e-e8f0-479b-8cad-7a047e43c766}
+ {6f6087fe-9cb4-472d-8777-8d54b7dfc110}
- {89a1f718-71d9-45a4-aa0d-311566519b5e}
+ {e9f324cf-4731-453f-afa7-32d174b47123}
- {9c1279a9-0da5-4d1b-9c0a-9b46495e3e1f}
+ {835fb39c-29f0-4930-b958-117bfca18398}
- {b668a5a4-b633-4bb5-92dc-06300d8d2751}
+ {f8ba4598-05b9-4323-a40b-a11d37ffad8d}
- {1323e338-edb5-44a6-98d9-a89a8134014e}
+ {d82fa47e-647f-44ac-9921-f771aaabfc97}
- {f8209c51-044b-4146-88ff-5d794f593de5}
+ {f1e2f080-3b73-4f84-b7e3-34781bf97f7d}
- {2b99f023-a1d6-4eeb-a240-2a15ee2df0e0}
+ {710fe2cb-a8d5-4a98-97f3-ba4054f04561}
- {bfc33f86-8333-42da-9d6b-278944f30ed5}
+ {36fe4d0c-2366-49b4-b279-ccd3b5bc6423}
diff --git a/CppParser/include/Poco/CppParser/Attributes.h b/CppParser/include/Poco/CppParser/Attributes.h
old mode 100644
new mode 100755
index 027d8c3d8..83d77f235
--- a/CppParser/include/Poco/CppParser/Attributes.h
+++ b/CppParser/include/Poco/CppParser/Attributes.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/AttributesParser.h b/CppParser/include/Poco/CppParser/AttributesParser.h
old mode 100644
new mode 100755
index 84973514b..3ae5f9d52
--- a/CppParser/include/Poco/CppParser/AttributesParser.h
+++ b/CppParser/include/Poco/CppParser/AttributesParser.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/BuiltIn.h b/CppParser/include/Poco/CppParser/BuiltIn.h
old mode 100644
new mode 100755
index 5b17dcbe6..c360f6a84
--- a/CppParser/include/Poco/CppParser/BuiltIn.h
+++ b/CppParser/include/Poco/CppParser/BuiltIn.h
@@ -12,27 +12,7 @@
// Copyright (c) 2011, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/CppParser.h b/CppParser/include/Poco/CppParser/CppParser.h
old mode 100644
new mode 100755
index 7bce0e187..4e60b8daa
--- a/CppParser/include/Poco/CppParser/CppParser.h
+++ b/CppParser/include/Poco/CppParser/CppParser.h
@@ -14,27 +14,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/CppToken.h b/CppParser/include/Poco/CppParser/CppToken.h
old mode 100644
new mode 100755
index ed57c5f2e..659cd6303
--- a/CppParser/include/Poco/CppParser/CppToken.h
+++ b/CppParser/include/Poco/CppParser/CppToken.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/Decl.h b/CppParser/include/Poco/CppParser/Decl.h
old mode 100644
new mode 100755
index 428977da6..f24ed93dc
--- a/CppParser/include/Poco/CppParser/Decl.h
+++ b/CppParser/include/Poco/CppParser/Decl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/Enum.h b/CppParser/include/Poco/CppParser/Enum.h
old mode 100644
new mode 100755
index 26a4c8e9b..a78a42b6a
--- a/CppParser/include/Poco/CppParser/Enum.h
+++ b/CppParser/include/Poco/CppParser/Enum.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/EnumValue.h b/CppParser/include/Poco/CppParser/EnumValue.h
old mode 100644
new mode 100755
index 647e67e28..d5c4af798
--- a/CppParser/include/Poco/CppParser/EnumValue.h
+++ b/CppParser/include/Poco/CppParser/EnumValue.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/Function.h b/CppParser/include/Poco/CppParser/Function.h
old mode 100644
new mode 100755
index b390086d2..08e6cd55d
--- a/CppParser/include/Poco/CppParser/Function.h
+++ b/CppParser/include/Poco/CppParser/Function.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/NameSpace.h b/CppParser/include/Poco/CppParser/NameSpace.h
old mode 100644
new mode 100755
index ff29da571..f632ee754
--- a/CppParser/include/Poco/CppParser/NameSpace.h
+++ b/CppParser/include/Poco/CppParser/NameSpace.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/Parameter.h b/CppParser/include/Poco/CppParser/Parameter.h
old mode 100644
new mode 100755
index 41d4aa40f..04713ffe1
--- a/CppParser/include/Poco/CppParser/Parameter.h
+++ b/CppParser/include/Poco/CppParser/Parameter.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/Parser.h b/CppParser/include/Poco/CppParser/Parser.h
old mode 100644
new mode 100755
index 8ce381260..8ba4b406f
--- a/CppParser/include/Poco/CppParser/Parser.h
+++ b/CppParser/include/Poco/CppParser/Parser.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/Struct.h b/CppParser/include/Poco/CppParser/Struct.h
old mode 100644
new mode 100755
index bda5c6498..28c86765e
--- a/CppParser/include/Poco/CppParser/Struct.h
+++ b/CppParser/include/Poco/CppParser/Struct.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/Symbol.h b/CppParser/include/Poco/CppParser/Symbol.h
old mode 100644
new mode 100755
index daf89ce7f..1e0c17be2
--- a/CppParser/include/Poco/CppParser/Symbol.h
+++ b/CppParser/include/Poco/CppParser/Symbol.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/Tokenizer.h b/CppParser/include/Poco/CppParser/Tokenizer.h
old mode 100644
new mode 100755
index ca20fd9eb..4fa23f613
--- a/CppParser/include/Poco/CppParser/Tokenizer.h
+++ b/CppParser/include/Poco/CppParser/Tokenizer.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/TypeDef.h b/CppParser/include/Poco/CppParser/TypeDef.h
old mode 100644
new mode 100755
index 443273fcd..564ad3ae5
--- a/CppParser/include/Poco/CppParser/TypeDef.h
+++ b/CppParser/include/Poco/CppParser/TypeDef.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/Utility.h b/CppParser/include/Poco/CppParser/Utility.h
old mode 100644
new mode 100755
index 57274ca3d..7c2ba7479
--- a/CppParser/include/Poco/CppParser/Utility.h
+++ b/CppParser/include/Poco/CppParser/Utility.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/include/Poco/CppParser/Variable.h b/CppParser/include/Poco/CppParser/Variable.h
old mode 100644
new mode 100755
index 39e8936c4..448207698
--- a/CppParser/include/Poco/CppParser/Variable.h
+++ b/CppParser/include/Poco/CppParser/Variable.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/Attributes.cpp b/CppParser/src/Attributes.cpp
old mode 100644
new mode 100755
index 37d26fac4..f8ca91c0a
--- a/CppParser/src/Attributes.cpp
+++ b/CppParser/src/Attributes.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/AttributesParser.cpp b/CppParser/src/AttributesParser.cpp
old mode 100644
new mode 100755
index dc3504e31..0f14dc2ea
--- a/CppParser/src/AttributesParser.cpp
+++ b/CppParser/src/AttributesParser.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/BuiltIn.cpp b/CppParser/src/BuiltIn.cpp
old mode 100644
new mode 100755
index 15b695c8e..753d1bcd1
--- a/CppParser/src/BuiltIn.cpp
+++ b/CppParser/src/BuiltIn.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/CppToken.cpp b/CppParser/src/CppToken.cpp
old mode 100644
new mode 100755
index ee82e7ffe..a31027a61
--- a/CppParser/src/CppToken.cpp
+++ b/CppParser/src/CppToken.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/Decl.cpp b/CppParser/src/Decl.cpp
old mode 100644
new mode 100755
index bfd10f79b..aab14be52
--- a/CppParser/src/Decl.cpp
+++ b/CppParser/src/Decl.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/Enum.cpp b/CppParser/src/Enum.cpp
old mode 100644
new mode 100755
index 0085021d3..ff5af9e51
--- a/CppParser/src/Enum.cpp
+++ b/CppParser/src/Enum.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/EnumValue.cpp b/CppParser/src/EnumValue.cpp
old mode 100644
new mode 100755
index e08bf6464..a193806ec
--- a/CppParser/src/EnumValue.cpp
+++ b/CppParser/src/EnumValue.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/Function.cpp b/CppParser/src/Function.cpp
old mode 100644
new mode 100755
index 406863989..583010037
--- a/CppParser/src/Function.cpp
+++ b/CppParser/src/Function.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/NameSpace.cpp b/CppParser/src/NameSpace.cpp
old mode 100644
new mode 100755
index da31c3388..30bb2ad95
--- a/CppParser/src/NameSpace.cpp
+++ b/CppParser/src/NameSpace.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/Parameter.cpp b/CppParser/src/Parameter.cpp
old mode 100644
new mode 100755
index 71b5e50a0..40a8a765c
--- a/CppParser/src/Parameter.cpp
+++ b/CppParser/src/Parameter.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/Parser.cpp b/CppParser/src/Parser.cpp
old mode 100644
new mode 100755
index 019a9ce16..bb782bbc8
--- a/CppParser/src/Parser.cpp
+++ b/CppParser/src/Parser.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/Struct.cpp b/CppParser/src/Struct.cpp
old mode 100644
new mode 100755
index 638b21183..df1397d69
--- a/CppParser/src/Struct.cpp
+++ b/CppParser/src/Struct.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/Symbol.cpp b/CppParser/src/Symbol.cpp
old mode 100644
new mode 100755
index cbcc74f9d..3553986ea
--- a/CppParser/src/Symbol.cpp
+++ b/CppParser/src/Symbol.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/Tokenizer.cpp b/CppParser/src/Tokenizer.cpp
old mode 100644
new mode 100755
index bd9c86baa..5b549eea3
--- a/CppParser/src/Tokenizer.cpp
+++ b/CppParser/src/Tokenizer.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/TypeDef.cpp b/CppParser/src/TypeDef.cpp
old mode 100644
new mode 100755
index 7de61b1a9..e799dd054
--- a/CppParser/src/TypeDef.cpp
+++ b/CppParser/src/TypeDef.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/Utility.cpp b/CppParser/src/Utility.cpp
old mode 100644
new mode 100755
index 8158bfbf7..c46cdf544
--- a/CppParser/src/Utility.cpp
+++ b/CppParser/src/Utility.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/src/Variable.cpp b/CppParser/src/Variable.cpp
old mode 100644
new mode 100755
index 40b2f67ac..099217d17
--- a/CppParser/src/Variable.cpp
+++ b/CppParser/src/Variable.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/testsuite/TestSuite_vs100.vcxproj b/CppParser/testsuite/TestSuite_vs100.vcxproj
index 91d2d99c9..9dcda946e 100644
--- a/CppParser/testsuite/TestSuite_vs100.vcxproj
+++ b/CppParser/testsuite/TestSuite_vs100.vcxproj
@@ -33,85 +33,85 @@
Win32Proj
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ bin\
+ obj\$(Configuration)\
+ true
+ bin\
+ obj\$(Configuration)\
+ false
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -141,7 +141,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -173,7 +173,7 @@
MachineX86
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -204,7 +204,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -237,7 +237,7 @@
MachineX86
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -267,7 +267,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
diff --git a/CppParser/testsuite/TestSuite_vs100.vcxproj.filters b/CppParser/testsuite/TestSuite_vs100.vcxproj.filters
index 1154bb46d..0f2001a1c 100644
--- a/CppParser/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/CppParser/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,37 +2,37 @@
- {164db782-dfe9-41f3-8a3f-ac47c7d79f11}
+ {9d693b7c-4385-4386-b87f-7d739c7d36f1}
- {6fa89d39-b32e-4356-9ec1-90a1c7d56428}
+ {4f19253e-d46c-4911-8022-add406485eb7}
- {e176d67f-6278-4683-ba96-37ceebc15369}
+ {ad113469-57b0-4360-8a0f-102df64e3a7a}
- {f489fb44-931d-4af2-96e3-e8cd2e727554}
+ {a2f56498-68df-4e86-bc94-5be9933a4e96}
- {25d0d43e-f85f-4c86-84f0-e5f69d2a4f2a}
+ {a25af760-4e4c-4dcc-ae41-ff59d65838e9}
- {31b5c893-dbe5-49d2-952b-ec9fefeb8f5d}
+ {0fb54581-608e-491f-b67a-463b062c71d4}
- {eeca1a3e-1e98-4ab0-bcd2-3b86e19cb66d}
+ {df1ca66c-1f8b-4749-9991-a061a8e4b81f}
- {f21ae675-9cf7-451b-a7c5-2f2fc03458e7}
+ {6c29be2e-00ce-4795-b698-eac7eac526c5}
- {74dea9e1-9151-401f-ad16-0f930ce2c350}
+ {286bf0ca-0798-46dc-be7c-1f98158e8ba4}
- {292b4a86-baa8-4f15-8ed9-9fbed8b33d4a}
+ {8875ba07-1d4d-46c8-b8d0-2310f478af08}
- {96032ecf-ae32-46f0-8a18-757265f97b5f}
+ {749dfdbb-b8a6-47e0-a12f-74a90bef5d8c}
diff --git a/CppParser/testsuite/TestSuite_vs110.vcxproj b/CppParser/testsuite/TestSuite_vs110.vcxproj
index 7370f4755..42fff38ab 100644
--- a/CppParser/testsuite/TestSuite_vs110.vcxproj
+++ b/CppParser/testsuite/TestSuite_vs110.vcxproj
@@ -33,37 +33,37 @@
Win32Proj
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiByte
@@ -71,53 +71,65 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ <_ProjectFileVersion>11.0.61030.0
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -134,7 +146,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies)
@@ -147,7 +158,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -166,7 +177,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies)
@@ -179,7 +189,7 @@
MachineX86
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -196,7 +206,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -210,7 +219,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -229,7 +238,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -243,7 +251,7 @@
MachineX86
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -260,7 +268,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -273,7 +280,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -292,7 +299,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
diff --git a/CppParser/testsuite/TestSuite_vs110.vcxproj.filters b/CppParser/testsuite/TestSuite_vs110.vcxproj.filters
index df376710e..cd5131bcc 100644
--- a/CppParser/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/CppParser/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,37 +2,37 @@
- {c2d8a893-61d3-4132-b317-ff36a7e20535}
+ {a565581f-f406-4d8d-a083-293530cf96ca}
- {95cc765b-6dad-470c-8c7c-8c202a6323ae}
+ {abd8e8ba-f4df-4ba2-8bfd-76aa394d303b}
- {0384dc65-40de-4790-8731-6ddf3839a925}
+ {95d90a46-c19f-4792-9137-3981e8fa335d}
- {0b753288-c05c-46bf-9153-f9448e4f8d00}
+ {6868662b-a23c-4665-a459-2559ff3c24d0}
- {8fd1136e-749d-456c-879e-ffef21863e5b}
+ {0c17ba6e-d547-4f2f-a631-ec3b18b98806}
- {fc188f36-e257-4ef5-a14d-0ec12af48184}
+ {2b1666ba-3dee-407a-832c-52c0aeef14ec}
- {93c0f9c4-1ac9-4a8b-9f25-8808afbd5dd6}
+ {7858b874-d03a-49f7-8776-ab2aff36176e}
- {7b14afa7-908f-4934-a1ad-8e5c0605288d}
+ {ee905107-0a4e-4137-8c87-99375035f093}
- {da7c4f50-826b-46a4-a3d4-d7777b1ce2d2}
+ {6b149c49-2fb6-4084-9536-f6d3f6e8ca08}
- {04a55c6d-7896-42b3-8b5f-3804087bba01}
+ {b0ea20b4-6f19-41f5-a4b1-f94b45640e88}
- {347a4842-0d74-484e-bee0-19c8b2875eab}
+ {9a6304bc-640b-49c3-a525-13f443b2c58f}
diff --git a/CppParser/testsuite/TestSuite_vs120.vcxproj b/CppParser/testsuite/TestSuite_vs120.vcxproj
index eec7179a8..536f07aee 100644
--- a/CppParser/testsuite/TestSuite_vs120.vcxproj
+++ b/CppParser/testsuite/TestSuite_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,84 +32,60 @@
TestSuiteWin32Proj
-
+ Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -117,6 +93,36 @@
TestSuiteTestSuite
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ Disabled
@@ -130,11 +136,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitd.lib;%(AdditionalDependencies)
@@ -162,11 +167,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnit.lib;%(AdditionalDependencies)
@@ -192,17 +196,15 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- CppUnitmtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies)
+ CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin\static_mt\TestSuited.exe..\..\lib;%(AdditionalLibraryDirectories)
- nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)truetruebin\static_mt\TestSuited.pdb
@@ -225,17 +227,15 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies)
+ CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin\static_mt\TestSuite.exe..\..\lib;%(AdditionalLibraryDirectories)
- nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)falseConsoletrue
@@ -256,14 +256,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- CppUnitmdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
+ CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin\static_md\TestSuited.exe..\..\lib;%(AdditionalLibraryDirectories)true
@@ -288,14 +287,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
+ CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin\static_md\TestSuite.exe..\..\lib;%(AdditionalLibraryDirectories)false
@@ -306,18 +304,18 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/CppParser/testsuite/TestSuite_vs120.vcxproj.filters b/CppParser/testsuite/TestSuite_vs120.vcxproj.filters
index 353ba180a..e7cb70d44 100644
--- a/CppParser/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/CppParser/testsuite/TestSuite_vs120.vcxproj.filters
@@ -2,37 +2,37 @@
- {c2d8a893-61d3-4132-b317-ff36a7e20535}
+ {9b3234dc-804d-4539-8ef9-ee7f1b48ea16}
- {95cc765b-6dad-470c-8c7c-8c202a6323ae}
+ {c79edc10-8863-4d35-95a6-f8015b4486f3}
- {0384dc65-40de-4790-8731-6ddf3839a925}
+ {44072ea2-78fd-4165-a0db-f9c5f3ac52d9}
- {0b753288-c05c-46bf-9153-f9448e4f8d00}
+ {999fdc77-973a-4e56-bcff-379029d569b5}
- {8fd1136e-749d-456c-879e-ffef21863e5b}
+ {ba165191-c340-44f8-a933-41eec5157092}
- {fc188f36-e257-4ef5-a14d-0ec12af48184}
+ {4325b300-0e72-4e25-b6f0-7a35cd98840e}
- {93c0f9c4-1ac9-4a8b-9f25-8808afbd5dd6}
+ {89de7667-daba-4e2f-b08d-7c5602242f5b}
- {7b14afa7-908f-4934-a1ad-8e5c0605288d}
+ {90600031-54ec-44c1-9aba-e3e27da5e3c0}
- {da7c4f50-826b-46a4-a3d4-d7777b1ce2d2}
+ {a60c70d8-2a19-440f-a371-66731c0eedcf}
- {04a55c6d-7896-42b3-8b5f-3804087bba01}
+ {9ae4c3bb-f6ba-4d42-bd25-378f142ce54c}
- {347a4842-0d74-484e-bee0-19c8b2875eab}
+ {9705a4f4-ff32-446d-b6ac-68258417c6aa}
@@ -56,14 +56,14 @@
_Suite\Source Files
+
+ _Driver\Source Files
+ Attributes\Source FilesAttributes\Source Files
-
- _Driver\Source Files
-
\ No newline at end of file
diff --git a/CppParser/testsuite/TestSuite_x64_vs100.vcxproj b/CppParser/testsuite/TestSuite_x64_vs100.vcxproj
index aeeb1ecda..c1d1aeba1 100644
--- a/CppParser/testsuite/TestSuite_x64_vs100.vcxproj
+++ b/CppParser/testsuite/TestSuite_x64_vs100.vcxproj
@@ -33,85 +33,85 @@
Win32Proj
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ bin64\
+ obj64\$(Configuration)\
+ true
+ bin64\
+ obj64\$(Configuration)\
+ false
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -141,7 +141,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -173,7 +173,7 @@
MachineX64
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -204,7 +204,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -237,7 +237,7 @@
MachineX64
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -267,7 +267,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
diff --git a/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters
index 016d2bb4d..35b5590f2 100644
--- a/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,37 +2,37 @@
- {054c68c7-3ec0-4e1d-970b-41ed12bf8dc8}
+ {9a4e2f07-52c6-435b-ae16-8e7caf2020d3}
- {390ad10e-da0f-4614-94da-f0614880e598}
+ {2d942679-5c4e-4a2a-b3b4-801f9265cdc3}
- {db69e401-f14b-4c88-80f2-8160c621b495}
+ {af3bf96c-d4e9-417d-86e1-258c03f41675}
- {6aa89dc7-f3a0-4feb-a0e5-312c22c16076}
+ {67eea73c-ff17-4f44-a5da-2aa443439b87}
- {afccc434-431c-4c5d-acc2-de6f0e031360}
+ {3c9b1481-17bd-422e-8821-f19d0d814805}
- {0ddb45b0-84de-4ae8-9f34-c371c301428b}
+ {ad81f285-174e-48fb-9ca2-a943e36cc362}
- {5f3868e0-8110-4b3f-a606-ce322a1074dd}
+ {6601a84f-a19b-4c62-a9ed-03f3f6424159}
- {16a04698-200d-438a-a3d7-ef1273b8e67a}
+ {8e42f9c2-ce90-4317-a7ed-23c85ff311dc}
- {912fba68-221c-48fe-9c8f-559857dd138c}
+ {bc122dfa-fe7e-4b12-bbaf-89b466743076}
- {f73cf0f3-bd53-4a25-87fe-9b8ed2501e55}
+ {774a7e11-5ded-4e23-a057-fc5dfb87243f}
- {385d1e40-f94d-448f-acab-7d285992b8a8}
+ {171e8453-2e11-4396-a4de-b754809387fa}
diff --git a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj
index 09d256ada..d5a2e591d 100644
--- a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj
+++ b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj
@@ -33,37 +33,37 @@
Win32Proj
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiByte
@@ -71,53 +71,65 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ <_ProjectFileVersion>11.0.61030.0
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -134,7 +146,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies)
@@ -147,7 +158,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -166,7 +177,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies)
@@ -179,7 +189,7 @@
MachineX64
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -196,7 +206,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -210,7 +219,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -229,7 +238,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -243,7 +251,7 @@
MachineX64
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -260,7 +268,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -273,7 +280,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -292,7 +299,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
diff --git a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters
index 9341c8e03..b5853bc45 100644
--- a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,37 +2,37 @@
- {82f5027e-61f8-4e6d-a470-c5e91d140f81}
+ {57b4ccb6-02d6-44ee-b85b-c7f7cdc8443a}
- {b93eaa5d-c641-4928-873a-f6cbc02621f6}
+ {ac2a9529-9be0-4822-9ec1-62d23c5d503a}
- {0061af94-0f93-4cd1-b824-e5c1db64868e}
+ {5050706a-8488-4fd0-8e36-588e577e6ea7}
- {bd6b7d7e-37d2-4ba0-a787-a7092c6f824d}
+ {8a293c72-fe41-4983-8159-5364ceaa7d44}
- {1ca511c5-0146-42d3-9b0b-11021b879fda}
+ {82aaf974-6d88-402c-9c0e-5a354f78b638}
- {7baa2435-8866-46b7-a884-8d301377714f}
+ {5ae42f09-708f-418d-a654-77245a727e10}
- {80ddb1c9-11f7-4171-95e3-235031bb0a9b}
+ {3845027b-bcb2-4bdf-9165-9021c7ef955d}
- {f5372bb6-7624-4554-86bf-26fcd8439e9f}
+ {d921031f-5899-4820-acf5-db13790f4407}
- {296fab82-e5e1-4269-858a-f60bffb23a74}
+ {5f55364c-9436-426c-acef-965f16ce8032}
- {6473d1d6-398a-4ba8-ab8c-c1e3918939d1}
+ {e89c6088-31c8-46a5-8d60-34be2c35e7a8}
- {e0cc863a-dea0-41c5-bd81-761a1123ad2d}
+ {adf4281a-a99b-4847-b08a-4ccea5f3d11b}
diff --git a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj
index fec95643a..50ce81bce 100644
--- a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj
+++ b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,84 +32,60 @@
TestSuiteWin32Proj
-
+ Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -117,6 +93,36 @@
TestSuiteTestSuite
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ Disabled
@@ -130,11 +136,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitd.lib;%(AdditionalDependencies)
@@ -162,11 +167,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnit.lib;%(AdditionalDependencies)
@@ -192,17 +196,15 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- CppUnitmtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies)
+ CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin64\static_mt\TestSuited.exe..\..\lib64;%(AdditionalLibraryDirectories)
- nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)truetruebin64\static_mt\TestSuited.pdb
@@ -225,17 +227,15 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies)
+ CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin64\static_mt\TestSuite.exe..\..\lib64;%(AdditionalLibraryDirectories)
- nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)falseConsoletrue
@@ -256,14 +256,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- CppUnitmdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
+ CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin64\static_md\TestSuited.exe..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -288,14 +287,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
+ CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin64\static_md\TestSuite.exe..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -306,18 +304,18 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters
index 33c8e9daa..68bd5c41c 100644
--- a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -2,37 +2,37 @@
- {82f5027e-61f8-4e6d-a470-c5e91d140f81}
+ {c6f75888-f1f7-4649-b88f-b6979716e020}
- {b93eaa5d-c641-4928-873a-f6cbc02621f6}
+ {89608790-ec19-4ccf-a6eb-dd36a2e76f3d}
- {0061af94-0f93-4cd1-b824-e5c1db64868e}
+ {e408ef06-ec40-4eb6-984e-a39e648b19b2}
- {bd6b7d7e-37d2-4ba0-a787-a7092c6f824d}
+ {ef1e9a16-0329-47db-b4d4-9fad33a7da4d}
- {1ca511c5-0146-42d3-9b0b-11021b879fda}
+ {69612148-d050-4548-818b-9660e93e4658}
- {7baa2435-8866-46b7-a884-8d301377714f}
+ {99a91180-df99-4632-a2c3-86592860da0b}
- {80ddb1c9-11f7-4171-95e3-235031bb0a9b}
+ {c7c8ca56-a170-4d0b-bd41-8d33fc5ebc59}
- {f5372bb6-7624-4554-86bf-26fcd8439e9f}
+ {1d50fe28-de86-43de-9b66-f0b400f4f577}
- {296fab82-e5e1-4269-858a-f60bffb23a74}
+ {09adffc4-0bfc-46cf-8f67-f060d277d879}
- {6473d1d6-398a-4ba8-ab8c-c1e3918939d1}
+ {46feb311-6080-4868-af92-41cdc750d72c}
- {e0cc863a-dea0-41c5-bd81-761a1123ad2d}
+ {0da13581-0cc9-4947-b7c9-66fcf4aef5e4}
@@ -56,14 +56,14 @@
_Suite\Source Files
+
+ _Driver\Source Files
+ Attributes\Source FilesAttributes\Source Files
-
- _Driver\Source Files
-
\ No newline at end of file
diff --git a/CppParser/testsuite/src/AttributesParserTest.cpp b/CppParser/testsuite/src/AttributesParserTest.cpp
old mode 100644
new mode 100755
index a15c2e28f..bcc8fcc6d
--- a/CppParser/testsuite/src/AttributesParserTest.cpp
+++ b/CppParser/testsuite/src/AttributesParserTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/testsuite/src/AttributesParserTest.h b/CppParser/testsuite/src/AttributesParserTest.h
old mode 100644
new mode 100755
index 4fe23f629..78ff718b8
--- a/CppParser/testsuite/src/AttributesParserTest.h
+++ b/CppParser/testsuite/src/AttributesParserTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/testsuite/src/AttributesTestSuite.cpp b/CppParser/testsuite/src/AttributesTestSuite.cpp
old mode 100644
new mode 100755
index 4b34e3d1e..2e6f49568
--- a/CppParser/testsuite/src/AttributesTestSuite.cpp
+++ b/CppParser/testsuite/src/AttributesTestSuite.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/testsuite/src/AttributesTestSuite.h b/CppParser/testsuite/src/AttributesTestSuite.h
old mode 100644
new mode 100755
index ae2c4fe3f..6d62a98e6
--- a/CppParser/testsuite/src/AttributesTestSuite.h
+++ b/CppParser/testsuite/src/AttributesTestSuite.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/testsuite/src/CppParserTest.cpp b/CppParser/testsuite/src/CppParserTest.cpp
old mode 100644
new mode 100755
index b1cc39b05..004ce4f82
--- a/CppParser/testsuite/src/CppParserTest.cpp
+++ b/CppParser/testsuite/src/CppParserTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/testsuite/src/CppParserTest.h b/CppParser/testsuite/src/CppParserTest.h
old mode 100644
new mode 100755
index 4ff575740..006ac6d37
--- a/CppParser/testsuite/src/CppParserTest.h
+++ b/CppParser/testsuite/src/CppParserTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/testsuite/src/CppParserTestSuite.cpp b/CppParser/testsuite/src/CppParserTestSuite.cpp
old mode 100644
new mode 100755
index 9292ff353..e71d2b0d4
--- a/CppParser/testsuite/src/CppParserTestSuite.cpp
+++ b/CppParser/testsuite/src/CppParserTestSuite.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/testsuite/src/CppParserTestSuite.h b/CppParser/testsuite/src/CppParserTestSuite.h
old mode 100644
new mode 100755
index b1d2aac6f..3ba97606d
--- a/CppParser/testsuite/src/CppParserTestSuite.h
+++ b/CppParser/testsuite/src/CppParserTestSuite.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/testsuite/src/Driver.cpp b/CppParser/testsuite/src/Driver.cpp
old mode 100644
new mode 100755
index ffe92f90f..b03341e07
--- a/CppParser/testsuite/src/Driver.cpp
+++ b/CppParser/testsuite/src/Driver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppParser/testsuite/src/WinDriver.cpp b/CppParser/testsuite/src/WinDriver.cpp
old mode 100644
new mode 100755
index bb93971f2..2c82cd75c
--- a/CppParser/testsuite/src/WinDriver.cpp
+++ b/CppParser/testsuite/src/WinDriver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/CppUnit/CppUnit_WEC2013_vs110.sln b/CppUnit/CppUnit_WEC2013_vs110.sln
index f13a62cfd..9baef8709 100644
--- a/CppUnit/CppUnit_WEC2013_vs110.sln
+++ b/CppUnit/CppUnit_WEC2013_vs110.sln
@@ -5,26 +5,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_WEC2013_
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- debug_shared|SDK_AM335X_SK_WEC2013 = debug_shared|SDK_AM335X_SK_WEC2013
- debug_static_md|SDK_AM335X_SK_WEC2013 = debug_static_md|SDK_AM335X_SK_WEC2013
- debug_static_mt|SDK_AM335X_SK_WEC2013 = debug_static_mt|SDK_AM335X_SK_WEC2013
- release_shared|SDK_AM335X_SK_WEC2013 = release_shared|SDK_AM335X_SK_WEC2013
- release_static_md|SDK_AM335X_SK_WEC2013 = release_static_md|SDK_AM335X_SK_WEC2013
- release_static_mt|SDK_AM335X_SK_WEC2013 = release_static_mt|SDK_AM335X_SK_WEC2013
+ debug_shared|SDK_AM335X_SK_WEC2013_V300 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ debug_static_md|SDK_AM335X_SK_WEC2013_V300 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ debug_static_mt|SDK_AM335X_SK_WEC2013_V300 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ release_shared|SDK_AM335X_SK_WEC2013_V300 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ release_static_md|SDK_AM335X_SK_WEC2013_V300 = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ release_static_mt|SDK_AM335X_SK_WEC2013_V300 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|SDK_AM335X_SK_WEC2013.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|SDK_AM335X_SK_WEC2013.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|SDK_AM335X_SK_WEC2013.Build.0 = release_shared|SDK_AM335X_SK_WEC2013
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|SDK_AM335X_SK_WEC2013.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013
- {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|SDK_AM335X_SK_WEC2013.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/CppUnit/CppUnit_WEC2013_vs110.vcxproj b/CppUnit/CppUnit_WEC2013_vs110.vcxproj
index cf057e66f..09cf6789f 100644
--- a/CppUnit/CppUnit_WEC2013_vs110.vcxproj
+++ b/CppUnit/CppUnit_WEC2013_vs110.vcxproj
@@ -1,29 +1,29 @@
-
+ debug_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
@@ -33,41 +33,41 @@
en-US11.0true
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300CE800
-
+ StaticLibraryfalseMultiByteCE800
-
+ StaticLibraryfalseMultiByteCE800
-
+ StaticLibraryfalseMultiByteCE800
-
+ StaticLibraryfalseMultiByteCE800
-
+ DynamicLibraryfalseMultiByteCE800
-
+ DynamicLibraryfalseMultiByte
@@ -76,49 +76,49 @@
-
+
-
+
-
+
-
+
-
+
-
+
<_ProjectFileVersion>10.0.30319.1
- ..\bin\$(Platform)\
- obj\$(Platform)\$(Configuration)\
- true
- ..\bin\$(Platform)\
- obj\$(Platform)\$(Configuration)\
- false
- ..\lib\$(Platform)\
- obj\$(Platform)\$(Configuration)\
- ..\lib\$(Platform)\
- obj\$(Platform)\$(Configuration)\
- ..\lib\$(Platform)\
- obj\$(Platform)\$(Configuration)\
- ..\lib\$(Platform)\
- obj\$(Platform)\$(Configuration)\
- CppUnitd
- CppUnit
- CppUnitmdd
- CppUnitmtd
- CppUnitmd
- CppUnitmt
+ ..\bin\$(Platform)\
+ obj\$(Platform)\$(Configuration)\
+ true
+ ..\bin\$(Platform)\
+ obj\$(Platform)\$(Configuration)\
+ false
+ ..\lib\$(Platform)\
+ obj\$(Platform)\$(Configuration)\
+ ..\lib\$(Platform)\
+ obj\$(Platform)\$(Configuration)\
+ ..\lib\$(Platform)\
+ obj\$(Platform)\$(Configuration)\
+ ..\lib\$(Platform)\
+ obj\$(Platform)\$(Configuration)\
+ CppUnitd
+ CppUnit
+ CppUnitmdd
+ CppUnitmtd
+ CppUnitmd
+ CppUnitmt
-
+ DisabledDefault
@@ -157,7 +157,7 @@
..\lib\$(Platform)\CppUnitd.lib
-
+ DisabledOnlyExplicitInline
@@ -195,7 +195,7 @@
..\lib\$(Platform)\CppUnit.lib
-
+ DisabledDefault
@@ -228,7 +228,7 @@
..\lib\$(Platform)\CppUnitmdd.lib
-
+ DisabledOnlyExplicitInline
@@ -261,7 +261,7 @@
..\lib\$(Platform)\CppUnitmd.lib
-
+ DisabledDefault
@@ -294,7 +294,7 @@
..\lib\$(Platform)\CppUnitmtd.lib
-
+ DisabledOnlyExplicitInline
diff --git a/Crypto/Crypto_vs100.vcxproj b/Crypto/Crypto_vs100.vcxproj
index 3c6527ff2..8b59936d9 100644
--- a/Crypto/Crypto_vs100.vcxproj
+++ b/Crypto/Crypto_vs100.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -32,7 +32,7 @@
CryptoWin32Proj
-
+ StaticLibraryMultiByte
@@ -57,27 +57,27 @@
DynamicLibraryMultiByte
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
<_ProjectFileVersion>10.0.40219.1
..\bin\
@@ -104,7 +104,7 @@
Disabled
- .\include;..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)
+ .\include;..\Foundation\include;%(AdditionalIncludeDirectories)WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions)truetrue
@@ -114,7 +114,7 @@
truetruetrue
-
+ Level3EditAndContinueDefault
@@ -139,7 +139,7 @@
trueSpeedtrue
- .\include;..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)
+ .\include;..\Foundation\include;%(AdditionalIncludeDirectories)WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions)trueMultiThreadedDLL
@@ -147,9 +147,9 @@
truetruetrue
-
+ Level3
-
+ Default%(DisableSpecificWarnings)
@@ -169,7 +169,7 @@
Disabled
- .\include;..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)
+ .\include;..\Foundation\include;%(AdditionalIncludeDirectories)WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)truetrue
@@ -179,7 +179,7 @@
truetruetrue
-
+ ..\lib\PocoCryptomtd.pdbLevel3EditAndContinue
@@ -197,7 +197,7 @@
trueSpeedtrue
- .\include;..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)
+ .\include;..\Foundation\include;%(AdditionalIncludeDirectories)WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)trueMultiThreaded
@@ -205,9 +205,9 @@
truetruetrue
-
+ Level3
-
+ Default%(DisableSpecificWarnings)
@@ -218,7 +218,7 @@
Disabled
- .\include;..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)
+ .\include;..\Foundation\include;%(AdditionalIncludeDirectories)WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)truetrue
@@ -228,7 +228,7 @@
truetruetrue
-
+ ..\lib\PocoCryptomdd.pdbLevel3EditAndContinue
@@ -246,7 +246,7 @@
trueSpeedtrue
- .\include;..\Foundation\include;C:\OpenSSL\include;%(AdditionalIncludeDirectories)
+ .\include;..\Foundation\include;%(AdditionalIncludeDirectories)WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions)trueMultiThreadedDLL
@@ -254,10 +254,10 @@
truetruetrue
-
+ ..\lib\PocoCryptomd.pdbLevel3
-
+ Default%(DisableSpecificWarnings)
@@ -267,37 +267,37 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -307,6 +307,6 @@
true
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Crypto/Crypto_vs100.vcxproj.filters b/Crypto/Crypto_vs100.vcxproj.filters
index 59564d126..af3a9ca7d 100644
--- a/Crypto/Crypto_vs100.vcxproj.filters
+++ b/Crypto/Crypto_vs100.vcxproj.filters
@@ -2,49 +2,49 @@
- {817dcc42-c43d-448f-b6f4-682c7b9eebce}
+ {52aa573b-f3b6-44dd-ab29-57ad41facdca}
- {b9acfa88-5b37-438b-b02a-a0305d660abb}
+ {defeeff7-22b7-43d3-aaae-0c82364ba582}
- {9a337c49-202e-44c6-96b5-544b0c568f31}
+ {97613064-57f5-4e3c-8329-187d9c0a0620}
- {92a5c4bb-ff46-465d-98e9-de53992f84f3}
+ {a5148f54-59c6-4d71-bb71-3ea6b8977d03}
- {a1fbc3f1-3626-46ba-afb2-04a076dc20e9}
+ {5c3247f8-7bde-4c68-958b-bbb6ae01c8a1}
- {a54fb963-33ef-4bdb-96ef-3008e5922b60}
+ {f2f975dc-3988-4343-b583-545bbde06b3a}
- {9b4b7e92-fcb9-42e6-979b-239432f7f7d5}
+ {2616a78b-350a-41b5-bcdb-84f6542e78c1}
- {5ffce66b-4bf8-4a66-b499-e28c798bb193}
+ {76c7f9f5-0236-4f5e-ad73-62425a1a9fb5}
- {e898392c-d0f3-40b5-88ce-8c39659ce83f}
+ {4984522c-9d98-41c4-884d-f2c86d6abdb0}
- {4cc14755-2ecd-4ebe-9f8d-916b11107ccb}
+ {949dd63d-165e-44e5-99b7-f1d4ee314901}
- {d1a13755-0bbe-47bc-9235-7e85250fa75b}
+ {8f446b0b-c8a8-4284-b940-a2978f2e381e}
- {49706855-ad39-4ff3-a3ef-ecc99c59c7d2}
+ {75cbb619-fbca-46c1-95db-00ed801e5cf4}
- {25c9d0f5-3a6e-454e-a72e-77557cd02ad1}
+ {d103b9db-d3be-4893-bfd3-373d0b833038}
- {e939a817-2082-4c93-bd5d-6771b0706aa8}
+ {1a56fecc-efa7-4fde-b8df-6ca4ecc5f002}
- {7dea865f-63e2-4135-b1d4-1113148896b3}
+ {38a9ccab-a042-459e-9b44-36a3fe012d7c}
diff --git a/Crypto/Crypto_vs110.vcxproj b/Crypto/Crypto_vs110.vcxproj
index e3d87b553..17f0dea41 100644
--- a/Crypto/Crypto_vs110.vcxproj
+++ b/Crypto/Crypto_vs110.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -32,7 +32,7 @@
CryptoWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev110
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin\
- obj\$(Configuration)\
- true
- ..\bin\
- obj\$(Configuration)\
- false
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoCryptodPocoCryptomddPocoCryptomtd
@@ -107,34 +93,31 @@
PocoCryptomdPocoCryptomt
-
- C:\OpenSSL\include;$(IncludePath)
- $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib
- C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
-
-
- C:\OpenSSL\include;$(IncludePath)
- $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib
- C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
-
-
- C:\OpenSSL\include;$(IncludePath)
- $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib
- C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
-
-
- C:\OpenSSL\include;$(IncludePath)
- C:\OpenSSL\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
+
+ ..\bin\
+ obj\$(Configuration)\
+ true
- C:\OpenSSL\include;$(IncludePath)
- $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib
- C:\OpenSSL\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
+ ..\bin\
+ obj\$(Configuration)\
+ false
-
- C:\OpenSSL\include;$(IncludePath)
- $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib
- C:\OpenSSL\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
@@ -149,11 +132,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)
@@ -182,11 +164,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)
@@ -214,12 +195,11 @@
truetruetrue
-
+ ..\lib\PocoCryptomtd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoCryptomtd.lib
@@ -240,11 +220,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\lib\PocoCryptomt.lib
@@ -263,12 +242,11 @@
truetruetrue
-
+ ..\lib\PocoCryptomdd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoCryptomdd.lib
@@ -289,54 +267,58 @@
truetruetrue
-
+ ..\lib\PocoCryptomd.pdbLevel3
-
+ Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)
+ ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)..\lib\PocoCryptomd.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ true
+ true
+ true
+ true
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Crypto/Crypto_vs110.vcxproj.filters b/Crypto/Crypto_vs110.vcxproj.filters
index 7c16467a5..62ead5b1c 100644
--- a/Crypto/Crypto_vs110.vcxproj.filters
+++ b/Crypto/Crypto_vs110.vcxproj.filters
@@ -2,49 +2,49 @@
- {17594743-3f2a-4d0a-b9f2-1ca0bb26cc43}
+ {9586ad2e-68d9-457d-811f-1a8d14335e51}
- {c0d3b9f3-9eec-4517-a3d2-4612ced13c30}
+ {916f486f-927d-4006-8eeb-d2d2a0a01828}
- {4ec98d78-64f3-4fa5-98a3-3f0390361fd0}
+ {bc3bc671-e964-42d2-b738-6a369b1ea57e}
- {85bc4e63-194e-4b61-99d0-175653201d78}
+ {533a867d-4aee-48d3-9e58-1259d2ec58b7}
- {bf6c3bf5-b255-4056-a747-30ae03bf3349}
+ {68ef201b-40c6-4513-9ac4-4f55ceeba64d}
- {58c8d32d-a284-4f25-9f3b-7ad71773a245}
+ {427156c5-d004-4b43-a4fd-9d838dbda703}
- {2f7618fd-a309-4b9b-b5f4-44758eb9e1aa}
+ {04c78ad3-01a9-4fa9-a71c-9a4ecc1612a4}
- {41359fb8-89cb-47c8-a492-96a495599bb8}
+ {ae2f65ec-8d4b-42c6-9f03-1bf06a83601e}
- {3d1cdd90-779b-4d65-a02b-650fe695e311}
+ {8fb11242-0182-4e83-b884-615025241d85}
- {0d281f4c-ec39-4580-a67b-c45533a2121c}
+ {bfbdd795-b32e-42a2-86f0-0c7262ce93e9}
- {8fd56e7b-745f-4b74-8f8b-6f97dc587eaa}
+ {8aa40931-82ab-473c-bd8f-8e756a5f7ef6}
- {2d809b0b-b26c-4587-ad74-9729d040e6c0}
+ {d18621bd-e305-4084-bd6d-5c73b30b2bf6}
- {c3f1cc05-f4e6-4e31-bc04-3dec0d300f4d}
+ {2a41a8ff-6094-41d6-b241-7f6534aba40a}
- {e7dfc2ed-51f6-4277-b4b3-2dd27f0d3247}
+ {c9970830-1cfd-4913-903f-6683d41ab4fa}
- {5a9bcfa5-e9c8-4f64-abce-b452db7c6b94}
+ {c3539f35-86fa-4b32-9b4d-619c2033c715}
diff --git a/Crypto/Crypto_vs120.sln b/Crypto/Crypto_vs120.sln
index 200fd6bb0..6f57015e6 100644
--- a/Crypto/Crypto_vs120.sln
+++ b/Crypto/Crypto_vs120.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto_vs120.vcxproj", "{EEEE7259-32E9-4D56-B023-C733940AB2A0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}"
@@ -12,37 +10,49 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|Win32 = debug_shared|Win32
- debug_static_md|Win32 = debug_static_md|Win32
- debug_static_mt|Win32 = debug_static_mt|Win32
release_shared|Win32 = release_shared|Win32
- release_static_md|Win32 = release_static_md|Win32
+ debug_static_mt|Win32 = debug_static_mt|Win32
release_static_mt|Win32 = release_static_mt|Win32
+ debug_static_md|Win32 = debug_static_md|Win32
+ release_static_md|Win32 = release_static_md|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|Win32.ActiveCfg = release_shared|Win32
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|Win32.Build.0 = release_shared|Win32
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|Win32.ActiveCfg = release_shared|Win32
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|Win32.Build.0 = release_shared|Win32
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Crypto/Crypto_vs120.vcxproj b/Crypto/Crypto_vs120.vcxproj
index 683ffe5e2..604ef07e2 100644
--- a/Crypto/Crypto_vs120.vcxproj
+++ b/Crypto/Crypto_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
CryptoWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin\
- obj\$(Configuration)\
- true
- ..\bin\
- obj\$(Configuration)\
- false
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoCryptodPocoCryptomddPocoCryptomtd
@@ -107,34 +93,31 @@
PocoCryptomdPocoCryptomt
-
- C:\OpenSSL-Win32\include;$(IncludePath)
- $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib
- C:\OpenSSL-Win32\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
-
-
- C:\OpenSSL-Win32\include;$(IncludePath)
- $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib
- C:\OpenSSL-Win32\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
-
-
- C:\OpenSSL-Win32\include;$(IncludePath)
- $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib
- C:\OpenSSL-Win32\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
-
-
- C:\OpenSSL-Win32\include;$(IncludePath)
- C:\OpenSSL-Win32\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
+
+ ..\bin\
+ obj\$(Configuration)\
+ true
- C:\OpenSSL-Win32\include;$(IncludePath)
- $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib
- C:\OpenSSL-Win32\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
+ ..\bin\
+ obj\$(Configuration)\
+ false
-
- C:\OpenSSL-Win32\include;$(IncludePath)
- $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib
- C:\OpenSSL-Win32\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);;C:\OpenSSL\lib
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
@@ -149,14 +132,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;libeay32MDd.lib;ssleay32MDd.lib;%(AdditionalDependencies)
+ ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)..\bin\PocoCryptod.dlltruetrue
@@ -182,14 +164,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;libeay32MD.lib;ssleay32MD.lib;%(AdditionalDependencies)
+ ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)..\bin\PocoCrypto.dlltruefalse
@@ -214,12 +195,11 @@
truetruetrue
-
+ ..\lib\PocoCryptomtd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoCryptomtd.lib
@@ -240,11 +220,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\lib\PocoCryptomt.lib
@@ -263,12 +242,11 @@
truetruetrue
-
+ ..\lib\PocoCryptomdd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoCryptomdd.lib
@@ -289,54 +267,58 @@
truetruetrue
-
+ ..\lib\PocoCryptomd.pdbLevel3
-
+ Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)
+ ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)..\lib\PocoCryptomd.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ true
+ true
+ true
+ true
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Crypto/Crypto_vs120.vcxproj.filters b/Crypto/Crypto_vs120.vcxproj.filters
index 7c16467a5..235f46aaf 100644
--- a/Crypto/Crypto_vs120.vcxproj.filters
+++ b/Crypto/Crypto_vs120.vcxproj.filters
@@ -2,49 +2,49 @@
- {17594743-3f2a-4d0a-b9f2-1ca0bb26cc43}
+ {b14676c0-6768-4965-bbe3-d372790b20f7}
- {c0d3b9f3-9eec-4517-a3d2-4612ced13c30}
+ {86a4709a-80df-4681-a9d9-ff662f3cd35c}
- {4ec98d78-64f3-4fa5-98a3-3f0390361fd0}
+ {ae4c7dc3-3118-4fff-bb0a-0599b9daee7d}
- {85bc4e63-194e-4b61-99d0-175653201d78}
+ {a08ded1c-f337-4bf0-85b8-fccd9b533c91}
- {bf6c3bf5-b255-4056-a747-30ae03bf3349}
+ {9dc05c3e-63c2-476a-8993-7d892f682da7}
- {58c8d32d-a284-4f25-9f3b-7ad71773a245}
+ {73da2ed5-7a7f-410d-bbb1-2dd51570b4ab}
- {2f7618fd-a309-4b9b-b5f4-44758eb9e1aa}
+ {6ae28e39-6364-4ebd-9906-0e6e3f67d773}
- {41359fb8-89cb-47c8-a492-96a495599bb8}
+ {491130f1-cba5-4348-a8f9-e522e5426cf1}
- {3d1cdd90-779b-4d65-a02b-650fe695e311}
+ {381bcd7e-722f-46f1-a970-d876d433c408}
- {0d281f4c-ec39-4580-a67b-c45533a2121c}
+ {ab86363e-2119-4265-9106-796fcac9ec1d}
- {8fd56e7b-745f-4b74-8f8b-6f97dc587eaa}
+ {8d11161d-756b-4e67-8244-3159c1918941}
- {2d809b0b-b26c-4587-ad74-9729d040e6c0}
+ {77866dee-15f1-48ba-acca-66deffe89f1b}
- {c3f1cc05-f4e6-4e31-bc04-3dec0d300f4d}
+ {481c2952-f6b4-4a97-84de-82eb17443bff}
- {e7dfc2ed-51f6-4277-b4b3-2dd27f0d3247}
+ {ffbb0a92-c003-41f9-9c70-89b20d892f0c}
- {5a9bcfa5-e9c8-4f64-abce-b452db7c6b94}
+ {14bfba97-0048-431a-90ac-4dad4048beb7}
diff --git a/Crypto/Crypto_x64_vs100.vcxproj b/Crypto/Crypto_x64_vs100.vcxproj
index 4981188b0..147fa98e2 100644
--- a/Crypto/Crypto_x64_vs100.vcxproj
+++ b/Crypto/Crypto_x64_vs100.vcxproj
@@ -33,75 +33,75 @@
Win32Proj
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- PocoCrypto64d
- PocoCryptomdd
- PocoCryptomtd
- PocoCrypto64
- PocoCryptomd
- PocoCryptomt
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ PocoCrypto64d
+ PocoCryptomdd
+ PocoCryptomtd
+ PocoCrypto64
+ PocoCryptomd
+ PocoCryptomt
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -132,7 +132,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -166,7 +166,7 @@
MachineX64
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -190,7 +190,7 @@
..\lib64\PocoCryptomtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,7 +215,7 @@
..\lib64\PocoCryptomt.lib
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -239,7 +239,7 @@
..\lib64\PocoCryptomdd.lib
-
+ DisabledOnlyExplicitInline
@@ -299,10 +299,10 @@
- true
- true
- true
- true
+ true
+ true
+ true
+ true
diff --git a/Crypto/Crypto_x64_vs100.vcxproj.filters b/Crypto/Crypto_x64_vs100.vcxproj.filters
index f6c2ec39f..176690b2a 100644
--- a/Crypto/Crypto_x64_vs100.vcxproj.filters
+++ b/Crypto/Crypto_x64_vs100.vcxproj.filters
@@ -2,49 +2,49 @@
- {0547bb78-91a3-42a6-98d7-eee4062fc96d}
+ {b8e545d0-b4c4-474e-a8f9-90d9bc210f57}
- {6ee6b22f-ccff-4894-a138-aead4aa517e7}
+ {1a451d4e-fa60-45f5-8c2c-bbb1013cc34f}
- {73645c11-6227-4871-94e3-d77dd3f24291}
+ {42b4397d-7b59-4e82-a57d-301c175cd9de}
- {ac1d2c15-a701-44b8-a5d0-53270a9b49fb}
+ {a4e5b8c6-1b46-435d-a522-f69e48bf44c5}
- {7d984e13-4192-4041-bdb1-728de0684d30}
+ {76936756-9641-4b0b-a079-b8ddde16b278}
- {a9be19c9-3057-48eb-a21f-a9591307ea36}
+ {4582185a-8cba-419d-94f6-f9d0bc2e8306}
- {53333def-b74f-4969-b6eb-cf158a31e5d4}
+ {96fe9c7f-009d-4cc5-b9da-46a8bbfefd77}
- {1c36d55a-2e79-4a52-83bb-df0ee7b973d5}
+ {eef71fd7-e1ea-469b-b22a-1bb61eadbc90}
- {fd3b9e34-05c4-4754-b481-185dfe34e547}
+ {c77d58ce-aa42-45a2-bbca-ae438a8cc13d}
- {1e012891-c009-45bb-aa3a-76abae9b9235}
+ {24fb9285-22c9-4d24-9495-7f0bf7916cb8}
- {97b573b3-41fe-489f-b74e-a29f3ca2cd1b}
+ {76cdc88e-df87-4d30-a278-7d1b8137f0b0}
- {e8ea85fa-b22d-4850-a9a2-6c8390f6169d}
+ {77b56bbe-74ed-44e6-a10f-a72ef25fa015}
- {673a5ceb-4d21-4e09-b77f-4070077ac56d}
+ {3ad511f6-5f31-4f41-a9b2-9e1811d0c2b3}
- {ef4c04a0-8f67-4a3c-9a63-ceafdd5fa6e1}
+ {961fe017-5281-4ef9-9128-2eaff7842baf}
- {ab15490c-a15c-4d2b-b499-e292a6fc4502}
+ {e06e1c9e-408f-400c-b97a-2322367edcc3}
diff --git a/Crypto/Crypto_x64_vs110.vcxproj b/Crypto/Crypto_x64_vs110.vcxproj
index bc049b3e3..815f5c23e 100644
--- a/Crypto/Crypto_x64_vs110.vcxproj
+++ b/Crypto/Crypto_x64_vs110.vcxproj
@@ -33,81 +33,93 @@
Win32Proj
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- PocoCrypto64d
- PocoCryptomdd
- PocoCryptomtd
- PocoCrypto64
- PocoCryptomd
- PocoCryptomt
+ <_ProjectFileVersion>11.0.61030.0
+ PocoCrypto64d
+ PocoCryptomdd
+ PocoCryptomtd
+ PocoCrypto64
+ PocoCryptomd
+ PocoCryptomt
-
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -124,7 +136,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)
@@ -138,7 +149,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -157,7 +168,6 @@
Level3Default
- %(DisableSpecificWarnings)ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)
@@ -172,7 +182,7 @@
MachineX64
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -190,13 +200,12 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\lib64\PocoCryptomtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,13 +224,12 @@
Level3Default
- %(DisableSpecificWarnings)..\lib64\PocoCryptomt.lib
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -239,13 +247,12 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\lib64\PocoCryptomdd.lib
-
+ DisabledOnlyExplicitInline
@@ -264,7 +271,6 @@
Level3Default
- %(DisableSpecificWarnings)..\lib64\PocoCryptomd.lib
@@ -305,10 +311,10 @@
- true
- true
- true
- true
+ true
+ true
+ true
+ true
diff --git a/Crypto/Crypto_x64_vs110.vcxproj.filters b/Crypto/Crypto_x64_vs110.vcxproj.filters
index 55cc54c49..4eeb58483 100644
--- a/Crypto/Crypto_x64_vs110.vcxproj.filters
+++ b/Crypto/Crypto_x64_vs110.vcxproj.filters
@@ -2,49 +2,49 @@
- {3f9f5db7-e5a5-4665-ac8a-ba3b69472818}
+ {ccd02956-01ad-4bf2-9f72-4035f4d4f2d1}
- {213f2cb2-159b-4c5d-9476-ac88d1edbe41}
+ {4e8a38cf-0f1e-43db-81d4-7cbf7ddd6ce1}
- {04acc5ed-cf5c-4559-8d18-b868152590ba}
+ {7108ea34-2636-42c2-97ed-887789fd4738}
- {a7a20176-8f0b-4819-a12c-7bd07667a2b2}
+ {e0b2909f-f0e0-4942-8e89-d73dcdfa1e73}
- {b5aa8129-dc21-4a39-b45e-b21130fc0d00}
+ {e0fd7172-d76f-4fb6-a565-458db6db9449}
- {abc7e151-a8f8-4abd-80ca-53ac9a3bf00d}
+ {3c29660e-00ce-4d89-9981-f1b12a8c84cf}
- {2e604245-080b-45fc-be1b-4fc052de941d}
+ {d83ae0c4-9253-45f4-9c6b-4132e751e500}
- {c619c482-ec12-4c90-9272-3d49b3b67618}
+ {4c6bb189-dad4-4725-a3f3-a6b20a131fcf}
- {354d77a3-0818-4e37-9ff5-e2e22260408e}
+ {c8a078da-35a0-4a64-91cf-3a0403d9b022}
- {d4f86c3f-bdc6-4ac3-bf88-7984d22fca2f}
+ {dbc91ba2-2e64-45dd-9263-e78f0f817dac}
- {fd2a6fb2-66d6-4132-b3a6-10ca6326e634}
+ {41dc3cfc-dc59-451d-9229-14941cfd4595}
- {3782f037-1b89-44ee-8758-1527f0f13bd3}
+ {de50be71-b76e-4d20-a01b-f100a17c271c}
- {9432ffdb-04a3-4261-a59a-2bfb8dd1a16d}
+ {5ff582da-d4bb-4920-a989-5c26bbff254e}
- {45a5fa97-2c74-4311-b2e7-803135265ae6}
+ {467230d5-1aca-4bb4-ac51-23820632f4d8}
- {c31ed094-d39a-4818-925e-736e5476fc7f}
+ {11e2246d-2bf6-4436-a473-12a414af5aea}
diff --git a/Crypto/Crypto_x64_vs120.sln b/Crypto/Crypto_x64_vs120.sln
index 4575fb7f6..d99dbdc6d 100644
--- a/Crypto/Crypto_x64_vs120.sln
+++ b/Crypto/Crypto_x64_vs120.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto_x64_vs120.vcxproj", "{EEEE7259-32E9-4D56-B023-C733940AB2A0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs120.vcxproj", "{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}"
@@ -12,37 +10,49 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|x64 = debug_shared|x64
- debug_static_md|x64 = debug_static_md|x64
- debug_static_mt|x64 = debug_static_mt|x64
release_shared|x64 = release_shared|x64
- release_static_md|x64 = release_static_md|x64
+ debug_static_mt|x64 = debug_static_mt|x64
release_static_mt|x64 = release_static_mt|x64
+ debug_static_md|x64 = debug_static_md|x64
+ release_static_md|x64 = release_static_md|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|x64.ActiveCfg = debug_shared|x64
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|x64.Build.0 = debug_shared|x64
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_shared|x64.Deploy.0 = debug_shared|x64
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|x64.ActiveCfg = release_shared|x64
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|x64.Build.0 = release_shared|x64
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.Build.0 = release_static_md|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_shared|x64.Deploy.0 = release_shared|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.Build.0 = release_static_md|x64
+ {EEEE7259-32E9-4D56-B023-C733940AB2A0}.release_static_md|x64.Deploy.0 = release_static_md|x64
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.ActiveCfg = debug_shared|x64
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.Build.0 = debug_shared|x64
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.Deploy.0 = debug_shared|x64
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.ActiveCfg = release_shared|x64
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.Build.0 = release_shared|x64
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.Build.0 = release_static_md|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.Deploy.0 = release_shared|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.Build.0 = release_static_md|x64
+ {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.Deploy.0 = release_static_md|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Crypto/Crypto_x64_vs120.vcxproj b/Crypto/Crypto_x64_vs120.vcxproj
index b41b6d11f..534e81936 100644
--- a/Crypto/Crypto_x64_vs120.vcxproj
+++ b/Crypto/Crypto_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
CryptoWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoCrypto64dPocoCryptomddPocoCryptomtd
@@ -107,29 +93,31 @@
PocoCryptomdPocoCryptomt
-
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib\VC\static;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
-
-
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib\VC;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
-
-
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib\VC;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
-
-
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib\VC\static;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib\VC;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
-
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib\VC;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
@@ -144,14 +132,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;libeay32MDd.lib;ssleay32MDd.lib;%(AdditionalDependencies)
+ ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)..\bin64\PocoCrypto64d.dlltruetrue
@@ -177,14 +164,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;libeay32MD.lib;ssleay32MD.lib;%(AdditionalDependencies)
+ ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)..\bin64\PocoCrypto64.dlltruefalse
@@ -209,12 +195,11 @@
truetruetrue
-
+ ..\lib64\PocoCryptomtd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\lib64\PocoCryptomtd.lib
@@ -235,11 +220,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\lib64\PocoCryptomt.lib
@@ -258,12 +242,11 @@
truetruetrue
-
+ ..\lib64\PocoCryptomdd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\lib64\PocoCryptomdd.lib
@@ -284,48 +267,47 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\lib64\PocoCryptomd.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -335,6 +317,6 @@
true
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Crypto/Crypto_x64_vs120.vcxproj.filters b/Crypto/Crypto_x64_vs120.vcxproj.filters
index 55cc54c49..90cb42190 100644
--- a/Crypto/Crypto_x64_vs120.vcxproj.filters
+++ b/Crypto/Crypto_x64_vs120.vcxproj.filters
@@ -2,49 +2,49 @@
- {3f9f5db7-e5a5-4665-ac8a-ba3b69472818}
+ {9820e89c-50f2-4f23-9a9c-9fe7c82f1601}
- {213f2cb2-159b-4c5d-9476-ac88d1edbe41}
+ {6430dd92-8be0-4494-8737-865247764d59}
- {04acc5ed-cf5c-4559-8d18-b868152590ba}
+ {554f604e-ce75-4980-9d43-e37cf72b7c49}
- {a7a20176-8f0b-4819-a12c-7bd07667a2b2}
+ {7279fbe0-8d9f-4a96-b11f-459ac675c77d}
- {b5aa8129-dc21-4a39-b45e-b21130fc0d00}
+ {9597d44c-7b55-4a14-a316-463a567c96c0}
- {abc7e151-a8f8-4abd-80ca-53ac9a3bf00d}
+ {4e737f37-2d77-443c-bbaf-9b01a0c956b8}
- {2e604245-080b-45fc-be1b-4fc052de941d}
+ {6841f45c-70a7-4ca4-a236-68c55232e501}
- {c619c482-ec12-4c90-9272-3d49b3b67618}
+ {ce54adb5-7bc0-4764-bf2c-79bf8c933b02}
- {354d77a3-0818-4e37-9ff5-e2e22260408e}
+ {4b16ee53-52b4-4f46-b2c9-4abe1d0626f8}
- {d4f86c3f-bdc6-4ac3-bf88-7984d22fca2f}
+ {a840eb74-4c28-4293-a6e3-12d43d7e4e93}
- {fd2a6fb2-66d6-4132-b3a6-10ca6326e634}
+ {96228cab-2225-4112-809b-0d8e367b3b1d}
- {3782f037-1b89-44ee-8758-1527f0f13bd3}
+ {b0081617-f74f-4c40-804d-ef793dd54b82}
- {9432ffdb-04a3-4261-a59a-2bfb8dd1a16d}
+ {b944097e-b5b7-406a-a8fa-2660b214d3d5}
- {45a5fa97-2c74-4311-b2e7-803135265ae6}
+ {eb6f9c36-2d7f-4604-9c81-d2e2226d16a5}
- {c31ed094-d39a-4818-925e-736e5476fc7f}
+ {b4da77ae-932b-4ef8-a2bf-b132f6642c11}
diff --git a/Crypto/include/Poco/Crypto/Cipher.h b/Crypto/include/Poco/Crypto/Cipher.h
old mode 100644
new mode 100755
index ba552f437..30d17f3cd
--- a/Crypto/include/Poco/Crypto/Cipher.h
+++ b/Crypto/include/Poco/Crypto/Cipher.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/CipherFactory.h b/Crypto/include/Poco/Crypto/CipherFactory.h
old mode 100644
new mode 100755
index b1c06d4df..7cfd73e6f
--- a/Crypto/include/Poco/Crypto/CipherFactory.h
+++ b/Crypto/include/Poco/Crypto/CipherFactory.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/CipherImpl.h b/Crypto/include/Poco/Crypto/CipherImpl.h
old mode 100644
new mode 100755
index 66f48360e..1a1f10b6e
--- a/Crypto/include/Poco/Crypto/CipherImpl.h
+++ b/Crypto/include/Poco/Crypto/CipherImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/CipherKey.h b/Crypto/include/Poco/Crypto/CipherKey.h
old mode 100644
new mode 100755
index 28b502ff0..792de73b2
--- a/Crypto/include/Poco/Crypto/CipherKey.h
+++ b/Crypto/include/Poco/Crypto/CipherKey.h
@@ -12,27 +12,7 @@
// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/CipherKeyImpl.h b/Crypto/include/Poco/Crypto/CipherKeyImpl.h
old mode 100644
new mode 100755
index ae03d5b3f..3b9e7bfce
--- a/Crypto/include/Poco/Crypto/CipherKeyImpl.h
+++ b/Crypto/include/Poco/Crypto/CipherKeyImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/Crypto.h b/Crypto/include/Poco/Crypto/Crypto.h
old mode 100644
new mode 100755
index b9161beed..fcfb20ec2
--- a/Crypto/include/Poco/Crypto/Crypto.h
+++ b/Crypto/include/Poco/Crypto/Crypto.h
@@ -14,27 +14,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/CryptoStream.h b/Crypto/include/Poco/Crypto/CryptoStream.h
old mode 100644
new mode 100755
index 895dc50a9..469b05cf6
--- a/Crypto/include/Poco/Crypto/CryptoStream.h
+++ b/Crypto/include/Poco/Crypto/CryptoStream.h
@@ -13,27 +13,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/CryptoTransform.h b/Crypto/include/Poco/Crypto/CryptoTransform.h
old mode 100644
new mode 100755
index 8c0f9cbad..1bae01ff5
--- a/Crypto/include/Poco/Crypto/CryptoTransform.h
+++ b/Crypto/include/Poco/Crypto/CryptoTransform.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/DigestEngine.h b/Crypto/include/Poco/Crypto/DigestEngine.h
old mode 100644
new mode 100755
index 7f3e2e177..b6e1b2d37
--- a/Crypto/include/Poco/Crypto/DigestEngine.h
+++ b/Crypto/include/Poco/Crypto/DigestEngine.h
@@ -12,27 +12,7 @@
// Copyright (c) 2012, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
old mode 100644
new mode 100755
index 0ca331699..f4f128dcb
--- a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
+++ b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006-2009, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/RSACipherImpl.h b/Crypto/include/Poco/Crypto/RSACipherImpl.h
old mode 100644
new mode 100755
index ea96ddd1b..6d433ed1f
--- a/Crypto/include/Poco/Crypto/RSACipherImpl.h
+++ b/Crypto/include/Poco/Crypto/RSACipherImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/RSADigestEngine.h b/Crypto/include/Poco/Crypto/RSADigestEngine.h
old mode 100644
new mode 100755
index 4a7ff7a02..e4e847915
--- a/Crypto/include/Poco/Crypto/RSADigestEngine.h
+++ b/Crypto/include/Poco/Crypto/RSADigestEngine.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/RSAKey.h b/Crypto/include/Poco/Crypto/RSAKey.h
old mode 100644
new mode 100755
index f765739c8..6aa26f171
--- a/Crypto/include/Poco/Crypto/RSAKey.h
+++ b/Crypto/include/Poco/Crypto/RSAKey.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/RSAKeyImpl.h b/Crypto/include/Poco/Crypto/RSAKeyImpl.h
old mode 100644
new mode 100755
index 54ef84bce..10c074b0d
--- a/Crypto/include/Poco/Crypto/RSAKeyImpl.h
+++ b/Crypto/include/Poco/Crypto/RSAKeyImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/include/Poco/Crypto/X509Certificate.h b/Crypto/include/Poco/Crypto/X509Certificate.h
old mode 100644
new mode 100755
index 56325d05a..472c53763
--- a/Crypto/include/Poco/Crypto/X509Certificate.h
+++ b/Crypto/include/Poco/Crypto/X509Certificate.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006-2009, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/samples/genrsakey/genrsakey_vs100.vcxproj b/Crypto/samples/genrsakey/genrsakey_vs100.vcxproj
index 7e3d9809d..1947c3f3b 100644
--- a/Crypto/samples/genrsakey/genrsakey_vs100.vcxproj
+++ b/Crypto/samples/genrsakey/genrsakey_vs100.vcxproj
@@ -33,79 +33,79 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- genrsakeyd
- genrsakeyd
- genrsakeyd
- genrsakey
- genrsakey
- genrsakey
+ bin\
+ obj\$(Configuration)\
+ true
+ bin\
+ obj\$(Configuration)\
+ false
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ genrsakeyd
+ genrsakeyd
+ genrsakeyd
+ genrsakey
+ genrsakey
+ genrsakey
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -135,7 +135,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -167,7 +167,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -197,7 +197,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -229,7 +229,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -259,7 +259,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
diff --git a/Crypto/samples/genrsakey/genrsakey_vs100.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_vs100.vcxproj.filters
index 03a5b3145..66908b09e 100644
--- a/Crypto/samples/genrsakey/genrsakey_vs100.vcxproj.filters
+++ b/Crypto/samples/genrsakey/genrsakey_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
- {a968fe8b-bb93-43e8-97b2-eb38a9a37022}
+ {61712db6-9895-466d-b5d3-4dda089fc043}
- {dfe4b514-4c67-4a8d-bbec-df328d0423a0}
+ {b968a863-83b0-4a30-accc-512341494dfb}
diff --git a/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj b/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj
index 2572a6cd2..d1b1b21b5 100644
--- a/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj
+++ b/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj
@@ -33,85 +33,97 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- genrsakeyd
- genrsakeyd
- genrsakeyd
- genrsakey
- genrsakey
- genrsakey
+ <_ProjectFileVersion>11.0.61030.0
+ genrsakeyd
+ genrsakeyd
+ genrsakeyd
+ genrsakey
+ genrsakey
+ genrsakey
-
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -128,7 +140,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -141,7 +152,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -160,7 +171,6 @@
Level3Default
- %(DisableSpecificWarnings)libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -173,7 +183,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -190,7 +200,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -203,7 +212,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -222,7 +231,6 @@
Level3Default
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -235,7 +243,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -252,7 +260,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -265,7 +272,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -284,7 +291,6 @@
Level3Default
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
diff --git a/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.filters
index 166c41e4d..5c9bf936f 100644
--- a/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.filters
+++ b/Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {381b2559-cc38-487e-b5bf-b795affe682c}
+ {06207a2d-dedf-49f7-afb3-d5174cf881f8}
- {96980b90-ddc8-4f21-8d66-511c4eeb1f1b}
+ {d5079db2-7617-4930-95d6-f9d973b5aa05}
diff --git a/Crypto/samples/genrsakey/genrsakey_vs120.vcxproj b/Crypto/samples/genrsakey/genrsakey_vs120.vcxproj
index 6fa2ec74c..21ceb19e5 100644
--- a/Crypto/samples/genrsakey/genrsakey_vs120.vcxproj
+++ b/Crypto/samples/genrsakey/genrsakey_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
genrsakeyWin32Proj
-
+ ApplicationMultiByte
@@ -63,47 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
genrsakeydgenrsakeydgenrsakeyd
@@ -111,29 +93,35 @@
genrsakeygenrsakey
-
- C:\OpenSSL-Win32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC\static;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);
-
-
- C:\OpenSSL-Win32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC\static;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);
-
-
- C:\OpenSSL-Win32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC\static;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);
-
-
- C:\OpenSSL-Win32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC\static;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);
+
+ bin\
+ obj\$(Configuration)\
+ true
- C:\OpenSSL-Win32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);
+ bin\
+ obj\$(Configuration)\
+ false
-
- C:\OpenSSL-Win32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
@@ -148,14 +136,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- libeay32MDd.lib;ssleay32MDd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)bin\genrsakeyd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -180,14 +167,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- libeay32MD.lib;ssleay32MD.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)bin\genrsakey.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -210,11 +196,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -242,11 +227,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -272,11 +256,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -304,11 +287,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -322,8 +304,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Crypto/samples/genrsakey/genrsakey_vs120.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_vs120.vcxproj.filters
index 166c41e4d..1c35de949 100644
--- a/Crypto/samples/genrsakey/genrsakey_vs120.vcxproj.filters
+++ b/Crypto/samples/genrsakey/genrsakey_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
- {381b2559-cc38-487e-b5bf-b795affe682c}
+ {26203f04-1f43-45ed-81c6-047bc5e18527}
- {96980b90-ddc8-4f21-8d66-511c4eeb1f1b}
+ {620a2fb4-6fb3-4ac9-98ce-dbe20be213d1}
diff --git a/Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj b/Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj
index 27d9ffd62..60ebfe722 100644
--- a/Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj
+++ b/Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj
@@ -33,79 +33,79 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- genrsakeyd
- genrsakeyd
- genrsakeyd
- genrsakey
- genrsakey
- genrsakey
+ bin64\
+ obj64\$(Configuration)\
+ true
+ bin64\
+ obj64\$(Configuration)\
+ false
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ genrsakeyd
+ genrsakeyd
+ genrsakeyd
+ genrsakey
+ genrsakey
+ genrsakey
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -135,7 +135,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -167,7 +167,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -197,7 +197,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -229,7 +229,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -259,7 +259,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
diff --git a/Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj.filters
index df8f10509..b7dc513a0 100644
--- a/Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj.filters
+++ b/Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
- {8dd265c7-1f67-47b4-9ae5-768ea08464d8}
+ {525a10c8-7f70-478c-b9bf-4179b9c6fbeb}
- {9bfd7dbb-db21-4332-9f31-aebfd9e7287b}
+ {70a10c57-ca6f-4a38-8475-be32c793a293}
diff --git a/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj b/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj
index 47d8bf721..aff3073f9 100644
--- a/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj
+++ b/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj
@@ -33,85 +33,97 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- genrsakeyd
- genrsakeyd
- genrsakeyd
- genrsakey
- genrsakey
- genrsakey
+ <_ProjectFileVersion>11.0.61030.0
+ genrsakeyd
+ genrsakeyd
+ genrsakeyd
+ genrsakey
+ genrsakey
+ genrsakey
-
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -128,7 +140,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -141,7 +152,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -160,7 +171,6 @@
Level3Default
- %(DisableSpecificWarnings)libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -173,7 +183,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -190,7 +200,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -203,7 +212,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -222,7 +231,6 @@
Level3Default
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -235,7 +243,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories)
@@ -252,7 +260,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -265,7 +272,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -284,7 +291,6 @@
Level3Default
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
diff --git a/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.filters
index 37715bebb..2f7b28975 100644
--- a/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.filters
+++ b/Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {752288ff-9835-4729-a04f-7862c6391838}
+ {1f5346a9-de0d-48fb-9b08-b7e89ff6f8fd}
- {dc290695-43b9-4284-b075-1eadd4cb2cf3}
+ {45a48cc7-f163-46a0-8048-dbdb30f80111}
diff --git a/Crypto/samples/genrsakey/genrsakey_x64_vs120.vcxproj b/Crypto/samples/genrsakey/genrsakey_x64_vs120.vcxproj
index dd05a2ac7..0a574e4fb 100644
--- a/Crypto/samples/genrsakey/genrsakey_x64_vs120.vcxproj
+++ b/Crypto/samples/genrsakey/genrsakey_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
genrsakeyWin32Proj
-
+ ApplicationMultiByte
@@ -63,47 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
genrsakeydgenrsakeydgenrsakeyd
@@ -111,29 +93,35 @@
genrsakeygenrsakey
-
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib\static;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
-
-
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib\static;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
-
-
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib\static;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
-
-
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib\static;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
+
+ bin64\
+ obj64\$(Configuration)\
+ true
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
+ bin64\
+ obj64\$(Configuration)\
+ false
-
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win64\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
@@ -148,14 +136,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- libeay32MDd.lib;ssleay32MDd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\genrsakeyd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -180,14 +167,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- libeay32MD.lib;ssleay32MD.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\genrsakey.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -210,11 +196,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -242,11 +227,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -272,11 +256,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -304,11 +287,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -322,8 +304,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Crypto/samples/genrsakey/genrsakey_x64_vs120.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_x64_vs120.vcxproj.filters
index 37715bebb..75d83a4ea 100644
--- a/Crypto/samples/genrsakey/genrsakey_x64_vs120.vcxproj.filters
+++ b/Crypto/samples/genrsakey/genrsakey_x64_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
- {752288ff-9835-4729-a04f-7862c6391838}
+ {7d214f0b-5eb2-4864-945f-c334a5a6c849}
- {dc290695-43b9-4284-b075-1eadd4cb2cf3}
+ {e2cfab8d-c3ed-42ba-812d-78adcbf32966}
diff --git a/Crypto/samples/genrsakey/src/genrsakey.cpp b/Crypto/samples/genrsakey/src/genrsakey.cpp
old mode 100644
new mode 100755
index 35af7456c..40ffc0a16
--- a/Crypto/samples/genrsakey/src/genrsakey.cpp
+++ b/Crypto/samples/genrsakey/src/genrsakey.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/samples/samples_vs120.sln b/Crypto/samples/samples_vs120.sln
index 25b6231a9..348805354 100644
--- a/Crypto/samples/samples_vs120.sln
+++ b/Crypto/samples/samples_vs120.sln
@@ -1,31 +1,35 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrsakey", "genrsakey\genrsakey_vs120.vcxproj", "{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|Win32 = debug_shared|Win32
- debug_static_md|Win32 = debug_static_md|Win32
- debug_static_mt|Win32 = debug_static_mt|Win32
release_shared|Win32 = release_shared|Win32
- release_static_md|Win32 = release_static_md|Win32
+ debug_static_mt|Win32 = debug_static_mt|Win32
release_static_mt|Win32 = release_static_mt|Win32
+ debug_static_md|Win32 = debug_static_md|Win32
+ release_static_md|Win32 = release_static_md|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.ActiveCfg = release_shared|Win32
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.Build.0 = release_shared|Win32
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Crypto/samples/samples_x64_vs120.sln b/Crypto/samples/samples_x64_vs120.sln
index a154e24a5..9efedd3c5 100644
--- a/Crypto/samples/samples_x64_vs120.sln
+++ b/Crypto/samples/samples_x64_vs120.sln
@@ -1,31 +1,35 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrsakey", "genrsakey\genrsakey_x64_vs120.vcxproj", "{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|x64 = debug_shared|x64
- debug_static_md|x64 = debug_static_md|x64
- debug_static_mt|x64 = debug_static_mt|x64
release_shared|x64 = release_shared|x64
- release_static_md|x64 = release_static_md|x64
+ debug_static_mt|x64 = debug_static_mt|x64
release_static_mt|x64 = release_static_mt|x64
+ debug_static_md|x64 = debug_static_md|x64
+ release_static_md|x64 = release_static_md|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.ActiveCfg = debug_shared|x64
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.Build.0 = debug_shared|x64
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|x64.Deploy.0 = debug_shared|x64
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.ActiveCfg = release_shared|x64
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.Build.0 = release_shared|x64
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.Build.0 = release_static_md|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|x64.Deploy.0 = release_shared|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.Build.0 = release_static_md|x64
+ {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|x64.Deploy.0 = release_static_md|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Crypto/src/Cipher.cpp b/Crypto/src/Cipher.cpp
old mode 100644
new mode 100755
index 66ed7ee60..55ebff756
--- a/Crypto/src/Cipher.cpp
+++ b/Crypto/src/Cipher.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/CipherFactory.cpp b/Crypto/src/CipherFactory.cpp
old mode 100644
new mode 100755
index 4c460babd..e8f5f6fb0
--- a/Crypto/src/CipherFactory.cpp
+++ b/Crypto/src/CipherFactory.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/CipherImpl.cpp b/Crypto/src/CipherImpl.cpp
old mode 100644
new mode 100755
index 0ead03e10..b115ede8f
--- a/Crypto/src/CipherImpl.cpp
+++ b/Crypto/src/CipherImpl.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/CipherKey.cpp b/Crypto/src/CipherKey.cpp
old mode 100644
new mode 100755
index 4b570c055..eb535e9d8
--- a/Crypto/src/CipherKey.cpp
+++ b/Crypto/src/CipherKey.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/CipherKeyImpl.cpp b/Crypto/src/CipherKeyImpl.cpp
old mode 100644
new mode 100755
index fabbead67..bcd7452c6
--- a/Crypto/src/CipherKeyImpl.cpp
+++ b/Crypto/src/CipherKeyImpl.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/CryptoStream.cpp b/Crypto/src/CryptoStream.cpp
old mode 100644
new mode 100755
index e01786709..97e73ce81
--- a/Crypto/src/CryptoStream.cpp
+++ b/Crypto/src/CryptoStream.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/CryptoTransform.cpp b/Crypto/src/CryptoTransform.cpp
old mode 100644
new mode 100755
index 52b724231..20157ab7d
--- a/Crypto/src/CryptoTransform.cpp
+++ b/Crypto/src/CryptoTransform.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/DigestEngine.cpp b/Crypto/src/DigestEngine.cpp
old mode 100644
new mode 100755
index 05d9daacc..6e574ab42
--- a/Crypto/src/DigestEngine.cpp
+++ b/Crypto/src/DigestEngine.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2012, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/OpenSSLInitializer.cpp b/Crypto/src/OpenSSLInitializer.cpp
old mode 100644
new mode 100755
index ccd8c5998..0172eec5d
--- a/Crypto/src/OpenSSLInitializer.cpp
+++ b/Crypto/src/OpenSSLInitializer.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006-2009, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/RSACipherImpl.cpp b/Crypto/src/RSACipherImpl.cpp
old mode 100644
new mode 100755
index 2c9d2caee..91c5b815d
--- a/Crypto/src/RSACipherImpl.cpp
+++ b/Crypto/src/RSACipherImpl.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/RSADigestEngine.cpp b/Crypto/src/RSADigestEngine.cpp
old mode 100644
new mode 100755
index 774ebfb94..f0ae5c980
--- a/Crypto/src/RSADigestEngine.cpp
+++ b/Crypto/src/RSADigestEngine.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/RSAKey.cpp b/Crypto/src/RSAKey.cpp
old mode 100644
new mode 100755
index 69c83338f..3dfcd138e
--- a/Crypto/src/RSAKey.cpp
+++ b/Crypto/src/RSAKey.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/RSAKeyImpl.cpp b/Crypto/src/RSAKeyImpl.cpp
old mode 100644
new mode 100755
index 581606604..2fbd555f2
--- a/Crypto/src/RSAKeyImpl.cpp
+++ b/Crypto/src/RSAKeyImpl.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/src/X509Certificate.cpp b/Crypto/src/X509Certificate.cpp
old mode 100644
new mode 100755
index ff24ea4c2..91c274ddd
--- a/Crypto/src/X509Certificate.cpp
+++ b/Crypto/src/X509Certificate.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006-2009, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/testsuite/TestSuite_vs100.vcxproj b/Crypto/testsuite/TestSuite_vs100.vcxproj
index 1b7c0aa2d..85bee59c7 100644
--- a/Crypto/testsuite/TestSuite_vs100.vcxproj
+++ b/Crypto/testsuite/TestSuite_vs100.vcxproj
@@ -33,85 +33,85 @@
Win32Proj
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ bin\
+ obj\$(Configuration)\
+ true
+ bin\
+ obj\$(Configuration)\
+ false
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -141,7 +141,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -173,7 +173,7 @@
MachineX86
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -204,7 +204,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -237,7 +237,7 @@
MachineX86
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -257,7 +257,7 @@
%(DisableSpecificWarnings)
- CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin\static_md\TestSuited.exe..\..\lib;%(AdditionalLibraryDirectories)true
@@ -267,7 +267,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -289,7 +289,7 @@
%(DisableSpecificWarnings)
- CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin\static_md\TestSuite.exe..\..\lib;%(AdditionalLibraryDirectories)false
diff --git a/Crypto/testsuite/TestSuite_vs100.vcxproj.filters b/Crypto/testsuite/TestSuite_vs100.vcxproj.filters
index 83d32262a..190abbb10 100644
--- a/Crypto/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
- {b0c1cc37-d276-4845-9ef2-5b223ffe0fdc}
+ {4621c90a-5aad-472b-9283-240375fa6e25}
- {44e816a4-2a81-4e6d-9d58-6b486c7415b3}
+ {2ce1e7d6-7724-46cc-acab-486529daf8f9}
- {465c6e7b-5b77-4890-b656-277d61142ce0}
+ {99a1ac31-2086-4059-abbf-f156b6e684b6}
- {8859d3f9-2bad-46e8-8478-06bac5e0eba4}
+ {acaedaf7-94a9-42ab-8c8a-6de861a7e7bf}
- {29193557-59e2-4ddb-a356-27415a705c47}
+ {1a8a1c93-0f43-4d85-bd30-fd5b98b31dee}
- {ac05d6b4-b753-4042-8b6c-4c96397e6094}
+ {4d426cfe-f97b-4643-8e85-ab67a0a85b98}
- {f6ebf605-fba4-4bfa-88c8-bb17b41b49db}
+ {3cd6e222-0af4-4e00-b45e-66116b303436}
- {402f9136-e50a-4859-8e23-dfd908322ae1}
+ {fee1fd38-d609-4bc1-8479-adb99a636d12}
diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj b/Crypto/testsuite/TestSuite_vs110.vcxproj
index 325d589a0..ceb7052ad 100644
--- a/Crypto/testsuite/TestSuite_vs110.vcxproj
+++ b/Crypto/testsuite/TestSuite_vs110.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -32,7 +32,7 @@
TestSuiteWin32Proj
-
+ ApplicationDynamic
@@ -69,47 +69,29 @@
MultiBytev110
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -117,35 +99,35 @@
TestSuiteTestSuite
-
- $(ExecutablePath)
- C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
-
-
- $(ExecutablePath)
- C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
-
-
- $(ExecutablePath)
- C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
-
-
- $(ExecutablePath)
- C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL\lib;C:\OpenSSL\lib\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
+
+ bin\
+ obj\$(Configuration)\
+ true
- $(ExecutablePath)
- C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
+ bin\
+ obj\$(Configuration)\
+ false
-
- $(ExecutablePath)
- C:\OpenSSL\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
@@ -160,11 +142,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)
@@ -192,11 +173,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)
@@ -222,11 +202,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies)
@@ -255,11 +234,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies)
@@ -286,14 +264,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin\static_md\TestSuited.exe..\..\lib;%(AdditionalLibraryDirectories)true
@@ -318,14 +295,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin\static_md\TestSuite.exe..\..\lib;%(AdditionalLibraryDirectories)false
@@ -336,18 +312,18 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters
index 47150f0cb..4ba33b5d5 100644
--- a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
- {e3337374-58ec-4088-b09e-b64458aa23e5}
+ {afb482f9-9456-45d5-b1b3-3b0bf5d3a051}
- {667a5bf7-fa51-4460-8394-2f72db8293ed}
+ {39d00675-e537-44bc-8b07-e5626b01413b}
- {0d82609d-2c6d-4540-8a69-d46c22d7c33e}
+ {872ab95e-b850-47d7-be92-3ba148fa1ca6}
- {b7352f7d-5b81-40a2-b647-f0b2aa37ddd7}
+ {55160076-ae30-4c25-9886-407361c6d088}
- {efeb8c04-c633-4677-b99c-257a5e542c7d}
+ {ab869f6b-fa9b-40df-8e16-3bc421c2625d}
- {048cb1e3-1b8a-4fe1-9fbc-2f7e543265c6}
+ {91e1cf40-3c70-436b-8f28-fb7ae7693139}
- {5ac33225-2aae-446e-b3a5-88b11de4948e}
+ {54f89e60-2eda-437d-86eb-d5aac25a430e}
- {e71d3272-bba3-42e9-bd06-254603056cb9}
+ {8985bef7-e3d3-4ca1-8ac4-7cbee97c00a3}
diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj b/Crypto/testsuite/TestSuite_vs120.vcxproj
index 7498735de..b9ec7b035 100644
--- a/Crypto/testsuite/TestSuite_vs120.vcxproj
+++ b/Crypto/testsuite/TestSuite_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,84 +32,60 @@
TestSuiteWin32Proj
-
+ Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -117,35 +93,35 @@
TestSuiteTestSuite
-
- $(ExecutablePath)
- C:\OpenSSL-Win32\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC\static;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
-
-
- $(ExecutablePath)
- C:\OpenSSL-Win32\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
-
-
- $(ExecutablePath)
- C:\OpenSSL-Win32\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
-
-
- $(ExecutablePath)
- C:\OpenSSL-Win32\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC\static$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
+
+ bin\
+ obj\$(Configuration)\
+ true
- $(ExecutablePath)
- C:\OpenSSL-Win32\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
+ bin\
+ obj\$(Configuration)\
+ false
-
- $(ExecutablePath)
- C:\OpenSSL-Win32\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\OpenSSL-Win32\lib\VC;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
@@ -160,14 +136,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- CppUnitd.lib;ws2_32.lib;iphlpapi.lib;libeay32MDd.lib;ssleay32MDd.lib;%(AdditionalDependencies)
+ CppUnitd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin\TestSuited.exe..\..\lib;%(AdditionalLibraryDirectories)true
@@ -192,14 +167,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnit.lib;ws2_32.lib;iphlpapi.lib;libeay32MDd.lib;ssleay32MDd.lib;%(AdditionalDependencies)
+ CppUnit.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin\TestSuite.exe..\..\lib;%(AdditionalLibraryDirectories)false
@@ -222,17 +196,15 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- CppUnitmtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies)bin\static_mt\TestSuited.exe..\..\lib;%(AdditionalLibraryDirectories)
- nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)truetruebin\static_mt\TestSuited.pdb
@@ -255,17 +227,15 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies)bin\static_mt\TestSuite.exe..\..\lib;%(AdditionalLibraryDirectories)
- nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)falseConsoletrue
@@ -286,14 +256,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin\static_md\TestSuited.exe..\..\lib;%(AdditionalLibraryDirectories)true
@@ -318,14 +287,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin\static_md\TestSuite.exe..\..\lib;%(AdditionalLibraryDirectories)false
@@ -336,18 +304,18 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_vs120.vcxproj.filters
index cc119a2dc..50b09f5b2 100644
--- a/Crypto/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
- {e3337374-58ec-4088-b09e-b64458aa23e5}
+ {d4ebb36f-3e61-45c0-b87e-959a014c8253}
- {667a5bf7-fa51-4460-8394-2f72db8293ed}
+ {6eae5f01-09fc-45a5-895a-6e9f6a6d134d}
- {0d82609d-2c6d-4540-8a69-d46c22d7c33e}
+ {92ff7879-7df8-430c-b971-5a0579bb9d04}
- {b7352f7d-5b81-40a2-b647-f0b2aa37ddd7}
+ {6844a11a-e58d-4e7d-a99c-67d67eb8727a}
- {efeb8c04-c633-4677-b99c-257a5e542c7d}
+ {517c4690-4d58-43a6-953a-3893b172e6b9}
- {048cb1e3-1b8a-4fe1-9fbc-2f7e543265c6}
+ {ede9974e-097d-408c-98f2-3a8a4c1a0feb}
- {5ac33225-2aae-446e-b3a5-88b11de4948e}
+ {59fdd27b-49b8-4a08-bc87-2e9f1c3cc1a2}
- {e71d3272-bba3-42e9-bd06-254603056cb9}
+ {fda82ab0-2d8f-44c5-81ee-ee384fcb2d41}
@@ -53,7 +53,7 @@
_Suite\Source Files
-
+ _Driver\Source Files
diff --git a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj
index 203a58d3d..9d0f4ddb3 100644
--- a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj
+++ b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -32,7 +32,7 @@
TestSuiteWin32Proj
-
+ ApplicationDynamic
@@ -63,27 +63,27 @@
DynamicMultiByte
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
<_ProjectFileVersion>10.0.40219.1
bin64\
@@ -110,14 +110,12 @@
TestSuiteTestSuiteTestSuite
- C:\openssl\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;
- C:\openssl\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
- WIN32;_WIN64;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -126,7 +124,7 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
@@ -151,16 +149,16 @@
Speedtrue..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
- WIN32;_WIN64;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)trueMultiThreadedDLLfalsetruetruetrue
-
+ Level3
-
+ Default%(DisableSpecificWarnings)
@@ -179,7 +177,7 @@
Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
- WIN32;_WIN64;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -188,7 +186,7 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
@@ -214,16 +212,16 @@
Speedtrue..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
- WIN32;_WIN64;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)trueMultiThreadedfalsetruetruetrue
-
+ Level3
-
+ Default%(DisableSpecificWarnings)
@@ -243,7 +241,7 @@
Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
- WIN32;_WIN64;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -252,14 +250,14 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault%(DisableSpecificWarnings)
- CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin64\static_md\TestSuited.exe..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -277,21 +275,21 @@
Speedtrue..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
- WIN32;_WIN64;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)trueMultiThreadedDLLfalsetruetruetrue
-
+ Level3
-
+ Default%(DisableSpecificWarnings)
- CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin64\static_md\TestSuite.exe..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -302,18 +300,18 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters
index d3525b352..278468024 100644
--- a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
- {8cbfe2d1-d809-4778-90a5-09646822247e}
+ {85927cf0-d272-498e-a26e-f786cd35a169}
- {eb38d78f-f960-4853-a5fd-c297240afe31}
+ {315e5983-1e6a-479e-b064-cf03634ab9b3}
- {37c520a5-4a64-4212-b199-d73abf8a8eed}
+ {1ede210b-c13d-43a3-864a-277a8df65d3b}
- {a3c8bb10-f915-49fe-8b62-2541d3733b5f}
+ {db36b730-12b2-43f4-8f8e-94187ead0774}
- {6cb37497-dcce-4f49-8afb-c0e6d3cad968}
+ {1487ec8b-ddc7-4ef7-af52-1525ee0ec7c3}
- {981b6f85-3f84-4d99-904f-457ca41f9533}
+ {901272d6-9d9f-4195-942a-508f4a1f8311}
- {3dee7ea3-7f2b-4653-b372-aacee87c2e22}
+ {3d8b8482-45cf-4086-8680-2e18f0354b14}
- {842f88be-fd5c-443e-b39d-3eaaa4fcc797}
+ {391cc7d4-ef88-4fb3-8424-f8725042939a}
diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj
index 0a07925c6..8fa131358 100644
--- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj
+++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj
@@ -33,37 +33,37 @@
Win32Proj
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiByte
@@ -71,53 +71,65 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ <_ProjectFileVersion>11.0.61030.0
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -134,7 +146,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)
@@ -147,7 +158,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -166,7 +177,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)
@@ -179,7 +189,7 @@
MachineX64
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -196,7 +206,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies)
@@ -210,7 +219,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -229,7 +238,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies)
@@ -243,7 +251,7 @@
MachineX64
-
+ Disabled..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -260,10 +268,9 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin64\static_md\TestSuited.exe..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -273,7 +280,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -292,10 +299,9 @@
Level3Default
- %(DisableSpecificWarnings)
- CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin64\static_md\TestSuite.exe..\..\lib64;%(AdditionalLibraryDirectories)false
diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters
index e7c37b295..66b83db4a 100644
--- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
- {fc4c72b2-b1bf-4fc8-98a5-a819adc4d87c}
+ {6d9f5c44-c287-449b-a42e-e0a1b3cb2973}
- {e0739809-7be5-4b90-bc58-488765116c7c}
+ {20106184-c958-4c1a-b91a-ffca6f92bd39}
- {1ef47158-e786-4e1f-97eb-646f6ab613fe}
+ {f9fcaf13-65c6-404c-b2a8-e344ef28b873}
- {f518cd8f-d3ab-411b-9971-7be59754c4c6}
+ {ce941eb8-82e4-4f95-94e0-b6a367786aab}
- {3f9a762f-b6da-44fb-859f-36ac3eeb2e12}
+ {e9360f27-c248-4b0d-a445-5daa74b25fff}
- {0871e0bb-c6ba-40af-852b-ac4b0ebfa9d6}
+ {a7a4e536-3a7b-4835-944c-48c0513466cb}
- {77116e24-5df2-4bbe-bc05-219863391b85}
+ {2a8d2047-6eee-4337-a384-2323f385e24b}
- {f010500b-dd76-42d4-859a-06d7a67f1bf7}
+ {8d23e281-8672-4841-b594-3176be29afa2}
diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj
index 0db8b501f..f0152a2d0 100644
--- a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj
+++ b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,84 +32,60 @@
TestSuiteWin32Proj
-
+ Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -117,35 +93,35 @@
TestSuiteTestSuite
-
- $(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);
- C:\OpenSSL-Win64\lib\VC\static;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
-
-
- $(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);
- C:\OpenSSL-Win64\lib\VC;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
-
-
- $(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);
- C:\OpenSSL-Win64\lib\VC;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
-
-
- $(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);
- C:\OpenSSL-Win64\lib\VC\static;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
+
+ bin64\
+ obj64\$(Configuration)\
+ true
- $(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);
- C:\OpenSSL-Win64\lib\VC;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
+ bin64\
+ obj64\$(Configuration)\
+ false
-
- $(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);
- C:\OpenSSL-Win64\lib\VC;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);
- C:\OpenSSL-Win64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
@@ -160,14 +136,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- CppUnitd.lib;ws2_32.lib;iphlpapi.lib;libeay32MDd.lib;ssleay32MDd.lib;%(AdditionalDependencies)
+ CppUnitd.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin64\TestSuited.exe..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -192,14 +167,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnit.lib;ws2_32.lib;iphlpapi.lib;libeay32MD.lib;ssleay32MD.lib;%(AdditionalDependencies)
+ CppUnit.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin64\TestSuite.exe..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -222,17 +196,15 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- CppUnitmtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;%(AdditionalDependencies)bin64\static_mt\TestSuited.exe..\..\lib64;%(AdditionalLibraryDirectories)
- nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)truetruebin64\static_mt\TestSuited.pdb
@@ -255,17 +227,15 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;%(AdditionalDependencies)bin64\static_mt\TestSuite.exe..\..\lib64;%(AdditionalLibraryDirectories)
- nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)falseConsoletrue
@@ -286,14 +256,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin64\static_md\TestSuited.exe..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -318,14 +287,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)
+ CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)bin64\static_md\TestSuite.exe..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -336,18 +304,18 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters
index e7c37b295..b24fe42ce 100644
--- a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
- {fc4c72b2-b1bf-4fc8-98a5-a819adc4d87c}
+ {d7ea9f0a-682e-43b0-be92-9169920fe044}
- {e0739809-7be5-4b90-bc58-488765116c7c}
+ {f926f372-9b61-467d-b05d-0de7181307bd}
- {1ef47158-e786-4e1f-97eb-646f6ab613fe}
+ {be34f981-547c-4e10-9cea-3a70fcea78dd}
- {f518cd8f-d3ab-411b-9971-7be59754c4c6}
+ {47b70dc4-4008-471c-af7f-020d73f3a28d}
- {3f9a762f-b6da-44fb-859f-36ac3eeb2e12}
+ {49584b35-d580-4cee-bd07-4efe68d49cab}
- {0871e0bb-c6ba-40af-852b-ac4b0ebfa9d6}
+ {bf0de0eb-869b-4573-bab1-1336364c8452}
- {77116e24-5df2-4bbe-bc05-219863391b85}
+ {e9b241cd-4961-4b01-b898-d075fcf78cbb}
- {f010500b-dd76-42d4-859a-06d7a67f1bf7}
+ {50cf963d-6670-4673-b25a-044558b551cd}
diff --git a/Crypto/testsuite/src/CryptoTest.cpp b/Crypto/testsuite/src/CryptoTest.cpp
old mode 100644
new mode 100755
index 5457cba78..5eccdf5cf
--- a/Crypto/testsuite/src/CryptoTest.cpp
+++ b/Crypto/testsuite/src/CryptoTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/testsuite/src/CryptoTest.h b/Crypto/testsuite/src/CryptoTest.h
old mode 100644
new mode 100755
index ea5c6d101..2c90762c0
--- a/Crypto/testsuite/src/CryptoTest.h
+++ b/Crypto/testsuite/src/CryptoTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/testsuite/src/CryptoTestSuite.cpp b/Crypto/testsuite/src/CryptoTestSuite.cpp
old mode 100644
new mode 100755
index fd7674d07..2cd239623
--- a/Crypto/testsuite/src/CryptoTestSuite.cpp
+++ b/Crypto/testsuite/src/CryptoTestSuite.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/testsuite/src/CryptoTestSuite.h b/Crypto/testsuite/src/CryptoTestSuite.h
old mode 100644
new mode 100755
index c054b1ff2..0469b7cae
--- a/Crypto/testsuite/src/CryptoTestSuite.h
+++ b/Crypto/testsuite/src/CryptoTestSuite.h
@@ -8,27 +8,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/testsuite/src/DigestEngineTest.cpp b/Crypto/testsuite/src/DigestEngineTest.cpp
old mode 100644
new mode 100755
index ed3be1688..e1763e6bf
--- a/Crypto/testsuite/src/DigestEngineTest.cpp
+++ b/Crypto/testsuite/src/DigestEngineTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2012, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/testsuite/src/DigestEngineTest.h b/Crypto/testsuite/src/DigestEngineTest.h
old mode 100644
new mode 100755
index 9872f6a59..89fc24d30
--- a/Crypto/testsuite/src/DigestEngineTest.h
+++ b/Crypto/testsuite/src/DigestEngineTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2012, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/testsuite/src/Driver.cpp b/Crypto/testsuite/src/Driver.cpp
old mode 100644
new mode 100755
index 5cc1360cb..96ff4f221
--- a/Crypto/testsuite/src/Driver.cpp
+++ b/Crypto/testsuite/src/Driver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/testsuite/src/RSATest.cpp b/Crypto/testsuite/src/RSATest.cpp
old mode 100644
new mode 100755
index f79fbc6a5..63157a771
--- a/Crypto/testsuite/src/RSATest.cpp
+++ b/Crypto/testsuite/src/RSATest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/testsuite/src/RSATest.h b/Crypto/testsuite/src/RSATest.h
old mode 100644
new mode 100755
index 36cfe002b..0014ecde6
--- a/Crypto/testsuite/src/RSATest.h
+++ b/Crypto/testsuite/src/RSATest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/testsuite/src/WinCEDriver.cpp b/Crypto/testsuite/src/WinCEDriver.cpp
old mode 100644
new mode 100755
index dc7dcc425..704c23157
--- a/Crypto/testsuite/src/WinCEDriver.cpp
+++ b/Crypto/testsuite/src/WinCEDriver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2004-2010, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Crypto/testsuite/src/WinDriver.cpp b/Crypto/testsuite/src/WinDriver.cpp
old mode 100644
new mode 100755
index ec55c3e83..7bbef8179
--- a/Crypto/testsuite/src/WinDriver.cpp
+++ b/Crypto/testsuite/src/WinDriver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/Data.progen b/Data/Data.progen
index b461b469f..da7505747 100644
--- a/Data/Data.progen
+++ b/Data/Data.progen
@@ -12,5 +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.x64 = /bigobj
vc.solution.create = true
vc.solution.include = testsuite\\TestSuite
diff --git a/Data/Data_WEC2013_vs110.sln b/Data/Data_WEC2013_vs110.sln
index 9c32c59e8..3d69ca6fe 100644
--- a/Data/Data_WEC2013_vs110.sln
+++ b/Data/Data_WEC2013_vs110.sln
@@ -9,50 +9,50 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- debug_shared|SDK_AM335X_SK_WEC2013 = debug_shared|SDK_AM335X_SK_WEC2013
- release_shared|SDK_AM335X_SK_WEC2013 = release_shared|SDK_AM335X_SK_WEC2013
- debug_static_mt|SDK_AM335X_SK_WEC2013 = debug_static_mt|SDK_AM335X_SK_WEC2013
- release_static_mt|SDK_AM335X_SK_WEC2013 = release_static_mt|SDK_AM335X_SK_WEC2013
- debug_static_md|SDK_AM335X_SK_WEC2013 = debug_static_md|SDK_AM335X_SK_WEC2013
- release_static_md|SDK_AM335X_SK_WEC2013 = release_static_md|SDK_AM335X_SK_WEC2013
+ debug_shared|SDK_AM335X_SK_WEC2013_V300 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ release_shared|SDK_AM335X_SK_WEC2013_V300 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ debug_static_mt|SDK_AM335X_SK_WEC2013_V300 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ release_static_mt|SDK_AM335X_SK_WEC2013_V300 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ debug_static_md|SDK_AM335X_SK_WEC2013_V300 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ release_static_md|SDK_AM335X_SK_WEC2013_V300 = release_static_md|SDK_AM335X_SK_WEC2013_V300
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|SDK_AM335X_SK_WEC2013.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|SDK_AM335X_SK_WEC2013.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|SDK_AM335X_SK_WEC2013.Build.0 = release_shared|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|SDK_AM335X_SK_WEC2013.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|SDK_AM335X_SK_WEC2013.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|SDK_AM335X_SK_WEC2013.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|SDK_AM335X_SK_WEC2013.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|SDK_AM335X_SK_WEC2013.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|SDK_AM335X_SK_WEC2013.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|SDK_AM335X_SK_WEC2013.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|SDK_AM335X_SK_WEC2013.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|SDK_AM335X_SK_WEC2013.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|SDK_AM335X_SK_WEC2013.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|SDK_AM335X_SK_WEC2013.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|SDK_AM335X_SK_WEC2013.Build.0 = release_shared|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|SDK_AM335X_SK_WEC2013.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|SDK_AM335X_SK_WEC2013.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|SDK_AM335X_SK_WEC2013.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|SDK_AM335X_SK_WEC2013.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|SDK_AM335X_SK_WEC2013.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|SDK_AM335X_SK_WEC2013.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|SDK_AM335X_SK_WEC2013.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|SDK_AM335X_SK_WEC2013.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|SDK_AM335X_SK_WEC2013.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Data/Data_WEC2013_vs110.vcxproj b/Data/Data_WEC2013_vs110.vcxproj
index 9df38027f..3d100cbcc 100644
--- a/Data/Data_WEC2013_vs110.vcxproj
+++ b/Data/Data_WEC2013_vs110.vcxproj
@@ -1,29 +1,29 @@
-
+ debug_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
@@ -32,99 +32,99 @@
en-US11.0true
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300CE800
-
+ StaticLibraryUnicodeCE800
-
+ StaticLibraryUnicodeCE800
-
+ StaticLibraryUnicodeCE800
-
+ StaticLibraryUnicodeCE800
-
+ DynamicLibraryUnicodeCE800
-
+ DynamicLibraryUnicodeCE800
-
+
-
+
-
+
-
+
-
+
-
+
<_ProjectFileVersion>11.0.61030.0
- PocoDatad
- PocoDatamdd
- PocoDatamtd
- PocoData
- PocoDatamd
- PocoDatamt
+ PocoDatad
+ PocoDatamdd
+ PocoDatamtd
+ PocoData
+ PocoDatamd
+ PocoDatamt
-
+ ..\bin\$(Platform)\obj\$(Platform)\$(Configuration)\truetrue
-
+ ..\bin\$(Platform)\obj\$(Platform)\$(Configuration)\falsetrue
-
+ ..\lib\$(Platform)\obj\$(Platform)\$(Configuration)\
-
+ ..\lib\$(Platform)\obj\$(Platform)\$(Configuration)\
-
+ ..\lib\$(Platform)\obj\$(Platform)\$(Configuration)\
-
+ ..\lib\$(Platform)\obj\$(Platform)\$(Configuration)\
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -148,7 +148,7 @@
WindowsCE
-
+ Disabledtrue
@@ -174,7 +174,7 @@
WindowsCE
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -194,7 +194,7 @@
..\lib\$(Platform)\PocoDatamtd.lib
-
+ Disabledtrue
@@ -215,7 +215,7 @@
..\lib\$(Platform)\PocoDatamt.lib
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -235,7 +235,7 @@
..\lib\$(Platform)\PocoDatamdd.lib
-
+ Disabledtrue
diff --git a/Data/Data_WEC2013_vs110.vcxproj.filters b/Data/Data_WEC2013_vs110.vcxproj.filters
index f782e9534..5c7ec2a7b 100644
--- a/Data/Data_WEC2013_vs110.vcxproj.filters
+++ b/Data/Data_WEC2013_vs110.vcxproj.filters
@@ -2,31 +2,31 @@
- {616d6aa0-1d9d-4c9e-a6fe-a14027466ecb}
+ {f44b968d-9dc8-43a7-b510-0ebd19d060f8}
- {5595389e-18f1-40d9-a41e-93e28d085be5}
+ {21957de8-c972-48b4-9b84-c022dbf1dee0}
- {088c25af-5581-4dcf-891a-753d240782ac}
+ {064640ba-ae38-4174-99a2-b3e2dea76651}
- {8fde9c40-6193-4df0-ad78-ed2f9239321e}
+ {3487e3be-5e4c-4bd4-90a4-02dffd20e244}
- {179735ec-889d-435b-b46f-c7f61bbf1c7c}
+ {3e1983c7-a9eb-4a29-8a8e-c1bc8389f01a}
- {593afb7b-8d54-4f47-add8-c223eb617a51}
+ {d4ca8ffc-7cfa-462c-9df5-252e3ba96370}
- {b0868060-28ec-419a-a329-33d6d44273b2}
+ {10927b10-8079-40d1-9981-baef60e0a796}
- {c66c0882-1e5a-4a53-8ba4-bc9de00c3b3c}
+ {36fb7587-df2d-4d84-9d49-4c2934e714e1}
- {a25bdc3e-e86b-43d2-ab2d-b035bdd0812c}
+ {010aad65-56a1-4fc9-9a65-d3905c2843d1}
diff --git a/Data/Data_vs100.vcxproj b/Data/Data_vs100.vcxproj
index 1fa35df7c..9a294b08c 100644
--- a/Data/Data_vs100.vcxproj
+++ b/Data/Data_vs100.vcxproj
@@ -33,75 +33,75 @@
Win32Proj
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\bin\
- obj\$(Configuration)\
- true
- ..\bin\
- obj\$(Configuration)\
- false
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- PocoDatad
- PocoDatamdd
- PocoDatamtd
- PocoData
- PocoDatamd
- PocoDatamt
+ ..\bin\
+ obj\$(Configuration)\
+ true
+ ..\bin\
+ obj\$(Configuration)\
+ false
+ ..\lib\
+ obj\$(Configuration)\
+ ..\lib\
+ obj\$(Configuration)\
+ ..\lib\
+ obj\$(Configuration)\
+ ..\lib\
+ obj\$(Configuration)\
+ PocoDatad
+ PocoDatamdd
+ PocoDatamtd
+ PocoData
+ PocoDatamd
+ PocoDatamt
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -119,6 +119,7 @@
EditAndContinueDefault%(DisableSpecificWarnings)
+ %(AdditionalOptions)%(AdditionalDependencies)
@@ -130,9 +131,10 @@
Console..\lib\PocoDatad.libMachineX86
+ %(AdditionalOptions)
-
+ DisabledOnlyExplicitInline
@@ -152,6 +154,7 @@
Default%(DisableSpecificWarnings)
+ %(AdditionalOptions)%(AdditionalDependencies)
@@ -164,9 +167,10 @@
true..\lib\PocoData.libMachineX86
+ %(AdditionalOptions)
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -185,12 +189,13 @@
EditAndContinueDefault%(DisableSpecificWarnings)
+ %(AdditionalOptions)..\lib\PocoDatamtd.lib
-
+ DisabledOnlyExplicitInline
@@ -210,12 +215,13 @@
Default%(DisableSpecificWarnings)
+ %(AdditionalOptions)..\lib\PocoDatamt.lib
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -234,12 +240,13 @@
EditAndContinueDefault%(DisableSpecificWarnings)
+ %(AdditionalOptions)..\lib\PocoDatamdd.lib
-
+ DisabledOnlyExplicitInline
@@ -260,6 +267,7 @@
Default%(DisableSpecificWarnings)
+ %(AdditionalOptions)%(AdditionalDependencies)
diff --git a/Data/Data_vs100.vcxproj.filters b/Data/Data_vs100.vcxproj.filters
index 1e960eeed..c6b39b8ea 100644
--- a/Data/Data_vs100.vcxproj.filters
+++ b/Data/Data_vs100.vcxproj.filters
@@ -2,31 +2,31 @@
- {5d9413e2-2ef3-442a-8e65-7f7b5cac89e5}
+ {afa42351-68d4-4d2a-8022-b799fa480ea9}
- {27f75a82-ecb7-4687-8278-41f32071f700}
+ {145d7a8b-8e26-4394-8592-c712c3441460}
- {48e4ce72-fd91-4d99-9962-8d739f6705d4}
+ {b65f5e01-39e8-4750-b744-fd700352ffcb}
- {d0b76a92-6e4c-4225-adcc-25eee0c42b7a}
+ {4e3d1080-7589-4aff-aeca-944050b07b64}
- {d14a2364-08ca-4229-801a-a0e940d6e409}
+ {384eb705-4c3c-4f7b-9912-acd51f55951d}
- {4a79c2e9-6109-428c-b253-43242195fa05}
+ {212c8739-ec8f-4465-a20e-8dd790eb6dc6}
- {c71b6dd6-f7fd-48d3-9a0c-2f3d4a302016}
+ {080509b9-71ef-46b7-9aca-4bfb915119db}
- {0ac6023c-87d8-4072-b2ce-f3c28b148b82}
+ {e4c83544-1cbc-4c32-8967-d3894bc96751}
- {4db0b265-f4a4-48aa-ac71-dea3ced3ac49}
+ {40a2f611-f1e9-471c-83df-087ce92387ee}
diff --git a/Data/Data_vs110.vcxproj b/Data/Data_vs110.vcxproj
index eddd7d4d7..fca0e6027 100644
--- a/Data/Data_vs110.vcxproj
+++ b/Data/Data_vs110.vcxproj
@@ -33,81 +33,93 @@
Win32Proj
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin\
- obj\$(Configuration)\
- true
- ..\bin\
- obj\$(Configuration)\
- false
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- PocoDatad
- PocoDatamdd
- PocoDatamtd
- PocoData
- PocoDatamd
- PocoDatamt
+ <_ProjectFileVersion>11.0.61030.0
+ PocoDatad
+ PocoDatamdd
+ PocoDatamtd
+ PocoData
+ PocoDatamd
+ PocoDatamt
-
+
+ ..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\bin\
+ obj\$(Configuration)\
+ false
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -124,10 +136,8 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin\PocoDatad.dlltruetrue
@@ -138,7 +148,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -157,10 +167,8 @@
Level3Default
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin\PocoData.dlltruefalse
@@ -172,7 +180,7 @@
MachineX86
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -190,13 +198,12 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoDatamtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,13 +222,12 @@
Level3Default
- %(DisableSpecificWarnings)..\lib\PocoDatamt.lib
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -239,13 +245,12 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoDatamdd.lib
-
+ DisabledOnlyExplicitInline
@@ -265,10 +270,8 @@
Level3Default
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\lib\PocoDatamd.lib
diff --git a/Data/Data_vs110.vcxproj.filters b/Data/Data_vs110.vcxproj.filters
index 85d6cdf19..198701508 100644
--- a/Data/Data_vs110.vcxproj.filters
+++ b/Data/Data_vs110.vcxproj.filters
@@ -2,31 +2,31 @@
- {b0c4ecb5-2fec-44b6-b2ed-73a184c13d7e}
+ {c496632b-1de8-43f0-8273-3072e7bef4d2}
- {ff68fd41-c965-4b22-8850-7337edeba804}
+ {f7ff3b6e-20ac-465d-be1f-1b47279b114c}
- {296a992f-335f-486c-bd02-b933d64d5448}
+ {9828a419-7a9a-46a8-8789-fde055be7ef5}
- {d47207b2-d566-42aa-bd9b-7fdc74e2b04c}
+ {30e83b7a-86fb-4e5b-850c-b1a6deb60eeb}
- {4edd2b1c-efb1-4e9b-b9c7-7f6008059889}
+ {7ecb86da-576c-433f-a4de-cfb07f55c6f2}
- {3a9a37f7-0449-4e91-9a6f-25b4586bef31}
+ {c1cda2f8-5eb0-4e31-a3a2-cc9fe608f39f}
- {3eaaa4d7-9839-4bb9-878d-c0ebc8f77b23}
+ {72110907-de19-4079-a7a5-ff9ad4289bf8}
- {f576b05c-f4ab-43c1-b494-39c2e5eb5608}
+ {9b33fb94-0890-4d7d-bfc3-91e269dc002a}
- {74dee80f-3ec5-4caf-b009-e60e1307aa78}
+ {3f180cc1-81e8-4f4c-90a6-1f5fffbe5751}
diff --git a/Data/Data_vs120.sln b/Data/Data_vs120.sln
index 644d94d8e..abb4dc5f6 100644
--- a/Data/Data_vs120.sln
+++ b/Data/Data_vs120.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_vs120.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}"
@@ -12,37 +10,49 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|Win32 = debug_shared|Win32
- debug_static_md|Win32 = debug_static_md|Win32
- debug_static_mt|Win32 = debug_static_mt|Win32
release_shared|Win32 = release_shared|Win32
- release_static_md|Win32 = release_static_md|Win32
+ debug_static_mt|Win32 = debug_static_mt|Win32
release_static_mt|Win32 = release_static_mt|Win32
+ debug_static_md|Win32 = debug_static_md|Win32
+ release_static_md|Win32 = release_static_md|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.ActiveCfg = release_shared|Win32
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Build.0 = release_shared|Win32
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Data/Data_vs120.vcxproj b/Data/Data_vs120.vcxproj
index 23918f2a3..a4b3da5e0 100644
--- a/Data/Data_vs120.vcxproj
+++ b/Data/Data_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
DataWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin\
- obj\$(Configuration)\
- true
- ..\bin\
- obj\$(Configuration)\
- false
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
- ..\lib\
- obj\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoDatadPocoDatamddPocoDatamtd
@@ -107,6 +93,32 @@
PocoDatamdPocoDatamt
+
+ ..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\bin\
+ obj\$(Configuration)\
+ false
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+
+
+ ..\lib\
+ obj\$(Configuration)\
+ Disabled
@@ -120,14 +132,12 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin\PocoDatad.dlltruetrue
@@ -153,14 +163,12 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\bin\PocoData.dlltruefalse
@@ -185,12 +193,11 @@
truetruetrue
-
+ ..\lib\PocoDatamtd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoDatamtd.lib
@@ -211,11 +218,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\lib\PocoDatamt.lib
@@ -234,12 +240,11 @@
truetruetrue
-
+ ..\lib\PocoDatamdd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\lib\PocoDatamdd.lib
@@ -260,106 +265,104 @@
truetruetrue
-
+ ..\lib\PocoDatamd.pdbLevel3
-
+ Default
- %(DisableSpecificWarnings)
- %(AdditionalDependencies)..\lib\PocoDatamd.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/Data_vs120.vcxproj.filters b/Data/Data_vs120.vcxproj.filters
index 85d6cdf19..ebb9bbc46 100644
--- a/Data/Data_vs120.vcxproj.filters
+++ b/Data/Data_vs120.vcxproj.filters
@@ -2,31 +2,31 @@
- {b0c4ecb5-2fec-44b6-b2ed-73a184c13d7e}
+ {74a799c4-908b-48e7-a157-cfe0a5d18f50}
- {ff68fd41-c965-4b22-8850-7337edeba804}
+ {0c7f0b51-7253-4c65-83b2-09a3d9f508c9}
- {296a992f-335f-486c-bd02-b933d64d5448}
+ {32ce572a-6242-4578-b281-d2009ee5fa61}
- {d47207b2-d566-42aa-bd9b-7fdc74e2b04c}
+ {8e996364-25d6-4ee9-896d-102c71f4d232}
- {4edd2b1c-efb1-4e9b-b9c7-7f6008059889}
+ {db9a066e-e935-4681-9dab-450932ccb2dd}
- {3a9a37f7-0449-4e91-9a6f-25b4586bef31}
+ {dc1ce18c-8da9-4c9a-9e96-0489f03c8f75}
- {3eaaa4d7-9839-4bb9-878d-c0ebc8f77b23}
+ {6a09e0ee-92ed-49bf-8e9d-d162c6982be3}
- {f576b05c-f4ab-43c1-b494-39c2e5eb5608}
+ {7d3b180f-9a73-40e5-934d-0395b126991e}
- {74dee80f-3ec5-4caf-b009-e60e1307aa78}
+ {06fabbe8-1a22-4171-9a5c-1478f967cf42}
diff --git a/Data/Data_x64_vs100.vcxproj b/Data/Data_x64_vs100.vcxproj
index d82d446cb..a200e2672 100644
--- a/Data/Data_x64_vs100.vcxproj
+++ b/Data/Data_x64_vs100.vcxproj
@@ -33,75 +33,75 @@
Win32Proj
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- PocoData64d
- PocoDatamdd
- PocoDatamtd
- PocoData64
- PocoDatamd
- PocoDatamt
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ ..\lib64\
+ obj64\$(Configuration)\
+ PocoData64d
+ PocoDatamdd
+ PocoDatamtd
+ PocoData64
+ PocoDatamd
+ PocoDatamt
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -119,6 +119,7 @@
ProgramDatabaseDefault%(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)%(AdditionalDependencies)
@@ -130,9 +131,10 @@
Console..\lib64\PocoDatad.libMachineX64
+ %(AdditionalOptions)
-
+ DisabledOnlyExplicitInline
@@ -152,6 +154,7 @@
Default%(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)%(AdditionalDependencies)
@@ -164,9 +167,10 @@
true..\lib64\PocoData.libMachineX64
+ %(AdditionalOptions)
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -185,12 +189,13 @@
ProgramDatabaseDefault%(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamtd.lib
-
+ DisabledOnlyExplicitInline
@@ -210,12 +215,13 @@
Default%(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamt.lib
-
+ Disabled.\include;..\Foundation\include;%(AdditionalIncludeDirectories)
@@ -234,12 +240,13 @@
ProgramDatabaseDefault%(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamdd.lib
-
+ DisabledOnlyExplicitInline
@@ -259,6 +266,7 @@
Default%(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamd.lib
diff --git a/Data/Data_x64_vs100.vcxproj.filters b/Data/Data_x64_vs100.vcxproj.filters
index 369d64104..d6f924aaa 100644
--- a/Data/Data_x64_vs100.vcxproj.filters
+++ b/Data/Data_x64_vs100.vcxproj.filters
@@ -2,31 +2,31 @@
- {415ac94a-5cf7-4951-9c4c-bd3694fb721c}
+ {4a7ce513-109a-4755-b105-fd6a2dc69787}
- {ac8b82f8-eadc-49d9-bbee-9ad9a9aef7a8}
+ {dc8637ad-d3ed-43ab-9d88-f86c21f649eb}
- {37e9b003-f160-47c5-a087-5fbc2dd15492}
+ {dd71823d-0a31-4aea-89ce-fc262bf17031}
- {d17d6956-aad7-49a6-ae09-cbffb0dcd033}
+ {2fd3a46a-8e34-420c-a277-1f294f90f984}
- {b11cd0b0-3dd3-4bd6-9371-552ac2001fcc}
+ {c76e0d79-208f-4e3d-8308-c62a75339c01}
- {be44cfbd-51dd-42a0-9a98-08de85852f0b}
+ {ae78cc00-420f-41ed-8db2-bed21c3b9cd4}
- {af48f137-2142-4770-ac06-6922aed340b4}
+ {831a8375-ec74-42fa-bfd0-f531aa7bb231}
- {91250500-da6d-4eec-90fe-07b029c5503e}
+ {4196f37f-49e3-445a-8984-0444adccef49}
- {18032e06-2256-4712-a247-fbe32a970013}
+ {97d13385-4a09-402a-937a-57c46fb72f6e}
diff --git a/Data/Data_x64_vs110.vcxproj b/Data/Data_x64_vs110.vcxproj
index 428ccaea8..53af79d82 100644
--- a/Data/Data_x64_vs110.vcxproj
+++ b/Data/Data_x64_vs110.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -32,7 +32,7 @@
DataWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev110
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoData64dPocoDatamddPocoDatamtd
@@ -107,6 +93,32 @@
PocoDatamdPocoDatamt
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+ Disabled
@@ -120,14 +132,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)
- %(AdditionalDependencies)..\bin64\PocoData64d.dlltruetrue
@@ -153,14 +164,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)
- %(AdditionalDependencies)..\bin64\PocoData64.dlltruefalse
@@ -185,12 +195,12 @@
truetruetrue
-
+ ..\lib64\PocoDatamtd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamtd.lib
@@ -211,11 +221,11 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamt.lib
@@ -234,12 +244,12 @@
truetruetrue
-
+ ..\lib64\PocoDatamdd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamdd.lib
@@ -260,112 +270,104 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamd.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /bigobj %(AdditionalOptions)
- /bigobj %(AdditionalOptions)
- /bigobj %(AdditionalOptions)
-
-
-
-
-
- /bigobj %(AdditionalOptions)
- /bigobj %(AdditionalOptions)
- /bigobj %(AdditionalOptions)
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/Data_x64_vs110.vcxproj.filters b/Data/Data_x64_vs110.vcxproj.filters
index 89b8776d0..b4e39ff70 100644
--- a/Data/Data_x64_vs110.vcxproj.filters
+++ b/Data/Data_x64_vs110.vcxproj.filters
@@ -2,31 +2,31 @@
- {fd9f72c0-7bc6-4903-8554-c06757614b09}
+ {0ac80dca-7002-46d7-9fa4-922b22bc095a}
- {dbef72b3-cba1-42ba-a173-159ab2872383}
+ {b22e7ca5-052a-467e-a2d8-92535809d502}
- {ff8b6c72-edec-4b4e-8a3b-19e60597d338}
+ {655d443b-cea2-4b3c-9cd4-9f8e3a4c3cfa}
- {a8b72238-0410-4165-b7e1-7a0c6ff0322d}
+ {efd27446-ed3d-42f1-a6da-acea56374d05}
- {23f172ea-bc6b-4011-ac6e-8a06d821358b}
+ {9795406d-b87b-4d43-ac72-03d29850eba0}
- {82c9086c-6883-4ec1-bd8e-b8037e3cbb4f}
+ {1c3f36fe-f11a-4dd1-aac0-16fadd775441}
- {08c7cdb3-362f-4d63-915c-f9baeee2399e}
+ {8b7bf8cd-639b-4472-939b-c7bab3e5aef6}
- {8a1c4ecf-8304-41b7-9214-121d9a8e6a1d}
+ {ee00afd1-bf3c-4430-b13a-c0d0ad415856}
- {7966d047-b3e5-4534-ba0f-825c88ef8b33}
+ {f6b6ecbe-e1ea-4706-ac37-0bea73186e13}
diff --git a/Data/Data_x64_vs120.sln b/Data/Data_x64_vs120.sln
index f4a9677b4..9e658162a 100644
--- a/Data/Data_x64_vs120.sln
+++ b/Data/Data_x64_vs120.sln
@@ -1,7 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_x64_vs120.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs120.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}"
@@ -12,37 +10,49 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|x64 = debug_shared|x64
- debug_static_md|x64 = debug_static_md|x64
- debug_static_mt|x64 = debug_static_mt|x64
release_shared|x64 = release_shared|x64
- release_static_md|x64 = release_static_md|x64
+ debug_static_mt|x64 = debug_static_mt|x64
release_static_mt|x64 = release_static_mt|x64
+ debug_static_md|x64 = debug_static_md|x64
+ release_static_md|x64 = release_static_md|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64
{240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64
+ {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.ActiveCfg = debug_shared|x64
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Build.0 = debug_shared|x64
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Deploy.0 = debug_shared|x64
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.ActiveCfg = release_shared|x64
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Build.0 = release_shared|x64
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Build.0 = release_static_md|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Deploy.0 = release_shared|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Build.0 = release_static_md|x64
+ {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Deploy.0 = release_static_md|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Data/Data_x64_vs120.vcxproj b/Data/Data_x64_vs120.vcxproj
index b149af840..bfc79e891 100644
--- a/Data/Data_x64_vs120.vcxproj
+++ b/Data/Data_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
DataWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\bin64\
- obj64\$(Configuration)\
- true
- ..\bin64\
- obj64\$(Configuration)\
- false
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
- ..\lib64\
- obj64\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoData64dPocoDatamddPocoDatamtd
@@ -107,6 +93,32 @@
PocoDatamdPocoDatamt
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\lib64\
+ obj64\$(Configuration)\
+ Disabled
@@ -120,14 +132,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)
- %(AdditionalDependencies)..\bin64\PocoData64d.dlltruetrue
@@ -153,14 +164,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)
- %(AdditionalDependencies)..\bin64\PocoData64.dlltruefalse
@@ -185,12 +195,12 @@
truetruetrue
-
+ ..\lib64\PocoDatamtd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamtd.lib
@@ -211,11 +221,11 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamt.lib
@@ -234,12 +244,12 @@
truetruetrue
-
+ ..\lib64\PocoDatamdd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamdd.lib
@@ -260,112 +270,104 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
+ /bigobj %(AdditionalOptions)..\lib64\PocoDatamd.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /bigobj %(AdditionalOptions)
- /bigobj %(AdditionalOptions)
- /bigobj %(AdditionalOptions)
-
-
-
-
-
- /bigobj %(AdditionalOptions)
- /bigobj %(AdditionalOptions)
- /bigobj %(AdditionalOptions)
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/Data_x64_vs120.vcxproj.filters b/Data/Data_x64_vs120.vcxproj.filters
index 89b8776d0..039f6a1db 100644
--- a/Data/Data_x64_vs120.vcxproj.filters
+++ b/Data/Data_x64_vs120.vcxproj.filters
@@ -2,31 +2,31 @@
- {fd9f72c0-7bc6-4903-8554-c06757614b09}
+ {09d6d2cf-7f75-47fb-85a1-d054ea1a2dce}
- {dbef72b3-cba1-42ba-a173-159ab2872383}
+ {fbdc7b4f-305d-42fa-bbf3-770196662479}
- {ff8b6c72-edec-4b4e-8a3b-19e60597d338}
+ {27d576d4-10f8-45f2-82ad-164f4b56a47a}
- {a8b72238-0410-4165-b7e1-7a0c6ff0322d}
+ {b47d1d8c-62d9-402b-8841-f3f7fa99a130}
- {23f172ea-bc6b-4011-ac6e-8a06d821358b}
+ {b9f35c11-43ed-44cf-b005-c0dd2106a45b}
- {82c9086c-6883-4ec1-bd8e-b8037e3cbb4f}
+ {d4a53098-c0e1-4f40-8799-68a40b5ca531}
- {08c7cdb3-362f-4d63-915c-f9baeee2399e}
+ {0dc5457e-0869-496b-8465-00126b78e589}
- {8a1c4ecf-8304-41b7-9214-121d9a8e6a1d}
+ {ee6231e1-1d82-4b74-9142-65a1e52521c2}
- {7966d047-b3e5-4534-ba0f-825c88ef8b33}
+ {6bef0f41-2769-4d62-a11e-2bf74361f08e}
diff --git a/Data/Data_x64_vs90.vcproj b/Data/Data_x64_vs90.vcproj
index d7a950393..87ca5e1a3 100644
--- a/Data/Data_x64_vs90.vcproj
+++ b/Data/Data_x64_vs90.vcproj
@@ -46,7 +46,8 @@
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CompileAs="0"
- DisableSpecificWarnings=""/>
+ DisableSpecificWarnings=""
+ AdditionalOptions="/bigobj"/>
+ TargetMachine="17"
+ AdditionalOptions=""/>
+ DisableSpecificWarnings=""
+ AdditionalOptions="/bigobj"/>
+ TargetMachine="17"
+ AdditionalOptions=""/>
+ DisableSpecificWarnings=""
+ AdditionalOptions="/bigobj"/>
+ DisableSpecificWarnings=""
+ AdditionalOptions="/bigobj"/>
+ DisableSpecificWarnings=""
+ AdditionalOptions="/bigobj"/>
+ DisableSpecificWarnings=""
+ AdditionalOptions="/bigobj"/>
Win32Proj
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\..\bin\
- obj\$(Configuration)\
- true
- ..\..\bin\
- obj\$(Configuration)\
- false
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- PocoDataMySQLd
- PocoDataMySQLmdd
- PocoDataMySQLmtd
- PocoDataMySQL
- PocoDataMySQLmd
- PocoDataMySQLmt
+ ..\..\bin\
+ obj\$(Configuration)\
+ true
+ ..\..\bin\
+ obj\$(Configuration)\
+ false
+ ..\..\lib\
+ obj\$(Configuration)\
+ ..\..\lib\
+ obj\$(Configuration)\
+ ..\..\lib\
+ obj\$(Configuration)\
+ ..\..\lib\
+ obj\$(Configuration)\
+ PocoDataMySQLd
+ PocoDataMySQLmdd
+ PocoDataMySQLmtd
+ PocoDataMySQL
+ PocoDataMySQLmd
+ PocoDataMySQLmt
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -132,7 +132,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -166,7 +166,7 @@
MachineX86
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -190,7 +190,7 @@
..\..\lib\PocoDataMySQLmtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,7 +215,7 @@
..\..\lib\PocoDataMySQLmt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -239,7 +239,7 @@
..\..\lib\PocoDataMySQLmdd.lib
-
+ DisabledOnlyExplicitInline
diff --git a/Data/MySQL/MySQL_vs110.vcxproj b/Data/MySQL/MySQL_vs110.vcxproj
index 41fc678e9..13813822a 100644
--- a/Data/MySQL/MySQL_vs110.vcxproj
+++ b/Data/MySQL/MySQL_vs110.vcxproj
@@ -33,81 +33,93 @@
Win32Proj
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin\
- obj\$(Configuration)\
- true
- ..\..\bin\
- obj\$(Configuration)\
- false
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- PocoDataMySQLd
- PocoDataMySQLmdd
- PocoDataMySQLmtd
- PocoDataMySQL
- PocoDataMySQLmd
- PocoDataMySQLmt
+ <_ProjectFileVersion>11.0.61030.0
+ PocoDataMySQLd
+ PocoDataMySQLmdd
+ PocoDataMySQLmtd
+ PocoDataMySQL
+ PocoDataMySQLmd
+ PocoDataMySQLmt
-
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ false
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -124,7 +136,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)libmysql.lib;%(AdditionalDependencies)
@@ -138,7 +149,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -157,7 +168,6 @@
Level3Default
- %(DisableSpecificWarnings)libmysql.lib;%(AdditionalDependencies)
@@ -172,7 +182,7 @@
MachineX86
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -190,13 +200,12 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)..\..\lib\PocoDataMySQLmtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,13 +224,12 @@
Level3Default
- %(DisableSpecificWarnings)..\..\lib\PocoDataMySQLmt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -239,13 +247,12 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)..\..\lib\PocoDataMySQLmdd.lib
-
+ DisabledOnlyExplicitInline
@@ -265,7 +272,6 @@
Level3Default
- %(DisableSpecificWarnings)libmysql.lib;%(AdditionalDependencies)
diff --git a/Data/MySQL/MySQL_vs120.sln b/Data/MySQL/MySQL_vs120.sln
index 9c53c19b5..1ee002e83 100644
--- a/Data/MySQL/MySQL_vs120.sln
+++ b/Data/MySQL/MySQL_vs120.sln
@@ -1,45 +1,58 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_vs120.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}"
+ ProjectSection(ProjectDependencies) = postProject
+ {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|Win32 = debug_shared|Win32
- debug_static_md|Win32 = debug_static_md|Win32
- debug_static_mt|Win32 = debug_static_mt|Win32
release_shared|Win32 = release_shared|Win32
- release_static_md|Win32 = release_static_md|Win32
+ debug_static_mt|Win32 = debug_static_mt|Win32
release_static_mt|Win32 = release_static_mt|Win32
+ debug_static_md|Win32 = debug_static_md|Win32
+ release_static_md|Win32 = release_static_md|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.ActiveCfg = release_shared|Win32
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.Build.0 = release_shared|Win32
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.Build.0 = release_static_md|Win32
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.ActiveCfg = release_shared|Win32
{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Build.0 = release_shared|Win32
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.Build.0 = debug_shared|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.ActiveCfg = release_shared|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.Build.0 = release_shared|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Data/MySQL/MySQL_vs120.vcxproj b/Data/MySQL/MySQL_vs120.vcxproj
index 75d2c522f..70651f67b 100644
--- a/Data/MySQL/MySQL_vs120.vcxproj
+++ b/Data/MySQL/MySQL_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
MySQLWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin\
- obj\$(Configuration)\
- true
- ..\..\bin\
- obj\$(Configuration)\
- false
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoDataMySQLdPocoDataMySQLmddPocoDataMySQLmtd
@@ -107,6 +93,32 @@
PocoDataMySQLmdPocoDataMySQLmt
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ false
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+ Disabled
@@ -120,11 +132,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)libmysql.lib;%(AdditionalDependencies)
@@ -153,11 +164,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)libmysql.lib;%(AdditionalDependencies)
@@ -185,12 +195,11 @@
truetruetrue
-
+ ..\..\lib\PocoDataMySQLmtd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\..\lib\PocoDataMySQLmtd.lib
@@ -211,11 +220,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\..\lib\PocoDataMySQLmt.lib
@@ -234,12 +242,11 @@
truetruetrue
-
+ ..\..\lib\PocoDataMySQLmdd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\..\lib\PocoDataMySQLmdd.lib
@@ -260,12 +267,11 @@
truetruetrue
-
+ ..\..\lib\PocoDataMySQLmd.pdbLevel3
-
+ Default
- %(DisableSpecificWarnings)libmysql.lib;%(AdditionalDependencies)
@@ -273,30 +279,30 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/MySQL/MySQL_x64_vs100.vcxproj b/Data/MySQL/MySQL_x64_vs100.vcxproj
index 18ac8947c..a38339ed1 100644
--- a/Data/MySQL/MySQL_x64_vs100.vcxproj
+++ b/Data/MySQL/MySQL_x64_vs100.vcxproj
@@ -33,75 +33,75 @@
Win32Proj
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\..\bin64\
- obj64\$(Configuration)\
- true
- ..\..\bin64\
- obj64\$(Configuration)\
- false
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- PocoDataMySQL64d
- PocoDataMySQLmdd
- PocoDataMySQLmtd
- PocoDataMySQL64
- PocoDataMySQLmd
- PocoDataMySQLmt
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ true
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ false
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ PocoDataMySQL64d
+ PocoDataMySQLmdd
+ PocoDataMySQLmtd
+ PocoDataMySQL64
+ PocoDataMySQLmd
+ PocoDataMySQLmt
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -132,7 +132,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -166,7 +166,7 @@
MachineX64
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -190,7 +190,7 @@
..\..\lib64\PocoDataMySQLmtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,7 +215,7 @@
..\..\lib64\PocoDataMySQLmt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -239,7 +239,7 @@
..\..\lib64\PocoDataMySQLmdd.lib
-
+ DisabledOnlyExplicitInline
diff --git a/Data/MySQL/MySQL_x64_vs110.vcxproj b/Data/MySQL/MySQL_x64_vs110.vcxproj
index fd9ec07f9..204575c4b 100644
--- a/Data/MySQL/MySQL_x64_vs110.vcxproj
+++ b/Data/MySQL/MySQL_x64_vs110.vcxproj
@@ -33,81 +33,93 @@
Win32Proj
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin64\
- obj64\$(Configuration)\
- true
- ..\..\bin64\
- obj64\$(Configuration)\
- false
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- PocoDataMySQL64d
- PocoDataMySQLmdd
- PocoDataMySQLmtd
- PocoDataMySQL64
- PocoDataMySQLmd
- PocoDataMySQLmt
+ <_ProjectFileVersion>11.0.61030.0
+ PocoDataMySQL64d
+ PocoDataMySQLmdd
+ PocoDataMySQLmtd
+ PocoDataMySQL64
+ PocoDataMySQLmd
+ PocoDataMySQLmt
-
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -124,7 +136,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)libmysql.lib;%(AdditionalDependencies)
@@ -138,7 +149,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -157,7 +168,6 @@
Level3Default
- %(DisableSpecificWarnings)libmysql.lib;%(AdditionalDependencies)
@@ -172,7 +182,7 @@
MachineX64
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -190,13 +200,12 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\..\lib64\PocoDataMySQLmtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,13 +224,12 @@
Level3Default
- %(DisableSpecificWarnings)..\..\lib64\PocoDataMySQLmt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -239,13 +247,12 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\..\lib64\PocoDataMySQLmdd.lib
-
+ DisabledOnlyExplicitInline
@@ -264,7 +271,6 @@
Level3Default
- %(DisableSpecificWarnings)..\..\lib64\PocoDataMySQLmd.lib
diff --git a/Data/MySQL/MySQL_x64_vs120.sln b/Data/MySQL/MySQL_x64_vs120.sln
index 10d748538..5dead6e7b 100644
--- a/Data/MySQL/MySQL_x64_vs120.sln
+++ b/Data/MySQL/MySQL_x64_vs120.sln
@@ -1,45 +1,58 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_x64_vs120.vcxproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs120.vcxproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}"
+ ProjectSection(ProjectDependencies) = postProject
+ {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|x64 = debug_shared|x64
- debug_static_md|x64 = debug_static_md|x64
- debug_static_mt|x64 = debug_static_mt|x64
release_shared|x64 = release_shared|x64
- release_static_md|x64 = release_static_md|x64
+ debug_static_mt|x64 = debug_static_mt|x64
release_static_mt|x64 = release_static_mt|x64
+ debug_static_md|x64 = debug_static_md|x64
+ release_static_md|x64 = release_static_md|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.ActiveCfg = debug_shared|x64
{73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Build.0 = debug_shared|x64
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Deploy.0 = debug_shared|x64
{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.ActiveCfg = release_shared|x64
{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Build.0 = release_shared|x64
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Build.0 = release_static_md|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Deploy.0 = release_shared|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Build.0 = release_static_md|x64
+ {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Deploy.0 = release_static_md|x64
{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.ActiveCfg = debug_shared|x64
{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.Build.0 = debug_shared|x64
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.Deploy.0 = debug_shared|x64
{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.ActiveCfg = release_shared|x64
{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.Build.0 = release_shared|x64
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.Build.0 = release_static_md|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.Deploy.0 = release_shared|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.Build.0 = release_static_md|x64
+ {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.Deploy.0 = release_static_md|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Data/MySQL/MySQL_x64_vs120.vcxproj b/Data/MySQL/MySQL_x64_vs120.vcxproj
index 28002e8e8..36d03fa5a 100644
--- a/Data/MySQL/MySQL_x64_vs120.vcxproj
+++ b/Data/MySQL/MySQL_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
MySQLWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin64\
- obj64\$(Configuration)\
- true
- ..\..\bin64\
- obj64\$(Configuration)\
- false
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoDataMySQL64dPocoDataMySQLmddPocoDataMySQLmtd
@@ -107,6 +93,32 @@
PocoDataMySQLmdPocoDataMySQLmt
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ Disabled
@@ -120,11 +132,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)libmysql.lib;%(AdditionalDependencies)
@@ -153,11 +164,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)libmysql.lib;%(AdditionalDependencies)
@@ -185,12 +195,11 @@
truetruetrue
-
+ ..\..\lib64\PocoDataMySQLmtd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\..\lib64\PocoDataMySQLmtd.lib
@@ -211,11 +220,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\..\lib64\PocoDataMySQLmt.lib
@@ -234,12 +242,11 @@
truetruetrue
-
+ ..\..\lib64\PocoDataMySQLmdd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\..\lib64\PocoDataMySQLmdd.lib
@@ -260,41 +267,40 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\..\lib64\PocoDataMySQLmd.lib
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Binder.h b/Data/MySQL/include/Poco/Data/MySQL/Binder.h
old mode 100644
new mode 100755
index df2690ac6..6f6374acd
--- a/Data/MySQL/include/Poco/Data/MySQL/Binder.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/Binder.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Connector.h b/Data/MySQL/include/Poco/Data/MySQL/Connector.h
old mode 100644
new mode 100755
index 1bb4f641f..6ac80106a
--- a/Data/MySQL/include/Poco/Data/MySQL/Connector.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/Connector.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Extractor.h b/Data/MySQL/include/Poco/Data/MySQL/Extractor.h
old mode 100644
new mode 100755
index 992a6028f..24fa60e80
--- a/Data/MySQL/include/Poco/Data/MySQL/Extractor.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/Extractor.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
old mode 100644
new mode 100755
index 0f4b4070f..34902d699
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
old mode 100644
new mode 100755
index 294a34c5c..6585ceaad
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h b/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
old mode 100644
new mode 100755
index 5e4e8747d..d178ae666
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
old mode 100644
new mode 100755
index ebdc5ce87..8e645ad87
--- a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
old mode 100644
new mode 100755
index fd0f1ad80..d07ebd726
--- a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h b/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h
old mode 100644
new mode 100755
index 47fb2ced7..e2010ddaa
--- a/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
old mode 100644
new mode 100755
index fdaf26cd7..4aa05c725
--- a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
@@ -12,27 +12,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Utility.h b/Data/MySQL/include/Poco/Data/MySQL/Utility.h
old mode 100644
new mode 100755
index fb82506bc..c4427c332
--- a/Data/MySQL/include/Poco/Data/MySQL/Utility.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/Utility.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/src/Binder.cpp b/Data/MySQL/src/Binder.cpp
old mode 100644
new mode 100755
index 5cd44e719..6a97f0e1d
--- a/Data/MySQL/src/Binder.cpp
+++ b/Data/MySQL/src/Binder.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/src/Connector.cpp b/Data/MySQL/src/Connector.cpp
old mode 100644
new mode 100755
index 6e21ef2fd..84e16db2c
--- a/Data/MySQL/src/Connector.cpp
+++ b/Data/MySQL/src/Connector.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/src/Extractor.cpp b/Data/MySQL/src/Extractor.cpp
old mode 100644
new mode 100755
index 26459396c..8bdad64a7
--- a/Data/MySQL/src/Extractor.cpp
+++ b/Data/MySQL/src/Extractor.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/src/MySQLException.cpp b/Data/MySQL/src/MySQLException.cpp
old mode 100644
new mode 100755
index fb82636d1..2ed0ae7cb
--- a/Data/MySQL/src/MySQLException.cpp
+++ b/Data/MySQL/src/MySQLException.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/src/MySQLStatementImpl.cpp b/Data/MySQL/src/MySQLStatementImpl.cpp
old mode 100644
new mode 100755
index 9c692109c..c3325ce53
--- a/Data/MySQL/src/MySQLStatementImpl.cpp
+++ b/Data/MySQL/src/MySQLStatementImpl.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp
old mode 100644
new mode 100755
index da11232b6..f94439b22
--- a/Data/MySQL/src/ResultMetadata.cpp
+++ b/Data/MySQL/src/ResultMetadata.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/src/SessionHandle.cpp b/Data/MySQL/src/SessionHandle.cpp
old mode 100644
new mode 100755
index 6304577ba..9815e4243
--- a/Data/MySQL/src/SessionHandle.cpp
+++ b/Data/MySQL/src/SessionHandle.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/src/SessionImpl.cpp b/Data/MySQL/src/SessionImpl.cpp
old mode 100644
new mode 100755
index ed0bc08d4..b234639e6
--- a/Data/MySQL/src/SessionImpl.cpp
+++ b/Data/MySQL/src/SessionImpl.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/src/StatementExecutor.cpp b/Data/MySQL/src/StatementExecutor.cpp
old mode 100644
new mode 100755
index 681245705..a63ff3142
--- a/Data/MySQL/src/StatementExecutor.cpp
+++ b/Data/MySQL/src/StatementExecutor.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/src/Utility.cpp b/Data/MySQL/src/Utility.cpp
old mode 100644
new mode 100755
index 9c9059309..71106d371
--- a/Data/MySQL/src/Utility.cpp
+++ b/Data/MySQL/src/Utility.cpp
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/testsuite/TestSuite_vs100.vcxproj b/Data/MySQL/testsuite/TestSuite_vs100.vcxproj
index bb273cda8..ec6b393e1 100644
--- a/Data/MySQL/testsuite/TestSuite_vs100.vcxproj
+++ b/Data/MySQL/testsuite/TestSuite_vs100.vcxproj
@@ -33,85 +33,85 @@
Win32Proj
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ bin\
+ obj\$(Configuration)\
+ true
+ bin\
+ obj\$(Configuration)\
+ false
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -141,7 +141,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -173,7 +173,7 @@
MachineX86
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -204,7 +204,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -237,7 +237,7 @@
MachineX86
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -267,7 +267,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
diff --git a/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters
index 2eb459f93..7d880f54c 100644
--- a/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
- {ee9c983d-926d-4d1a-9c47-7a00f4a200ce}
+ {59878db7-8cd3-431b-bfef-7a0d3bd13ea6}
- {f9489676-5289-4903-99b6-a5df6daee73b}
+ {827ecb97-ca0e-47fb-a05b-3f76b4b17064}
- {b01afdda-5962-41ff-bfb6-c98d79ec5e9a}
+ {7026a1aa-a405-492c-ad75-d8009eef842b}
- {3203b8ea-9c6a-451f-9f74-cb149568a8c0}
+ {d3cec313-e13b-4c45-9abb-5ac155949fb2}
- {e76ff37e-25bc-4ade-89c1-2101c9deb6d0}
+ {a945d7eb-91db-4604-917f-601c96f53518}
- {e265c147-7f9f-41bd-872e-a34ca01ecf92}
+ {302d68c6-a0f1-4981-aaa3-6f05209955fe}
- {c2b5a472-51ed-47e5-8ccb-069b88511018}
+ {54066155-8567-4f61-83bb-dee32fdfaf79}
- {09af1d90-6070-4fca-a5a4-fa09543ab3d8}
+ {55b6030d-7091-4900-a11a-19cf70e3f104}
diff --git a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj
index 0e163de71..1d5e80a9d 100644
--- a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj
+++ b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -32,7 +32,7 @@
TestSuiteWin32Proj
-
+ ApplicationDynamic
@@ -69,47 +69,29 @@
MultiBytev110
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -118,8 +100,34 @@
TestSuite
- C:\Program Files (x86)\MySQL\Connector C 6.0.2\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\Program Files (x86)\MySQL\Connector C 6.0.2\lib\debug;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
@@ -134,11 +142,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitd.lib;WinTestRunnerd.lib;libmysql.lib;%(AdditionalDependencies)
@@ -166,11 +173,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnit.lib;WinTestRunner.lib;libmysql.lib;%(AdditionalDependencies)
@@ -196,11 +202,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies)
@@ -229,11 +234,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies)
@@ -260,11 +264,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies)
@@ -292,11 +295,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies)
@@ -310,16 +312,16 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters
index 0cd6b3773..1e881990a 100644
--- a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
- {fca6e86e-18c4-4e02-a61b-34e1db086866}
+ {3477595f-a9c6-475f-aa87-caf094f9bece}
- {54864d2c-cbbb-4b9f-bf22-e5b10b1d520f}
+ {f4c7d11e-80ea-4ea9-b4a3-09851b2d43ca}
- {6e9ecc7f-f391-41a2-8c5d-dc2bae072c06}
+ {87ef286f-1be7-42a3-bb30-5cb94dcb0370}
- {7eeaca26-07d1-4196-934c-8ece6176c780}
+ {6c75d3b2-4f66-4346-91a4-cc31be5ac819}
- {66ff2502-78a6-42b1-9c0c-c87b2bec53ae}
+ {4f7118a6-a424-4e0a-9d71-517dae0f5b4a}
- {5ed3d39f-4ca4-4ee8-b2e9-7905fbf2bc49}
+ {142ef967-cc78-4493-aeb4-f228fc7502c3}
- {e11189c8-1556-4568-bf3a-367a1944b003}
+ {da614ed3-b58a-4881-922e-5faf0140b48e}
- {1a703f5b-5ef0-4ad3-94a9-c053949bd1ce}
+ {323e4412-f46e-410c-82e5-4983d0511921}
diff --git a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj
index d0faab6ce..3ba7e6d66 100644
--- a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj
+++ b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,84 +32,60 @@
TestSuiteWin32Proj
-
+ Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -118,8 +94,34 @@
TestSuite
- C:\Program Files (x86)\MySQL\Connector C 6.0.2\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);
- C:\Program Files (x86)\MySQL\Connector C 6.0.2\lib\debug;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
@@ -134,11 +136,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitd.lib;libmysql.lib;%(AdditionalDependencies)
@@ -166,11 +167,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnit.lib;libmysql.lib;%(AdditionalDependencies)
@@ -196,17 +196,15 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- CppUnitmtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;libmysql.lib;%(AdditionalDependencies)
+ CppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)bin\static_mt\TestSuited.exe..\..\..\lib;%(AdditionalLibraryDirectories)
- nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)truetruebin\static_mt\TestSuited.pdb
@@ -229,17 +227,15 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;libmysql.lib;%(AdditionalDependencies)
+ CppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)bin\static_mt\TestSuite.exe..\..\..\lib;%(AdditionalLibraryDirectories)
- nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)falseConsoletrue
@@ -260,11 +256,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)
@@ -292,11 +287,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)
@@ -310,16 +304,16 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters
index c75e82285..12ddf9db2 100644
--- a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
- {fca6e86e-18c4-4e02-a61b-34e1db086866}
+ {5fccfa10-ef34-4341-9dbe-a88befed9716}
- {54864d2c-cbbb-4b9f-bf22-e5b10b1d520f}
+ {4de03de5-6147-45e9-90d0-9f3676c062c9}
- {6e9ecc7f-f391-41a2-8c5d-dc2bae072c06}
+ {1f5bda10-b79a-480d-a6d0-8b9abadc9b6f}
- {7eeaca26-07d1-4196-934c-8ece6176c780}
+ {b5188906-c9f3-40b4-8892-fb05f78a4019}
- {66ff2502-78a6-42b1-9c0c-c87b2bec53ae}
+ {9ee3dd40-fa54-4bc0-a9f2-6c8132eb9f1f}
- {5ed3d39f-4ca4-4ee8-b2e9-7905fbf2bc49}
+ {4d25206f-ee7f-4a7d-9c07-f155726eb04b}
- {e11189c8-1556-4568-bf3a-367a1944b003}
+ {29e4f596-7430-44d2-bd1c-11a9cfee42c5}
- {1a703f5b-5ef0-4ad3-94a9-c053949bd1ce}
+ {1bf33a47-e9d2-4f5c-b479-ed7df80bcebe}
@@ -47,7 +47,7 @@
_Suite\Source Files
-
+ _Driver\Source Files
diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj
index 30aaa66b7..834bb9100 100644
--- a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj
+++ b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj
@@ -33,85 +33,85 @@
Win32Proj
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ bin64\
+ obj64\$(Configuration)\
+ true
+ bin64\
+ obj64\$(Configuration)\
+ false
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -141,7 +141,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -173,7 +173,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -204,7 +204,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -237,7 +237,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -267,7 +267,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters
index 8eb6c152d..1182c14fe 100644
--- a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
- {fd624a94-0fec-47b0-b4e3-247417d7921c}
+ {4b7f661a-d5dd-4b4a-87a6-d36bd1b1196f}
- {c7b2414c-a697-4b00-bd0c-46203b1cc7c8}
+ {4b2d2925-6d49-4731-9276-d03830515dd7}
- {bdaadb80-3374-4798-b558-1106961bb7a9}
+ {832f2a84-596a-4bdd-9822-2dafa166f030}
- {cea588d3-9aa0-4b45-8b36-fad431b31422}
+ {02db5625-a860-4e0b-afbf-2e94c7e29a78}
- {b6eaf401-3568-4fd7-b5a2-3d76552e3c0a}
+ {cf7893bf-b5ba-4c63-8d3d-3187d0906a08}
- {f44ced2a-2c70-4a85-b012-fdc60c97306e}
+ {3d530056-d5b4-4811-bef2-ff827030462a}
- {c922efdc-3966-494e-98ee-426a522bcbe0}
+ {f3dfe485-5d47-43a3-86db-c331a7dae5b2}
- {c28e44ef-3d01-436c-bb1a-f3e7d5f7f666}
+ {7285932a-6d45-4337-8a58-c2293ffac04e}
diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj
index 68678d5f7..1f380071e 100644
--- a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj
+++ b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj
@@ -33,37 +33,37 @@
Win32Proj
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiByte
@@ -71,53 +71,65 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ <_ProjectFileVersion>11.0.61030.0
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -134,7 +146,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitd.lib;WinTestRunnerd.lib;libmysql.lib;%(AdditionalDependencies)
@@ -147,7 +158,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -166,7 +177,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnit.lib;WinTestRunner.lib;libmysql.lib;%(AdditionalDependencies)
@@ -179,7 +189,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -196,7 +206,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies)
@@ -210,7 +219,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -229,7 +238,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies)
@@ -243,7 +251,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -260,7 +268,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies)
@@ -273,7 +280,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -292,7 +299,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;libmysql.lib;%(AdditionalDependencies)
diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters
index 26b2b9622..903c19cd9 100644
--- a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
- {eeab736f-4879-478b-9df8-239d4fddc440}
+ {cca0ace0-7fc7-441e-9d3b-f46edcb3274a}
- {86a5f1fe-f6ea-450f-b567-45bbaa5af9e8}
+ {4b570549-1e65-4bb4-82f8-f1a3e6e04d3f}
- {e8f13685-3064-44a9-a63d-51bc639e5cf5}
+ {d1e10ab2-7db0-4973-9e93-1cc3cfc877f9}
- {2d8dc3d7-7962-47a5-9afa-f0205a2c6096}
+ {04492ba2-10aa-4620-a1d9-9a2d349a5e96}
- {0af92344-9f0d-4307-818d-565651f6552e}
+ {c9d7faa4-13aa-4b6b-8bc5-23b5c8996670}
- {22bc2f62-6dd9-4ac1-90e4-0e6a319c475e}
+ {a6547799-4393-403c-b7c0-304513ee2ad5}
- {634d5106-80ee-4969-80d9-44a9a0a7fe7b}
+ {cc0ee467-9f60-4531-bc54-68c981232093}
- {72b5e2d1-e3bf-46eb-98b0-15a306c392f1}
+ {d31f7e66-d4c7-472a-89ff-c46775c3e931}
diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj
index 239860c59..7374ba213 100644
--- a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj
+++ b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,84 +32,60 @@
TestSuiteWin32Proj
-
+ Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -117,6 +93,36 @@
TestSuiteTestSuite
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ Disabled
@@ -130,11 +136,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitd.lib;libmysql.lib;%(AdditionalDependencies)
@@ -162,11 +167,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnit.lib;libmysql.lib;%(AdditionalDependencies)
@@ -192,17 +196,15 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- CppUnitmtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;libmysql.lib;%(AdditionalDependencies)
+ CppUnitmtd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)bin64\static_mt\TestSuited.exe..\..\..\lib64;%(AdditionalLibraryDirectories)
- nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)truetruebin64\static_mt\TestSuited.pdb
@@ -225,17 +227,15 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;libmysql.lib;%(AdditionalDependencies)
+ CppUnitmt.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)bin64\static_mt\TestSuite.exe..\..\..\lib64;%(AdditionalLibraryDirectories)
- nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)falseConsoletrue
@@ -256,11 +256,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)
@@ -288,11 +287,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnitmd.lib;iphlpapi.lib;winmm.lib;libmysql.lib;%(AdditionalDependencies)
@@ -306,16 +304,16 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters
index a563ee41a..9b78e1015 100644
--- a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
- {eeab736f-4879-478b-9df8-239d4fddc440}
+ {4c8ea7a0-a358-42ed-a17a-a8f247e9cd95}
- {86a5f1fe-f6ea-450f-b567-45bbaa5af9e8}
+ {3fea38ef-9609-44e6-9abf-7e9b6e3c5f1d}
- {e8f13685-3064-44a9-a63d-51bc639e5cf5}
+ {f4d30dbb-53af-48d0-8c82-fe9d87ef133e}
- {2d8dc3d7-7962-47a5-9afa-f0205a2c6096}
+ {307af97b-fce9-45ba-9ee4-3bfc2def8a47}
- {0af92344-9f0d-4307-818d-565651f6552e}
+ {9253fe03-9699-4334-a341-c5182f1182ab}
- {22bc2f62-6dd9-4ac1-90e4-0e6a319c475e}
+ {918b29f5-7671-4e0b-8877-52c3bf242397}
- {634d5106-80ee-4969-80d9-44a9a0a7fe7b}
+ {cfb000f2-227f-4032-8e96-cd655e838e1c}
- {72b5e2d1-e3bf-46eb-98b0-15a306c392f1}
+ {dd16254e-d394-43fe-9b70-d1cc39d6bf02}
@@ -47,7 +47,7 @@
_Suite\Source Files
-
+ _Driver\Source Files
diff --git a/Data/MySQL/testsuite/src/Driver.cpp b/Data/MySQL/testsuite/src/Driver.cpp
old mode 100644
new mode 100755
index d73871d84..fc1b33660
--- a/Data/MySQL/testsuite/src/Driver.cpp
+++ b/Data/MySQL/testsuite/src/Driver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp
old mode 100644
new mode 100755
index be54e019f..237f20530
--- a/Data/MySQL/testsuite/src/MySQLTest.cpp
+++ b/Data/MySQL/testsuite/src/MySQLTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/testsuite/src/MySQLTest.h b/Data/MySQL/testsuite/src/MySQLTest.h
old mode 100644
new mode 100755
index f6619a909..655a7d028
--- a/Data/MySQL/testsuite/src/MySQLTest.h
+++ b/Data/MySQL/testsuite/src/MySQLTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/testsuite/src/MySQLTestSuite.cpp b/Data/MySQL/testsuite/src/MySQLTestSuite.cpp
old mode 100644
new mode 100755
index aa0da332e..2063a7951
--- a/Data/MySQL/testsuite/src/MySQLTestSuite.cpp
+++ b/Data/MySQL/testsuite/src/MySQLTestSuite.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/testsuite/src/MySQLTestSuite.h b/Data/MySQL/testsuite/src/MySQLTestSuite.h
old mode 100644
new mode 100755
index c42449619..c6bc62f65
--- a/Data/MySQL/testsuite/src/MySQLTestSuite.h
+++ b/Data/MySQL/testsuite/src/MySQLTestSuite.h
@@ -8,27 +8,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp
old mode 100644
new mode 100755
index cc839e1f7..00cfb351f
--- a/Data/MySQL/testsuite/src/SQLExecutor.cpp
+++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/testsuite/src/SQLExecutor.h b/Data/MySQL/testsuite/src/SQLExecutor.h
old mode 100644
new mode 100755
index 8840e249c..e39baf81c
--- a/Data/MySQL/testsuite/src/SQLExecutor.h
+++ b/Data/MySQL/testsuite/src/SQLExecutor.h
@@ -8,27 +8,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/MySQL/testsuite/src/WinDriver.cpp b/Data/MySQL/testsuite/src/WinDriver.cpp
old mode 100644
new mode 100755
index d24d77efa..3ee6bbfc8
--- a/Data/MySQL/testsuite/src/WinDriver.cpp
+++ b/Data/MySQL/testsuite/src/WinDriver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/ODBC.make b/Data/ODBC/ODBC.make
index bc24f7937..81805dab1 100644
--- a/Data/ODBC/ODBC.make
+++ b/Data/ODBC/ODBC.make
@@ -37,21 +37,14 @@ ifeq ($(POCO_CONFIG),MinGW)
# -DNOMINMAX : MIN/MAX macros defined in windows conflict with libstdc++
CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
-##
-## Cygwin
-##
-else ifeq ($(POCO_CONFIG),CYGWIN)
-# -DODBCVER=0x0300: SQLHandle declaration issue
-# -DNOMINMAX : MIN/MAX macros defined in windows conflict with libstdc++
-CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
-# CYGWIN platform has its own ODBC library in /lib/w32api
-SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
-
##
## unixODBC
##
else ifeq (0, $(shell test -e $(POCO_ODBC_LIB)/libodbc$(LIBLINKEXT); echo $$?))
-SYSLIBS += -lodbc -lodbcinst
+SYSLIBS += -lodbc
+ifeq (0, $(shell test -e $(POCO_ODBC_LIB)/libodbcinst$(LIBLINKEXT); echo $$?))
+SYSLIBS += -lodbcinst
+endif
COMMONFLAGS += -DPOCO_UNIXODBC
##
diff --git a/Data/ODBC/ODBC_vs100.vcxproj b/Data/ODBC/ODBC_vs100.vcxproj
index 3a9ed731b..e405ae567 100644
--- a/Data/ODBC/ODBC_vs100.vcxproj
+++ b/Data/ODBC/ODBC_vs100.vcxproj
@@ -33,75 +33,75 @@
Win32Proj
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\..\bin\
- obj\$(Configuration)\
- true
- ..\..\bin\
- obj\$(Configuration)\
- false
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- PocoDataODBCd
- PocoDataODBCmdd
- PocoDataODBCmtd
- PocoDataODBC
- PocoDataODBCmd
- PocoDataODBCmt
+ ..\..\bin\
+ obj\$(Configuration)\
+ true
+ ..\..\bin\
+ obj\$(Configuration)\
+ false
+ ..\..\lib\
+ obj\$(Configuration)\
+ ..\..\lib\
+ obj\$(Configuration)\
+ ..\..\lib\
+ obj\$(Configuration)\
+ ..\..\lib\
+ obj\$(Configuration)\
+ PocoDataODBCd
+ PocoDataODBCmdd
+ PocoDataODBCmtd
+ PocoDataODBC
+ PocoDataODBCmd
+ PocoDataODBCmt
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -132,7 +132,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -166,7 +166,7 @@
MachineX86
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -190,7 +190,7 @@
..\..\lib\PocoDataODBCmtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,7 +215,7 @@
..\..\lib\PocoDataODBCmt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -239,7 +239,7 @@
..\..\lib\PocoDataODBCmdd.lib
-
+ DisabledOnlyExplicitInline
@@ -303,20 +303,20 @@
- true
- true
- true
- true
- true
- true
+ true
+ true
+ true
+ true
+ true
+ true
- true
- true
- true
- true
- true
- true
+ true
+ true
+ true
+ true
+ true
+ true
diff --git a/Data/ODBC/ODBC_vs100.vcxproj.filters b/Data/ODBC/ODBC_vs100.vcxproj.filters
index 2752bb01d..a5800f323 100644
--- a/Data/ODBC/ODBC_vs100.vcxproj.filters
+++ b/Data/ODBC/ODBC_vs100.vcxproj.filters
@@ -2,13 +2,13 @@
- {d4014b6f-1483-4cd9-b7fb-61d99b3b2e9f}
+ {e11c9fd0-8f99-4926-a214-bc879e998157}
- {8d1ade46-c6eb-48c9-83aa-ac9e00d45463}
+ {4b61fc5d-5881-4fc4-a42f-267f2b425ecf}
- {572b8a58-9631-476d-b604-3faa04705c34}
+ {995b0c93-dd5e-4390-b9e5-24edd774e761}
diff --git a/Data/ODBC/ODBC_vs110.vcxproj b/Data/ODBC/ODBC_vs110.vcxproj
index dd9306629..431d0a5b5 100644
--- a/Data/ODBC/ODBC_vs110.vcxproj
+++ b/Data/ODBC/ODBC_vs110.vcxproj
@@ -33,81 +33,93 @@
Win32Proj
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin\
- obj\$(Configuration)\
- true
- ..\..\bin\
- obj\$(Configuration)\
- false
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- PocoDataODBCd
- PocoDataODBCmdd
- PocoDataODBCmtd
- PocoDataODBC
- PocoDataODBCmd
- PocoDataODBCmt
+ <_ProjectFileVersion>11.0.61030.0
+ PocoDataODBCd
+ PocoDataODBCmdd
+ PocoDataODBCmtd
+ PocoDataODBC
+ PocoDataODBCmd
+ PocoDataODBCmt
-
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ false
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -124,7 +136,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -138,7 +149,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -157,7 +168,6 @@
Level3Default
- %(DisableSpecificWarnings)odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -172,7 +182,7 @@
MachineX86
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -190,13 +200,12 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)..\..\lib\PocoDataODBCmtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,13 +224,12 @@
Level3Default
- %(DisableSpecificWarnings)..\..\lib\PocoDataODBCmt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -239,13 +247,12 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)..\..\lib\PocoDataODBCmdd.lib
-
+ DisabledOnlyExplicitInline
@@ -265,7 +272,6 @@
Level3Default
- %(DisableSpecificWarnings)odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -309,20 +315,20 @@
- true
- true
- true
- true
- true
- true
+ true
+ true
+ true
+ true
+ true
+ true
- true
- true
- true
- true
- true
- true
+ true
+ true
+ true
+ true
+ true
+ true
diff --git a/Data/ODBC/ODBC_vs110.vcxproj.filters b/Data/ODBC/ODBC_vs110.vcxproj.filters
index f1b61ad26..93bb31cd8 100644
--- a/Data/ODBC/ODBC_vs110.vcxproj.filters
+++ b/Data/ODBC/ODBC_vs110.vcxproj.filters
@@ -2,13 +2,13 @@
- {31525210-febb-4ae6-8293-9227042529bd}
+ {13b6822d-0b4a-4af8-a011-c3475c1310fb}
- {9622c714-71d8-4eff-835d-b78d7c3f5cb2}
+ {f74e2d19-0ada-4378-8397-69f528122199}
- {73178635-6a28-4b12-9c5b-96a9bb733afb}
+ {60708885-390a-4865-b4a4-4a7968a6e52a}
diff --git a/Data/ODBC/ODBC_vs120.sln b/Data/ODBC/ODBC_vs120.sln
index dfccd5b34..d9da4e5a8 100644
--- a/Data/ODBC/ODBC_vs120.sln
+++ b/Data/ODBC/ODBC_vs120.sln
@@ -1,45 +1,58 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ODBC", "ODBC_vs120.vcxproj", "{1B29820D-375F-11DB-837B-00123FC423B5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{00627063-395B-4413-9099-23BDB56562FA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {1B29820D-375F-11DB-837B-00123FC423B5} = {1B29820D-375F-11DB-837B-00123FC423B5}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|Win32 = debug_shared|Win32
- debug_static_md|Win32 = debug_static_md|Win32
- debug_static_mt|Win32 = debug_static_mt|Win32
release_shared|Win32 = release_shared|Win32
- release_static_md|Win32 = release_static_md|Win32
+ debug_static_mt|Win32 = debug_static_mt|Win32
release_static_mt|Win32 = release_static_mt|Win32
+ debug_static_md|Win32 = debug_static_md|Win32
+ release_static_md|Win32 = release_static_md|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32
{1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32
- {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
{00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{00627063-395B-4413-9099-23BDB56562FA}.release_shared|Win32.ActiveCfg = release_shared|Win32
{00627063-395B-4413-9099-23BDB56562FA}.release_shared|Win32.Build.0 = release_shared|Win32
- {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Data/ODBC/ODBC_vs120.vcxproj b/Data/ODBC/ODBC_vs120.vcxproj
index dcf01794b..e972fccc4 100644
--- a/Data/ODBC/ODBC_vs120.vcxproj
+++ b/Data/ODBC/ODBC_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
ODBCWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin\
- obj\$(Configuration)\
- true
- ..\..\bin\
- obj\$(Configuration)\
- false
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoDataODBCdPocoDataODBCmddPocoDataODBCmtd
@@ -107,6 +93,32 @@
PocoDataODBCmdPocoDataODBCmt
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ false
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+ Disabled
@@ -120,11 +132,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -153,11 +164,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -185,12 +195,11 @@
truetruetrue
-
+ ..\..\lib\PocoDataODBCmtd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\..\lib\PocoDataODBCmtd.lib
@@ -211,11 +220,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\..\lib\PocoDataODBCmt.lib
@@ -234,12 +242,11 @@
truetruetrue
-
+ ..\..\lib\PocoDataODBCmdd.pdbLevel3EditAndContinueDefault
- %(DisableSpecificWarnings)..\..\lib\PocoDataODBCmdd.lib
@@ -260,12 +267,11 @@
truetruetrue
-
+ ..\..\lib\PocoDataODBCmd.pdbLevel3
-
+ Default
- %(DisableSpecificWarnings)odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -273,41 +279,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ truetrue
@@ -324,8 +330,8 @@
truetrue
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/ODBC/ODBC_vs120.vcxproj.filters b/Data/ODBC/ODBC_vs120.vcxproj.filters
index f1b61ad26..d3f2ac66a 100644
--- a/Data/ODBC/ODBC_vs120.vcxproj.filters
+++ b/Data/ODBC/ODBC_vs120.vcxproj.filters
@@ -2,13 +2,13 @@
- {31525210-febb-4ae6-8293-9227042529bd}
+ {ba45b459-d758-48fe-a1e5-56462153a09d}
- {9622c714-71d8-4eff-835d-b78d7c3f5cb2}
+ {acfaf09e-2fa6-4acc-be2a-11189c37fe93}
- {73178635-6a28-4b12-9c5b-96a9bb733afb}
+ {000caa16-fe67-4866-9df1-b5d8c60813bd}
diff --git a/Data/ODBC/ODBC_x64_vs100.vcxproj b/Data/ODBC/ODBC_x64_vs100.vcxproj
index ca31a5f70..afb13b122 100644
--- a/Data/ODBC/ODBC_x64_vs100.vcxproj
+++ b/Data/ODBC/ODBC_x64_vs100.vcxproj
@@ -33,75 +33,75 @@
Win32Proj
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\..\bin64\
- obj64\$(Configuration)\
- true
- ..\..\bin64\
- obj64\$(Configuration)\
- false
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- PocoDataODBC64d
- PocoDataODBCmdd
- PocoDataODBCmtd
- PocoDataODBC64
- PocoDataODBCmd
- PocoDataODBCmt
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ true
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ false
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ PocoDataODBC64d
+ PocoDataODBCmdd
+ PocoDataODBCmtd
+ PocoDataODBC64
+ PocoDataODBCmd
+ PocoDataODBCmt
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -132,7 +132,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -166,7 +166,7 @@
MachineX64
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -190,7 +190,7 @@
..\..\lib64\PocoDataODBCmtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,7 +215,7 @@
..\..\lib64\PocoDataODBCmt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -239,7 +239,7 @@
..\..\lib64\PocoDataODBCmdd.lib
-
+ DisabledOnlyExplicitInline
@@ -301,20 +301,20 @@
- true
- true
- true
- true
- true
- true
+ true
+ true
+ true
+ true
+ true
+ true
- true
- true
- true
- true
- true
- true
+ true
+ true
+ true
+ true
+ true
+ true
diff --git a/Data/ODBC/ODBC_x64_vs100.vcxproj.filters b/Data/ODBC/ODBC_x64_vs100.vcxproj.filters
index 37a72e18b..2aae5ff7c 100644
--- a/Data/ODBC/ODBC_x64_vs100.vcxproj.filters
+++ b/Data/ODBC/ODBC_x64_vs100.vcxproj.filters
@@ -2,13 +2,13 @@
- {0ffa301a-20c8-4b6b-92a2-8eea80201d57}
+ {6e49f081-a751-4c08-90b8-726767780719}
- {240c2892-805e-4f52-bcb7-02c58714c331}
+ {9e65e357-3b97-4f76-88d2-b81c523d8647}
- {546ca69f-02c7-4287-b651-6ffc4d40bab4}
+ {25de14b3-a469-42ee-8e19-368c9b94f978}
diff --git a/Data/ODBC/ODBC_x64_vs110.vcxproj b/Data/ODBC/ODBC_x64_vs110.vcxproj
index a5beb3c65..5a337b3d1 100644
--- a/Data/ODBC/ODBC_x64_vs110.vcxproj
+++ b/Data/ODBC/ODBC_x64_vs110.vcxproj
@@ -33,81 +33,93 @@
Win32Proj
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin64\
- obj64\$(Configuration)\
- true
- ..\..\bin64\
- obj64\$(Configuration)\
- false
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- PocoDataODBC64d
- PocoDataODBCmdd
- PocoDataODBCmtd
- PocoDataODBC64
- PocoDataODBCmd
- PocoDataODBCmt
+ <_ProjectFileVersion>11.0.61030.0
+ PocoDataODBC64d
+ PocoDataODBCmdd
+ PocoDataODBCmtd
+ PocoDataODBC64
+ PocoDataODBCmd
+ PocoDataODBCmt
-
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -124,7 +136,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -138,7 +149,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -157,7 +168,6 @@
Level3Default
- %(DisableSpecificWarnings)odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -172,7 +182,7 @@
MachineX64
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -190,13 +200,12 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\..\lib64\PocoDataODBCmtd.lib
-
+ DisabledOnlyExplicitInline
@@ -215,13 +224,12 @@
Level3Default
- %(DisableSpecificWarnings)..\..\lib64\PocoDataODBCmt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -239,13 +247,12 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\..\lib64\PocoDataODBCmdd.lib
-
+ DisabledOnlyExplicitInline
@@ -264,7 +271,6 @@
Level3Default
- %(DisableSpecificWarnings)..\..\lib64\PocoDataODBCmd.lib
@@ -307,20 +313,20 @@
- true
- true
- true
- true
- true
- true
+ true
+ true
+ true
+ true
+ true
+ true
- true
- true
- true
- true
- true
- true
+ true
+ true
+ true
+ true
+ true
+ true
diff --git a/Data/ODBC/ODBC_x64_vs110.vcxproj.filters b/Data/ODBC/ODBC_x64_vs110.vcxproj.filters
index 3efefe457..b3d10971b 100644
--- a/Data/ODBC/ODBC_x64_vs110.vcxproj.filters
+++ b/Data/ODBC/ODBC_x64_vs110.vcxproj.filters
@@ -2,13 +2,13 @@
- {4a52ed7a-1ab5-42f8-8eb0-13db7de40005}
+ {7c513465-5e0d-4805-8a5d-3d7f6261dd7f}
- {2d804826-927c-48b7-a53d-c42922803fa7}
+ {93f6f27c-2e5f-4ee1-8876-4738c0cb8d61}
- {2778a60d-4293-4f80-a11b-b68df93f46b8}
+ {37ef3329-5865-4c0a-a44d-7e9e5441233c}
diff --git a/Data/ODBC/ODBC_x64_vs120.sln b/Data/ODBC/ODBC_x64_vs120.sln
index 0d711040f..9b4620375 100644
--- a/Data/ODBC/ODBC_x64_vs120.sln
+++ b/Data/ODBC/ODBC_x64_vs120.sln
@@ -1,45 +1,58 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ODBC", "ODBC_x64_vs120.vcxproj", "{1B29820D-375F-11DB-837B-00123FC423B5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs120.vcxproj", "{00627063-395B-4413-9099-23BDB56562FA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {1B29820D-375F-11DB-837B-00123FC423B5} = {1B29820D-375F-11DB-837B-00123FC423B5}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|x64 = debug_shared|x64
- debug_static_md|x64 = debug_static_md|x64
- debug_static_mt|x64 = debug_static_mt|x64
release_shared|x64 = release_shared|x64
- release_static_md|x64 = release_static_md|x64
+ debug_static_mt|x64 = debug_static_mt|x64
release_static_mt|x64 = release_static_mt|x64
+ debug_static_md|x64 = debug_static_md|x64
+ release_static_md|x64 = release_static_md|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64
{1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64
- {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64
{1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64
{1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64
- {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64
+ {1B29820D-375F-11DB-837B-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64
{00627063-395B-4413-9099-23BDB56562FA}.debug_shared|x64.ActiveCfg = debug_shared|x64
{00627063-395B-4413-9099-23BDB56562FA}.debug_shared|x64.Build.0 = debug_shared|x64
- {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_shared|x64.Deploy.0 = debug_shared|x64
{00627063-395B-4413-9099-23BDB56562FA}.release_shared|x64.ActiveCfg = release_shared|x64
{00627063-395B-4413-9099-23BDB56562FA}.release_shared|x64.Build.0 = release_shared|x64
- {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|x64.Build.0 = release_static_md|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.release_shared|x64.Deploy.0 = release_shared|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|x64.Build.0 = release_static_md|x64
+ {00627063-395B-4413-9099-23BDB56562FA}.release_static_md|x64.Deploy.0 = release_static_md|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Data/ODBC/ODBC_x64_vs120.vcxproj b/Data/ODBC/ODBC_x64_vs120.vcxproj
index b3dd2ac53..479e8aaca 100644
--- a/Data/ODBC/ODBC_x64_vs120.vcxproj
+++ b/Data/ODBC/ODBC_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
ODBCWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin64\
- obj64\$(Configuration)\
- true
- ..\..\bin64\
- obj64\$(Configuration)\
- false
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoDataODBC64dPocoDataODBCmddPocoDataODBCmtd
@@ -107,6 +93,32 @@
PocoDataODBCmdPocoDataODBCmt
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ Disabled
@@ -120,11 +132,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -153,11 +164,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -185,12 +195,11 @@
truetruetrue
-
+ ..\..\lib64\PocoDataODBCmtd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\..\lib64\PocoDataODBCmtd.lib
@@ -211,11 +220,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\..\lib64\PocoDataODBCmt.lib
@@ -234,12 +242,11 @@
truetruetrue
-
+ ..\..\lib64\PocoDataODBCmdd.pdbLevel3ProgramDatabaseDefault
- %(DisableSpecificWarnings)..\..\lib64\PocoDataODBCmdd.lib
@@ -260,52 +267,51 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)..\..\lib64\PocoDataODBCmd.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ truetrue
@@ -322,8 +328,8 @@
truetrue
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/ODBC/ODBC_x64_vs120.vcxproj.filters b/Data/ODBC/ODBC_x64_vs120.vcxproj.filters
index 3efefe457..16bfa766c 100644
--- a/Data/ODBC/ODBC_x64_vs120.vcxproj.filters
+++ b/Data/ODBC/ODBC_x64_vs120.vcxproj.filters
@@ -2,13 +2,13 @@
- {4a52ed7a-1ab5-42f8-8eb0-13db7de40005}
+ {cc5e31db-5183-4ec6-8365-ea019cef9f10}
- {2d804826-927c-48b7-a53d-c42922803fa7}
+ {381c333a-9867-41e0-8017-b17dda3ab56e}
- {2778a60d-4293-4f80-a11b-b68df93f46b8}
+ {1e075fab-b204-43a3-b363-26df064f0596}
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Binder.h b/Data/ODBC/include/Poco/Data/ODBC/Binder.h
old mode 100644
new mode 100755
index 3d9e82100..c52e8c721
--- a/Data/ODBC/include/Poco/Data/ODBC/Binder.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Binder.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h b/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h
old mode 100644
new mode 100755
index dba245a08..693f61b21
--- a/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Connector.h b/Data/ODBC/include/Poco/Data/ODBC/Connector.h
old mode 100644
new mode 100755
index ab5f887ef..71b336af5
--- a/Data/ODBC/include/Poco/Data/ODBC/Connector.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Connector.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h b/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
old mode 100644
new mode 100755
index 9f8b5bdcd..48d268af9
--- a/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h b/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h
old mode 100644
new mode 100755
index 8d2d336aa..cbc4821e3
--- a/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Error.h b/Data/ODBC/include/Poco/Data/ODBC/Error.h
old mode 100644
new mode 100755
index 62c08b369..5e03a99d3
--- a/Data/ODBC/include/Poco/Data/ODBC/Error.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Error.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Extractor.h b/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
old mode 100644
new mode 100755
index 07c5795c5..a870016a6
--- a/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Handle.h b/Data/ODBC/include/Poco/Data/ODBC/Handle.h
old mode 100644
new mode 100755
index 0d5fc9e67..43b02cb49
--- a/Data/ODBC/include/Poco/Data/ODBC/Handle.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Handle.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBC.h b/Data/ODBC/include/Poco/Data/ODBC/ODBC.h
old mode 100644
new mode 100755
index b9a6fe6a5..74edf1673
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBC.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBC.h
@@ -14,27 +14,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h
old mode 100644
new mode 100755
index 6031043ee..cb785152c
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
old mode 100644
new mode 100755
index c34ed60fc..f706c06e2
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
old mode 100644
new mode 100755
index 98126ac14..1d01c8296
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Parameter.h b/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
old mode 100644
new mode 100755
index 5dbe681a6..b6b7eeb39
--- a/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Preparator.h b/Data/ODBC/include/Poco/Data/ODBC/Preparator.h
old mode 100644
new mode 100755
index b3d0ba76f..e96f795c3
--- a/Data/ODBC/include/Poco/Data/ODBC/Preparator.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Preparator.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
old mode 100644
new mode 100755
index b272f51a7..8701b0959
--- a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h b/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
old mode 100644
new mode 100755
index 44525e696..0af4ece96
--- a/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode.h
old mode 100644
new mode 100755
index 8f0e54b88..0bd4dec69
--- a/Data/ODBC/include/Poco/Data/ODBC/Unicode.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h
old mode 100644
new mode 100755
index 5e0746e96..466f6d0a5
--- a/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
old mode 100644
new mode 100755
index 78846ed32..355a087d8
--- a/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Utility.h b/Data/ODBC/include/Poco/Data/ODBC/Utility.h
old mode 100644
new mode 100755
index 22cc70ca9..47b1b9250
--- a/Data/ODBC/include/Poco/Data/ODBC/Utility.h
+++ b/Data/ODBC/include/Poco/Data/ODBC/Utility.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/Binder.cpp b/Data/ODBC/src/Binder.cpp
old mode 100644
new mode 100755
index 890d11f7b..98295db96
--- a/Data/ODBC/src/Binder.cpp
+++ b/Data/ODBC/src/Binder.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/ConnectionHandle.cpp b/Data/ODBC/src/ConnectionHandle.cpp
old mode 100644
new mode 100755
index dfe144a8a..5652a2413
--- a/Data/ODBC/src/ConnectionHandle.cpp
+++ b/Data/ODBC/src/ConnectionHandle.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/Connector.cpp b/Data/ODBC/src/Connector.cpp
old mode 100644
new mode 100755
index 28139fe58..094d8b15a
--- a/Data/ODBC/src/Connector.cpp
+++ b/Data/ODBC/src/Connector.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/EnvironmentHandle.cpp b/Data/ODBC/src/EnvironmentHandle.cpp
old mode 100644
new mode 100755
index 295ef2b05..85f1ec10c
--- a/Data/ODBC/src/EnvironmentHandle.cpp
+++ b/Data/ODBC/src/EnvironmentHandle.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/Extractor.cpp b/Data/ODBC/src/Extractor.cpp
old mode 100644
new mode 100755
index 44c789770..eb3c6f5d6
--- a/Data/ODBC/src/Extractor.cpp
+++ b/Data/ODBC/src/Extractor.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/ODBCException.cpp b/Data/ODBC/src/ODBCException.cpp
old mode 100644
new mode 100755
index 009cb3475..1d752bc3a
--- a/Data/ODBC/src/ODBCException.cpp
+++ b/Data/ODBC/src/ODBCException.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/ODBCMetaColumn.cpp b/Data/ODBC/src/ODBCMetaColumn.cpp
old mode 100644
new mode 100755
index 52b0f35ec..0b4daa5ba
--- a/Data/ODBC/src/ODBCMetaColumn.cpp
+++ b/Data/ODBC/src/ODBCMetaColumn.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -107,6 +87,7 @@ void ODBCMetaColumn::init()
case SQL_CHAR:
case SQL_VARCHAR:
case SQL_LONGVARCHAR:
+ case -8:// PostgreSQL CHAR (with size specified - psqlODBC)
case -9:// SQL Server NVARCHAR
case -10:// PostgreSQL VARCHAR (without size specified)
setType(MetaColumn::FDT_STRING); break;
diff --git a/Data/ODBC/src/ODBCStatementImpl.cpp b/Data/ODBC/src/ODBCStatementImpl.cpp
old mode 100644
new mode 100755
index 9bdcf2ade..0a3ab4953
--- a/Data/ODBC/src/ODBCStatementImpl.cpp
+++ b/Data/ODBC/src/ODBCStatementImpl.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/Parameter.cpp b/Data/ODBC/src/Parameter.cpp
old mode 100644
new mode 100755
index cef84e82d..0edebb5b8
--- a/Data/ODBC/src/Parameter.cpp
+++ b/Data/ODBC/src/Parameter.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/Preparator.cpp b/Data/ODBC/src/Preparator.cpp
old mode 100644
new mode 100755
index f236b6299..2d1b7fd60
--- a/Data/ODBC/src/Preparator.cpp
+++ b/Data/ODBC/src/Preparator.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/SessionImpl.cpp b/Data/ODBC/src/SessionImpl.cpp
old mode 100644
new mode 100755
index 01dee5546..36f4ca689
--- a/Data/ODBC/src/SessionImpl.cpp
+++ b/Data/ODBC/src/SessionImpl.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/TypeInfo.cpp b/Data/ODBC/src/TypeInfo.cpp
old mode 100644
new mode 100755
index 4d0588111..25809b4fa
--- a/Data/ODBC/src/TypeInfo.cpp
+++ b/Data/ODBC/src/TypeInfo.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/Unicode.cpp b/Data/ODBC/src/Unicode.cpp
old mode 100644
new mode 100755
index b1202e8d1..9492dc855
--- a/Data/ODBC/src/Unicode.cpp
+++ b/Data/ODBC/src/Unicode.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/Unicode_UNIXODBC.cpp b/Data/ODBC/src/Unicode_UNIXODBC.cpp
old mode 100644
new mode 100755
index 5e453a529..4b7231d27
--- a/Data/ODBC/src/Unicode_UNIXODBC.cpp
+++ b/Data/ODBC/src/Unicode_UNIXODBC.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/Unicode_WIN32.cpp b/Data/ODBC/src/Unicode_WIN32.cpp
old mode 100644
new mode 100755
index ac075d21f..1f71aee02
--- a/Data/ODBC/src/Unicode_WIN32.cpp
+++ b/Data/ODBC/src/Unicode_WIN32.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/src/Utility.cpp b/Data/ODBC/src/Utility.cpp
old mode 100644
new mode 100755
index fa18dee97..74b61a2cd
--- a/Data/ODBC/src/Utility.cpp
+++ b/Data/ODBC/src/Utility.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/TestSuite_vs100.vcxproj b/Data/ODBC/testsuite/TestSuite_vs100.vcxproj
index ea462c9a9..67c37bf29 100644
--- a/Data/ODBC/testsuite/TestSuite_vs100.vcxproj
+++ b/Data/ODBC/testsuite/TestSuite_vs100.vcxproj
@@ -33,85 +33,85 @@
Win32Proj
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ bin\
+ obj\$(Configuration)\
+ true
+ bin\
+ obj\$(Configuration)\
+ false
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -141,7 +141,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -173,7 +173,7 @@
MachineX86
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -204,7 +204,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -237,7 +237,7 @@
MachineX86
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -267,7 +267,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
diff --git a/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters
index b807c3d52..da7cfdd8d 100644
--- a/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
- {510df373-a78e-4f31-9d2b-db62b7d85aac}
+ {7cea07b7-a25e-44a7-a0a3-b25c2f4a5bf9}
- {ef120757-1616-4447-9101-bef0fe752d11}
+ {38774fe8-ef55-4619-9b1f-7991483d458c}
- {c1dd7fb7-e548-4055-ae49-50f03db4556b}
+ {8eab2924-80d4-41d8-bc19-a3edfbd53ca2}
- {072b9d1c-9a89-43cd-b874-e45c86d9e682}
+ {2d05af48-18be-49ab-8bf0-5a23cae26c01}
- {f69a957e-2682-4798-b22f-76c0f27e4399}
+ {d602ff32-3a79-490f-9ab7-e538b35c5014}
- {d532ceea-f2f1-4ba4-9fae-d4629d01669a}
+ {616c8f7b-1c32-47c5-bb7f-340e320fc1fd}
- {a017e710-b448-4261-abeb-8c4417668d81}
+ {9dca8945-72dd-4da7-9913-8f59d07d8062}
- {d16a3674-6567-42b2-9348-d45d15141e13}
+ {c809f647-33f9-4e9c-a66d-c86cb382ab78}
diff --git a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj
index 05f964ed3..f510fbf08 100644
--- a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj
+++ b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj
@@ -33,37 +33,37 @@
Win32Proj
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiByte
@@ -71,53 +71,65 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ <_ProjectFileVersion>11.0.61030.0
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -134,7 +146,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitd.lib;WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -147,7 +158,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -166,7 +177,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnit.lib;WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -179,7 +189,7 @@
MachineX86
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -196,7 +206,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -210,7 +219,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -229,7 +238,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -243,7 +251,7 @@
MachineX86
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -260,7 +268,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -273,7 +280,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -292,7 +299,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
diff --git a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters
index 9b044f50a..65c9c43fc 100644
--- a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
- {3449dd28-7057-47c6-893e-484357382f9a}
+ {4a210867-1ca6-4110-962b-b745df2f241c}
- {7ed33364-9c61-4cd7-aad4-03f61947c14b}
+ {8cfb2685-48c6-4007-8a07-651135dcf310}
- {7ddb490c-7c7b-4da8-8a90-1d820dfe1bae}
+ {9c4e733a-0c44-44cd-adba-fbb4cf0994d8}
- {d2795ed5-abee-45ae-9068-06cc174577b8}
+ {39debbec-b8f6-4f0a-8594-2eacf68daf5c}
- {9dc476e2-51c9-4b3a-9cd2-d4e3e387ab57}
+ {45a07a75-8f3a-44c8-af89-736a163fa476}
- {26f55ba4-38a0-442f-85ea-91780fba6800}
+ {5288488f-e7a7-4bee-83cc-dbc1817f31a6}
- {b6ab5073-2cb1-4def-835a-a67e75256155}
+ {5b32e8c3-e4af-4bd0-ac3a-57268cede750}
- {b5999f29-7591-499d-b481-86b994e01470}
+ {806864ed-7967-4dab-ba5c-eed7cc13b7fb}
diff --git a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj
index dde7cd8d0..4e2e10940 100644
--- a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj
+++ b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,84 +32,60 @@
TestSuiteWin32Proj
-
+ Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -117,6 +93,36 @@
TestSuiteTestSuite
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ Disabled
@@ -130,11 +136,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -162,11 +167,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -192,17 +196,15 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- CppUnitmtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)bin\static_mt\TestSuited.exe..\..\..\lib;%(AdditionalLibraryDirectories)
- nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)truetruebin\static_mt\TestSuited.pdb
@@ -225,17 +227,15 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)bin\static_mt\TestSuite.exe..\..\..\lib;%(AdditionalLibraryDirectories)
- nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)falseConsoletrue
@@ -256,11 +256,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -288,11 +287,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -306,30 +304,30 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters
index ba816a405..2574a8ff6 100644
--- a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
- {3449dd28-7057-47c6-893e-484357382f9a}
+ {cf4e2d1a-06c4-4712-920d-c4e3904e95dd}
- {7ed33364-9c61-4cd7-aad4-03f61947c14b}
+ {c18cd23d-ce4d-499c-8524-7f46badf3634}
- {7ddb490c-7c7b-4da8-8a90-1d820dfe1bae}
+ {1cf6deee-0d73-4c29-81f2-e7875642bd17}
- {d2795ed5-abee-45ae-9068-06cc174577b8}
+ {2bd5b533-c31f-424a-9dc2-ad760da8d4c8}
- {9dc476e2-51c9-4b3a-9cd2-d4e3e387ab57}
+ {4b9e1efc-ca73-4a39-8ccc-498d03708971}
- {26f55ba4-38a0-442f-85ea-91780fba6800}
+ {67d52ba0-a1ee-4ff2-ae29-ce666751badd}
- {b6ab5073-2cb1-4def-835a-a67e75256155}
+ {e20aad47-987a-4bc9-9814-d424cccbd8d6}
- {b5999f29-7591-499d-b481-86b994e01470}
+ {59bc41a9-010e-4b3d-ba90-26eac28d9af6}
@@ -89,7 +89,7 @@
_Suite\Source Files
-
+ _Driver\Source Files
diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj
index f7e69a384..a83aaaa6e 100644
--- a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj
+++ b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj
@@ -33,85 +33,85 @@
Win32Proj
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ bin64\
+ obj64\$(Configuration)\
+ true
+ bin64\
+ obj64\$(Configuration)\
+ false
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -141,7 +141,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -173,7 +173,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -204,7 +204,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -237,7 +237,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -267,7 +267,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters
index a3677896d..c8bf756a0 100644
--- a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
- {450ebf5c-f147-47c2-8a5e-3cda37407219}
+ {12582458-0fcf-47e0-bece-28d30b2b2602}
- {89b6c7d3-9bb2-4b47-8d91-cdfb6596501d}
+ {5b3386fd-2eb3-44de-9507-7c5d388b5955}
- {cf9a15ae-bb42-43a5-8aa9-45facce2b88c}
+ {d1fa0cf4-3211-4811-a926-ebddaa7a2718}
- {d6d9e99f-c2d1-4836-a7e1-2c8a88ced3e6}
+ {df63c7e0-5376-4b90-bb42-2865adee557b}
- {e01e9cb5-8dfa-4cb2-a82d-cf75e69a897d}
+ {185e9c0b-fabb-4f98-b2dc-b8a8d33eef05}
- {1abfbea0-122c-4788-b536-c33b2c08fec7}
+ {e4acfca1-46fc-4364-86a9-1e129505c077}
- {b669a038-aca9-4f39-891f-745fe7fdc150}
+ {e2aad12f-aa64-42fb-a951-46e9b4c227f2}
- {298fc110-71e2-4503-a466-821275b2ea76}
+ {4af9b86a-f102-4282-bf10-ee0c5b678035}
diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj
index c8c08ffba..7aa6977bb 100644
--- a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj
+++ b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj
@@ -33,37 +33,37 @@
Win32Proj
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiByte
@@ -71,53 +71,65 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ <_ProjectFileVersion>11.0.61030.0
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -134,7 +146,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitd.lib;WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -147,7 +158,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -166,7 +177,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnit.lib;WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -179,7 +189,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -196,7 +206,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -210,7 +219,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -229,7 +238,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -243,7 +251,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -260,7 +268,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -273,7 +280,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -292,7 +299,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters
index 1c29b8f2a..227e5eefc 100644
--- a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
- {89896c1f-80b8-4553-97b2-124e891da195}
+ {b758f069-17ec-404b-a7aa-01c9b4407f9f}
- {7d0215ed-c19e-4250-9135-2a3ffb5b3aed}
+ {4a8b121f-380e-49e5-a48e-547b68b4ddd9}
- {5cfde2cd-4e9c-4083-a96e-d54b7b057d01}
+ {c4b9d25e-1b12-49d5-9bcb-831efca14854}
- {cf2ae3df-893c-477b-81ff-aa660ce0bca9}
+ {39f83211-efa7-46bd-96e5-581c2192e002}
- {00806c84-5431-47c7-bbcc-bc4b8a7863ca}
+ {a2236a01-11fc-4af4-bfb9-97185d6631f9}
- {8528442a-571e-42e5-90b9-a33e5422ecf9}
+ {552c7bd0-a9c4-4646-a834-f911f9bb22b3}
- {b27c75b0-7d05-41d9-b98f-370f0e6ac8f2}
+ {4c1d2bec-c1ed-49bc-82b9-2dabee207dc6}
- {aee0592d-fb93-4733-8a07-19ff5cf04c2f}
+ {ff26e298-3241-44d1-99b8-cf06c3b48ad8}
diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj
index 3c8c56949..a42987285 100644
--- a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj
+++ b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,84 +32,60 @@
TestSuiteWin32Proj
-
+ Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -117,6 +93,36 @@
TestSuiteTestSuite
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ Disabled
@@ -130,11 +136,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -162,11 +167,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnit.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -192,17 +196,15 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- CppUnitmtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)bin64\static_mt\TestSuited.exe..\..\..\lib64;%(AdditionalLibraryDirectories)
- nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)truetruebin64\static_mt\TestSuited.pdb
@@ -225,17 +227,15 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)bin64\static_mt\TestSuite.exe..\..\..\lib64;%(AdditionalLibraryDirectories)
- nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)falseConsoletrue
@@ -256,11 +256,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -288,11 +287,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
@@ -306,30 +304,30 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters
index 63a1e039c..a05a18274 100644
--- a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
- {89896c1f-80b8-4553-97b2-124e891da195}
+ {c9d7a34a-ba31-4812-a5f1-bd34ae66b2fa}
- {7d0215ed-c19e-4250-9135-2a3ffb5b3aed}
+ {3d576401-6349-4e2c-ae8f-e9d6c80429ba}
- {5cfde2cd-4e9c-4083-a96e-d54b7b057d01}
+ {512b6e45-7f66-4174-a4d5-b14676dcd50c}
- {cf2ae3df-893c-477b-81ff-aa660ce0bca9}
+ {bfa5d12c-e26c-4765-aa2d-afccb4ce695d}
- {00806c84-5431-47c7-bbcc-bc4b8a7863ca}
+ {3c831f3b-0db3-45bf-8a2d-8cb0194504c3}
- {8528442a-571e-42e5-90b9-a33e5422ecf9}
+ {0b931025-4c6c-44b3-bff2-78f81acddea4}
- {b27c75b0-7d05-41d9-b98f-370f0e6ac8f2}
+ {12089acb-5a71-4387-9d34-16bb30b188eb}
- {aee0592d-fb93-4733-8a07-19ff5cf04c2f}
+ {d50c894a-c372-46e9-a283-08549653174d}
@@ -89,7 +89,7 @@
_Suite\Source Files
-
+ _Driver\Source Files
diff --git a/Data/ODBC/testsuite/src/Driver.cpp b/Data/ODBC/testsuite/src/Driver.cpp
old mode 100644
new mode 100755
index 9a7786a60..599ad5460
--- a/Data/ODBC/testsuite/src/Driver.cpp
+++ b/Data/ODBC/testsuite/src/Driver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCAccessTest.cpp b/Data/ODBC/testsuite/src/ODBCAccessTest.cpp
old mode 100644
new mode 100755
index dcd4040d3..c93838e97
--- a/Data/ODBC/testsuite/src/ODBCAccessTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCAccessTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCAccessTest.h b/Data/ODBC/testsuite/src/ODBCAccessTest.h
old mode 100644
new mode 100755
index 09efc0100..d29587b02
--- a/Data/ODBC/testsuite/src/ODBCAccessTest.h
+++ b/Data/ODBC/testsuite/src/ODBCAccessTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp
old mode 100644
new mode 100755
index 5b83a8cbb..296f58e31
--- a/Data/ODBC/testsuite/src/ODBCDB2Test.cpp
+++ b/Data/ODBC/testsuite/src/ODBCDB2Test.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCDB2Test.h b/Data/ODBC/testsuite/src/ODBCDB2Test.h
old mode 100644
new mode 100755
index d3775de05..dee55a7c8
--- a/Data/ODBC/testsuite/src/ODBCDB2Test.h
+++ b/Data/ODBC/testsuite/src/ODBCDB2Test.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp
old mode 100644
new mode 100755
index aff66a8c1..023477041
--- a/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCMySQLTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCMySQLTest.h b/Data/ODBC/testsuite/src/ODBCMySQLTest.h
old mode 100644
new mode 100755
index 2381044ac..28da3e1f8
--- a/Data/ODBC/testsuite/src/ODBCMySQLTest.h
+++ b/Data/ODBC/testsuite/src/ODBCMySQLTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp
old mode 100644
new mode 100755
index 35b057b06..823ac9cfb
--- a/Data/ODBC/testsuite/src/ODBCOracleTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCOracleTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCOracleTest.h b/Data/ODBC/testsuite/src/ODBCOracleTest.h
old mode 100644
new mode 100755
index 3e72c9f05..3dd082488
--- a/Data/ODBC/testsuite/src/ODBCOracleTest.h
+++ b/Data/ODBC/testsuite/src/ODBCOracleTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp
old mode 100644
new mode 100755
index 93c9b8b75..7a38e2172
--- a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h
old mode 100644
new mode 100755
index 01d09f65c..fd8a19106
--- a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h
+++ b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp
old mode 100644
new mode 100755
index e0b69a057..7489d4960
--- a/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCSQLServerTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCSQLServerTest.h b/Data/ODBC/testsuite/src/ODBCSQLServerTest.h
old mode 100644
new mode 100755
index 188624cf7..61dc2c54c
--- a/Data/ODBC/testsuite/src/ODBCSQLServerTest.h
+++ b/Data/ODBC/testsuite/src/ODBCSQLServerTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp
old mode 100644
new mode 100755
index d5e31cca0..73a3e29d9
--- a/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCSQLiteTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCSQLiteTest.h b/Data/ODBC/testsuite/src/ODBCSQLiteTest.h
old mode 100644
new mode 100755
index 471bce92e..242c96c39
--- a/Data/ODBC/testsuite/src/ODBCSQLiteTest.h
+++ b/Data/ODBC/testsuite/src/ODBCSQLiteTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCTest.cpp b/Data/ODBC/testsuite/src/ODBCTest.cpp
old mode 100644
new mode 100755
index 1ff616f71..a5f567482
--- a/Data/ODBC/testsuite/src/ODBCTest.cpp
+++ b/Data/ODBC/testsuite/src/ODBCTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCTest.h b/Data/ODBC/testsuite/src/ODBCTest.h
old mode 100644
new mode 100755
index 254c310f7..bf27cc575
--- a/Data/ODBC/testsuite/src/ODBCTest.h
+++ b/Data/ODBC/testsuite/src/ODBCTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCTestSuite.cpp b/Data/ODBC/testsuite/src/ODBCTestSuite.cpp
old mode 100644
new mode 100755
index aeaa2693a..08d8e4138
--- a/Data/ODBC/testsuite/src/ODBCTestSuite.cpp
+++ b/Data/ODBC/testsuite/src/ODBCTestSuite.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/ODBCTestSuite.h b/Data/ODBC/testsuite/src/ODBCTestSuite.h
old mode 100644
new mode 100755
index 5e055ddb2..4c967fca9
--- a/Data/ODBC/testsuite/src/ODBCTestSuite.h
+++ b/Data/ODBC/testsuite/src/ODBCTestSuite.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/SQLExecutor.cpp b/Data/ODBC/testsuite/src/SQLExecutor.cpp
old mode 100644
new mode 100755
index bcb5c7484..d8a06c6b8
--- a/Data/ODBC/testsuite/src/SQLExecutor.cpp
+++ b/Data/ODBC/testsuite/src/SQLExecutor.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/SQLExecutor.h b/Data/ODBC/testsuite/src/SQLExecutor.h
old mode 100644
new mode 100755
index 1bdec261c..823a1d6e0
--- a/Data/ODBC/testsuite/src/SQLExecutor.h
+++ b/Data/ODBC/testsuite/src/SQLExecutor.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/ODBC/testsuite/src/WinDriver.cpp b/Data/ODBC/testsuite/src/WinDriver.cpp
old mode 100644
new mode 100755
index a5ab1b1cc..2733e6ddf
--- a/Data/ODBC/testsuite/src/WinDriver.cpp
+++ b/Data/ODBC/testsuite/src/WinDriver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/SQLite.progen b/Data/SQLite/SQLite.progen
index 3da95c099..e7bc2d6c6 100644
--- a/Data/SQLite/SQLite.progen
+++ b/Data/SQLite/SQLite.progen
@@ -8,7 +8,7 @@ vc.project.platforms = Win32, x64, WinCE
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;..\\..\\Data\\include
-vc.project.compiler.defines = SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED
+vc.project.compiler.defines = SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED
vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
diff --git a/Data/SQLite/SQLite_VS71.vcproj b/Data/SQLite/SQLite_VS71.vcproj
index 6aacfa484..a97aedcea 100644
--- a/Data/SQLite/SQLite_VS71.vcproj
+++ b/Data/SQLite/SQLite_VS71.vcproj
@@ -21,7 +21,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
StringPooling="TRUE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -87,7 +87,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
StringPooling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="2"
@@ -149,7 +149,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="TRUE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -206,7 +206,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="0"
@@ -258,7 +258,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="TRUE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -315,7 +315,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="2"
diff --git a/Data/SQLite/SQLite_VS80.vcproj b/Data/SQLite/SQLite_VS80.vcproj
index c883275f6..60a7a99aa 100644
--- a/Data/SQLite/SQLite_VS80.vcproj
+++ b/Data/SQLite/SQLite_VS80.vcproj
@@ -32,7 +32,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -104,7 +104,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@@ -172,7 +172,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -232,7 +232,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
RuntimeLibrary="0"
BufferSecurityCheck="false"
@@ -285,7 +285,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -345,7 +345,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
diff --git a/Data/SQLite/SQLite_VS90.vcproj b/Data/SQLite/SQLite_VS90.vcproj
index a16f3d849..2dba5a4e5 100644
--- a/Data/SQLite/SQLite_VS90.vcproj
+++ b/Data/SQLite/SQLite_VS90.vcproj
@@ -32,7 +32,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -104,7 +104,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@@ -171,7 +171,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -231,7 +231,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
RuntimeLibrary="0"
BufferSecurityCheck="false"
@@ -284,7 +284,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -344,7 +344,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
diff --git a/Data/SQLite/SQLite_WEC2013_vs110.sln b/Data/SQLite/SQLite_WEC2013_vs110.sln
index 3b965f785..06a15e16c 100644
--- a/Data/SQLite/SQLite_WEC2013_vs110.sln
+++ b/Data/SQLite/SQLite_WEC2013_vs110.sln
@@ -9,50 +9,50 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- debug_shared|SDK_AM335X_SK_WEC2013 = debug_shared|SDK_AM335X_SK_WEC2013
- release_shared|SDK_AM335X_SK_WEC2013 = release_shared|SDK_AM335X_SK_WEC2013
- debug_static_mt|SDK_AM335X_SK_WEC2013 = debug_static_mt|SDK_AM335X_SK_WEC2013
- release_static_mt|SDK_AM335X_SK_WEC2013 = release_static_mt|SDK_AM335X_SK_WEC2013
- debug_static_md|SDK_AM335X_SK_WEC2013 = debug_static_md|SDK_AM335X_SK_WEC2013
- release_static_md|SDK_AM335X_SK_WEC2013 = release_static_md|SDK_AM335X_SK_WEC2013
+ debug_shared|SDK_AM335X_SK_WEC2013_V300 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ release_shared|SDK_AM335X_SK_WEC2013_V300 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ debug_static_mt|SDK_AM335X_SK_WEC2013_V300 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ release_static_mt|SDK_AM335X_SK_WEC2013_V300 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ debug_static_md|SDK_AM335X_SK_WEC2013_V300 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ release_static_md|SDK_AM335X_SK_WEC2013_V300 = release_static_md|SDK_AM335X_SK_WEC2013_V300
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|SDK_AM335X_SK_WEC2013.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|SDK_AM335X_SK_WEC2013.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|SDK_AM335X_SK_WEC2013.Build.0 = release_shared|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|SDK_AM335X_SK_WEC2013.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|SDK_AM335X_SK_WEC2013.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|SDK_AM335X_SK_WEC2013.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|SDK_AM335X_SK_WEC2013.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|SDK_AM335X_SK_WEC2013.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|SDK_AM335X_SK_WEC2013.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|SDK_AM335X_SK_WEC2013.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|SDK_AM335X_SK_WEC2013.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|SDK_AM335X_SK_WEC2013.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|SDK_AM335X_SK_WEC2013.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|SDK_AM335X_SK_WEC2013.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|SDK_AM335X_SK_WEC2013.Build.0 = release_shared|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|SDK_AM335X_SK_WEC2013.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|SDK_AM335X_SK_WEC2013.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|SDK_AM335X_SK_WEC2013.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|SDK_AM335X_SK_WEC2013.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|SDK_AM335X_SK_WEC2013.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|SDK_AM335X_SK_WEC2013.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|SDK_AM335X_SK_WEC2013.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|SDK_AM335X_SK_WEC2013.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|SDK_AM335X_SK_WEC2013.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|SDK_AM335X_SK_WEC2013.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|SDK_AM335X_SK_WEC2013.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|SDK_AM335X_SK_WEC2013_V300.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|SDK_AM335X_SK_WEC2013_V300.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013_V300
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Data/SQLite/SQLite_WEC2013_vs110.vcxproj b/Data/SQLite/SQLite_WEC2013_vs110.vcxproj
index 70bb0daf4..554bce7eb 100644
--- a/Data/SQLite/SQLite_WEC2013_vs110.vcxproj
+++ b/Data/SQLite/SQLite_WEC2013_vs110.vcxproj
@@ -1,29 +1,29 @@
-
+ debug_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
@@ -32,103 +32,103 @@
en-US11.0true
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300CE800
-
+ StaticLibraryUnicodeCE800
-
+ StaticLibraryUnicodeCE800
-
+ StaticLibraryUnicodeCE800
-
+ StaticLibraryUnicodeCE800
-
+ DynamicLibraryUnicodeCE800
-
+ DynamicLibraryUnicodeCE800
-
+
-
+
-
+
-
+
-
+
-
+
<_ProjectFileVersion>11.0.61030.0
- PocoDataSQLited
- PocoDataSQLitemdd
- PocoDataSQLitemtd
- PocoDataSQLite
- PocoDataSQLitemd
- PocoDataSQLitemt
+ PocoDataSQLited
+ PocoDataSQLitemdd
+ PocoDataSQLitemtd
+ PocoDataSQLite
+ PocoDataSQLitemd
+ PocoDataSQLitemt
-
+ ..\..\bin\$(Platform)\obj\$(Platform)\$(Configuration)\truetrue
-
+ ..\..\bin\$(Platform)\obj\$(Platform)\$(Configuration)\falsetrue
-
+ ..\..\lib\$(Platform)\obj\$(Platform)\$(Configuration)\
-
+ ..\..\lib\$(Platform)\obj\$(Platform)\$(Configuration)\
-
+ ..\..\lib\$(Platform)\obj\$(Platform)\$(Configuration)\
-
+ ..\..\lib\$(Platform)\obj\$(Platform)\$(Configuration)\
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)
+ _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)truefalseMultiThreadedDebugDLL
@@ -149,13 +149,13 @@
WindowsCE
-
+ DisabledtrueSpeed.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)
+ NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)truefalseMultiThreadedDLL
@@ -176,11 +176,11 @@
WindowsCE
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)
+ _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)truefalseMultiThreadedDebug
@@ -197,13 +197,13 @@
..\..\lib\$(Platform)\PocoDataSQLitemtd.lib
-
+ DisabledtrueSpeed.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)
+ NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)truefalseMultiThreaded
@@ -219,11 +219,11 @@
..\..\lib\$(Platform)\PocoDataSQLitemt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)
+ _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)truefalseMultiThreadedDebugDLL
@@ -240,13 +240,13 @@
..\..\lib\$(Platform)\PocoDataSQLitemdd.lib
-
+ DisabledtrueSpeed.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)
+ NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions)truefalseMultiThreadedDLL
diff --git a/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters b/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters
index ae71fdcb0..d4615a28d 100644
--- a/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters
+++ b/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters
@@ -2,22 +2,22 @@
- {2674d75a-87d8-4395-8ba9-cc75a687e564}
+ {3870c98f-a4d6-48c2-b4ff-9dfe83427d12}
- {f7787e91-379e-45fc-896c-34b7dc665471}
+ {b74d2f38-c2c2-48b2-8db5-f44394777983}
- {cfdaec6e-5512-41cb-a0f0-973ecaebcf2e}
+ {a58a61ef-9a4d-4541-8516-73bd1e6f8919}
- {7f52f48b-7ce2-4c3c-aaff-4b7e8b074d53}
+ {315263da-c494-4c14-8b0a-c275fdaedda6}
- {adb14edd-2b45-40fe-9abe-d214bec1f504}
+ {29cb1bb3-6312-4920-a10a-97902a93f592}
- {616b47d5-3457-4800-82c9-fb9e9592c24d}
+ {1aafff9f-9f63-4345-a56e-c2d39f6d706e}
diff --git a/Data/SQLite/SQLite_vs100.vcxproj b/Data/SQLite/SQLite_vs100.vcxproj
index 3a0ccc242..cb9c8aca9 100644
--- a/Data/SQLite/SQLite_vs100.vcxproj
+++ b/Data/SQLite/SQLite_vs100.vcxproj
@@ -33,79 +33,79 @@
Win32Proj
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\..\bin\
- obj\$(Configuration)\
- true
- ..\..\bin\
- obj\$(Configuration)\
- false
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- PocoDataSQLited
- PocoDataSQLitemdd
- PocoDataSQLitemtd
- PocoDataSQLite
- PocoDataSQLitemd
- PocoDataSQLitemt
+ ..\..\bin\
+ obj\$(Configuration)\
+ true
+ ..\..\bin\
+ obj\$(Configuration)\
+ false
+ ..\..\lib\
+ obj\$(Configuration)\
+ ..\..\lib\
+ obj\$(Configuration)\
+ ..\..\lib\
+ obj\$(Configuration)\
+ ..\..\lib\
+ obj\$(Configuration)\
+ PocoDataSQLited
+ PocoDataSQLitemdd
+ PocoDataSQLitemtd
+ PocoDataSQLite
+ PocoDataSQLitemd
+ PocoDataSQLitemt
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -132,7 +132,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -140,7 +140,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)trueMultiThreadedDLLfalse
@@ -166,11 +166,11 @@
MachineX86
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -190,7 +190,7 @@
..\..\lib\PocoDataSQLitemtd.lib
-
+ DisabledOnlyExplicitInline
@@ -198,7 +198,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedfalse
@@ -215,11 +215,11 @@
..\..\lib\PocoDataSQLitemt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -239,7 +239,7 @@
..\..\lib\PocoDataSQLitemdd.lib
-
+ DisabledOnlyExplicitInline
@@ -247,7 +247,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedDLLfalse
diff --git a/Data/SQLite/SQLite_vs100.vcxproj.filters b/Data/SQLite/SQLite_vs100.vcxproj.filters
index c12a1605d..2bf177478 100644
--- a/Data/SQLite/SQLite_vs100.vcxproj.filters
+++ b/Data/SQLite/SQLite_vs100.vcxproj.filters
@@ -2,22 +2,22 @@
- {4e609b41-82c4-438d-8840-b4a12d40f739}
+ {e6aced72-4741-441d-b37b-d4e347799dd6}
- {c996c461-9baa-4a95-b0ac-429dc187ac3e}
+ {de37ce41-8e4e-491f-bca7-32451d03ab5c}
- {d37df4d4-4503-40f3-8977-c3be47a49356}
+ {eedceb0e-4019-43f4-9ea7-8ac137e57d5b}
- {7010d3ee-0c80-48ef-a088-389702d2caf9}
+ {ee26b17e-f280-4ab0-9dfc-cfc325934a05}
- {3d66eb31-a8d0-44da-bbe5-ef0d3d3355ca}
+ {cf7c216e-fe45-4bb4-99ef-9c217cf99d1e}
- {2b154994-ff36-4807-bce5-7f3f7e5c6bad}
+ {bfb6b02b-1333-4e46-bd5d-0f7419710301}
diff --git a/Data/SQLite/SQLite_vs110.vcxproj b/Data/SQLite/SQLite_vs110.vcxproj
index aa2014271..d25ed0533 100644
--- a/Data/SQLite/SQLite_vs110.vcxproj
+++ b/Data/SQLite/SQLite_vs110.vcxproj
@@ -33,85 +33,97 @@
Win32Proj
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin\
- obj\$(Configuration)\
- true
- ..\..\bin\
- obj\$(Configuration)\
- false
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- PocoDataSQLited
- PocoDataSQLitemdd
- PocoDataSQLitemtd
- PocoDataSQLite
- PocoDataSQLitemd
- PocoDataSQLitemt
+ <_ProjectFileVersion>11.0.61030.0
+ PocoDataSQLited
+ PocoDataSQLitemdd
+ PocoDataSQLitemtd
+ PocoDataSQLite
+ PocoDataSQLitemd
+ PocoDataSQLitemt
-
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ false
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -127,7 +139,6 @@
4996;4244;4018;%(DisableSpecificWarnings)
- %(AdditionalDependencies)..\..\bin\PocoDataSQLited.dlltruetrue
@@ -138,7 +149,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -146,7 +157,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)trueMultiThreadedDLLfalse
@@ -160,7 +171,6 @@
4996;4244;4018;%(DisableSpecificWarnings)
- %(AdditionalDependencies)..\..\bin\PocoDataSQLite.dlltruefalse
@@ -172,11 +182,11 @@
MachineX86
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -196,7 +206,7 @@
..\..\lib\PocoDataSQLitemtd.lib
-
+ DisabledOnlyExplicitInline
@@ -204,7 +214,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedfalse
@@ -221,11 +231,11 @@
..\..\lib\PocoDataSQLitemt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -245,7 +255,7 @@
..\..\lib\PocoDataSQLitemdd.lib
-
+ DisabledOnlyExplicitInline
@@ -253,7 +263,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedDLLfalse
@@ -268,7 +278,6 @@
4996;4244;4018;%(DisableSpecificWarnings)
- %(AdditionalDependencies)..\..\lib\PocoDataSQLitemd.lib
diff --git a/Data/SQLite/SQLite_vs110.vcxproj.filters b/Data/SQLite/SQLite_vs110.vcxproj.filters
index 0c0e76832..dad6557d0 100644
--- a/Data/SQLite/SQLite_vs110.vcxproj.filters
+++ b/Data/SQLite/SQLite_vs110.vcxproj.filters
@@ -2,22 +2,22 @@
- {1654afe3-8338-4a8d-9531-76243ab57c7e}
+ {8a1a0384-7407-49e5-aac2-c01c9932a530}
- {2c59f410-c8bb-4206-ba5d-24344551781d}
+ {92c32b1e-4aa9-4a2b-b90c-85540ba0149b}
- {1b92e4f7-cd36-41e6-a6b1-0089d05c4e94}
+ {9846c948-c1e2-4d62-b751-bae3b68a02c7}
- {d6252b79-c041-4bc0-9432-73b4cacf86e4}
+ {c0a1caa3-0f56-4a81-9e83-1c6479501bc9}
- {aa9ec1c8-5901-400b-8edd-8837c734a5fe}
+ {3135385f-1b19-46d4-a2c7-251a5642f78f}
- {b9f7489c-e59b-489d-b346-86baeb07efd9}
+ {92b668bc-e9d7-4131-a205-93907a1580ca}
diff --git a/Data/SQLite/SQLite_vs120.sln b/Data/SQLite/SQLite_vs120.sln
index 41fdf0e60..a6015d513 100644
--- a/Data/SQLite/SQLite_vs120.sln
+++ b/Data/SQLite/SQLite_vs120.sln
@@ -1,45 +1,58 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite_vs120.vcxproj", "{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs120.vcxproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}"
+ ProjectSection(ProjectDependencies) = postProject
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} = {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|Win32 = debug_shared|Win32
- debug_static_md|Win32 = debug_static_md|Win32
- debug_static_mt|Win32 = debug_static_mt|Win32
release_shared|Win32 = release_shared|Win32
- release_static_md|Win32 = release_static_md|Win32
+ debug_static_mt|Win32 = debug_static_mt|Win32
release_static_mt|Win32 = release_static_mt|Win32
+ debug_static_md|Win32 = debug_static_md|Win32
+ release_static_md|Win32 = release_static_md|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Win32.ActiveCfg = release_shared|Win32
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Win32.Build.0 = release_shared|Win32
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Build.0 = debug_shared|Win32
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.ActiveCfg = release_shared|Win32
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.Build.0 = release_shared|Win32
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|Win32.Deploy.0 = release_shared|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.Build.0 = release_static_mt|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Build.0 = debug_static_md|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.ActiveCfg = release_static_md|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Build.0 = release_static_md|Win32
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|Win32.Deploy.0 = release_static_md|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Data/SQLite/SQLite_vs120.vcxproj b/Data/SQLite/SQLite_vs120.vcxproj
index 960a64177..214acb618 100644
--- a/Data/SQLite/SQLite_vs120.vcxproj
+++ b/Data/SQLite/SQLite_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
SQLiteWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin\
- obj\$(Configuration)\
- true
- ..\..\bin\
- obj\$(Configuration)\
- false
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
- ..\..\lib\
- obj\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoDataSQLitedPocoDataSQLitemddPocoDataSQLitemtd
@@ -107,11 +93,37 @@
PocoDataSQLitemdPocoDataSQLitemt
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ true
+
+
+ ..\..\bin\
+ obj\$(Configuration)\
+ false
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+
+
+ ..\..\lib\
+ obj\$(Configuration)\
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -120,14 +132,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault4996;4244;4018;%(DisableSpecificWarnings)
- %(AdditionalDependencies)..\..\bin\PocoDataSQLited.dlltruetrue
@@ -146,21 +157,20 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)trueMultiThreadedDLLfalsetruetruetrue
-
+ Level3
-
+ Default4996;4244;4018;%(DisableSpecificWarnings)
- %(AdditionalDependencies)..\..\bin\PocoDataSQLite.dlltruefalse
@@ -176,7 +186,7 @@
Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -185,7 +195,7 @@
truetruetrue
-
+ ..\..\lib\PocoDataSQLitemtd.pdbLevel3EditAndContinue
@@ -204,16 +214,16 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedfalsetruetruetrue
-
+ Level3
-
+ Default4996;4244;4018;%(DisableSpecificWarnings)
@@ -225,7 +235,7 @@
Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -234,7 +244,7 @@
truetruetrue
-
+ ..\..\lib\PocoDataSQLitemdd.pdbLevel3EditAndContinue
@@ -253,48 +263,47 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedDLLfalsetruetruetrue
-
+ ..\..\lib\PocoDataSQLitemd.pdbLevel3
-
+ Default4996;4244;4018;%(DisableSpecificWarnings)
- %(AdditionalDependencies)..\..\lib\PocoDataSQLitemd.lib
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/SQLite/SQLite_vs120.vcxproj.filters b/Data/SQLite/SQLite_vs120.vcxproj.filters
index 0c0e76832..c253d7a0b 100644
--- a/Data/SQLite/SQLite_vs120.vcxproj.filters
+++ b/Data/SQLite/SQLite_vs120.vcxproj.filters
@@ -2,22 +2,22 @@
- {1654afe3-8338-4a8d-9531-76243ab57c7e}
+ {304659b3-6bc0-4c69-8908-ed351f08ef9a}
- {2c59f410-c8bb-4206-ba5d-24344551781d}
+ {d45cc236-c08e-47e8-94c4-9060bfcc6721}
- {1b92e4f7-cd36-41e6-a6b1-0089d05c4e94}
+ {9ceb04ea-4593-4913-bd92-3268ec4253b9}
- {d6252b79-c041-4bc0-9432-73b4cacf86e4}
+ {80fb2ced-e671-4a6c-9a2d-0bc1467671e5}
- {aa9ec1c8-5901-400b-8edd-8837c734a5fe}
+ {eaac9e3c-35f4-44b7-8a34-e6c10172188f}
- {b9f7489c-e59b-489d-b346-86baeb07efd9}
+ {a63e63bb-e613-428a-803a-4ffc530a2abc}
diff --git a/Data/SQLite/SQLite_x64_vs100.vcxproj b/Data/SQLite/SQLite_x64_vs100.vcxproj
index 0dd044a0c..887dbeaed 100644
--- a/Data/SQLite/SQLite_x64_vs100.vcxproj
+++ b/Data/SQLite/SQLite_x64_vs100.vcxproj
@@ -33,79 +33,79 @@
Win32Proj
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ StaticLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
+ DynamicLibraryMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- ..\..\bin64\
- obj64\$(Configuration)\
- true
- ..\..\bin64\
- obj64\$(Configuration)\
- false
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- PocoDataSQLite64d
- PocoDataSQLitemdd
- PocoDataSQLitemtd
- PocoDataSQLite64
- PocoDataSQLitemd
- PocoDataSQLitemt
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ true
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ false
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ PocoDataSQLite64d
+ PocoDataSQLitemdd
+ PocoDataSQLitemtd
+ PocoDataSQLite64
+ PocoDataSQLitemd
+ PocoDataSQLitemt
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -132,7 +132,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -140,7 +140,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)trueMultiThreadedDLLfalse
@@ -166,11 +166,11 @@
MachineX64
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -190,7 +190,7 @@
..\..\lib64\PocoDataSQLitemtd.lib
-
+ DisabledOnlyExplicitInline
@@ -198,7 +198,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedfalse
@@ -215,11 +215,11 @@
..\..\lib64\PocoDataSQLitemt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -239,7 +239,7 @@
..\..\lib64\PocoDataSQLitemdd.lib
-
+ DisabledOnlyExplicitInline
@@ -247,7 +247,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedDLLfalse
diff --git a/Data/SQLite/SQLite_x64_vs100.vcxproj.filters b/Data/SQLite/SQLite_x64_vs100.vcxproj.filters
index f2ba569a3..60b188106 100644
--- a/Data/SQLite/SQLite_x64_vs100.vcxproj.filters
+++ b/Data/SQLite/SQLite_x64_vs100.vcxproj.filters
@@ -2,22 +2,22 @@
- {9c6e655f-fee8-4718-b21a-20d1d155bdc1}
+ {bcaf734c-f1ed-4c4e-acad-70edfcd296c6}
- {ed02880c-c814-4b29-a13d-857c56672445}
+ {3c05f097-04c0-4a55-a384-b33f080ce52f}
- {589cf2c0-4e72-4f22-9c60-42da19d5c61e}
+ {669dcf8f-e6be-4066-9ec4-42bee3625744}
- {8bf16ad5-9f01-4312-ac6d-b2522f958ec5}
+ {0a0b4248-f33c-4ce3-98a6-d027f722a69c}
- {a666641e-d4cf-4a97-b146-cfe3cab947be}
+ {4c24c51b-c76a-428c-9bb7-788009210d6d}
- {939d9ee8-27c8-44f1-83d1-5a50d2bb9334}
+ {3788c2ec-d70e-4994-b80b-c9b189daaef7}
diff --git a/Data/SQLite/SQLite_x64_vs110.vcxproj b/Data/SQLite/SQLite_x64_vs110.vcxproj
index c8fc4ff89..832160990 100644
--- a/Data/SQLite/SQLite_x64_vs110.vcxproj
+++ b/Data/SQLite/SQLite_x64_vs110.vcxproj
@@ -33,85 +33,97 @@
Win32Proj
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ StaticLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
+ DynamicLibraryMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin64\
- obj64\$(Configuration)\
- true
- ..\..\bin64\
- obj64\$(Configuration)\
- false
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- PocoDataSQLite64d
- PocoDataSQLitemdd
- PocoDataSQLitemtd
- PocoDataSQLite64
- PocoDataSQLitemd
- PocoDataSQLitemt
+ <_ProjectFileVersion>11.0.61030.0
+ PocoDataSQLite64d
+ PocoDataSQLitemdd
+ PocoDataSQLitemtd
+ PocoDataSQLite64
+ PocoDataSQLitemd
+ PocoDataSQLitemt
-
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -127,7 +139,6 @@
4996;4244;4018;%(DisableSpecificWarnings)
- %(AdditionalDependencies)..\..\bin64\PocoDataSQLite64d.dlltruetrue
@@ -138,7 +149,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -146,7 +157,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)trueMultiThreadedDLLfalse
@@ -160,7 +171,6 @@
4996;4244;4018;%(DisableSpecificWarnings)
- %(AdditionalDependencies)..\..\bin64\PocoDataSQLite64.dlltruefalse
@@ -172,11 +182,11 @@
MachineX64
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -196,7 +206,7 @@
..\..\lib64\PocoDataSQLitemtd.lib
-
+ DisabledOnlyExplicitInline
@@ -204,7 +214,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedfalse
@@ -221,11 +231,11 @@
..\..\lib64\PocoDataSQLitemt.lib
-
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -245,7 +255,7 @@
..\..\lib64\PocoDataSQLitemdd.lib
-
+ DisabledOnlyExplicitInline
@@ -253,7 +263,7 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedDLLfalse
diff --git a/Data/SQLite/SQLite_x64_vs110.vcxproj.filters b/Data/SQLite/SQLite_x64_vs110.vcxproj.filters
index acfd661e6..a004e05b0 100644
--- a/Data/SQLite/SQLite_x64_vs110.vcxproj.filters
+++ b/Data/SQLite/SQLite_x64_vs110.vcxproj.filters
@@ -2,22 +2,22 @@
- {e3a116ea-ab9d-47d6-b9cc-5c16ef9b5dbd}
+ {28c42c58-7519-42a3-9cb3-28ae3c9e7b4e}
- {eface8d0-944f-4a5b-898c-bea65b4ae4fa}
+ {ef8dff5b-6277-4a20-ac1a-d00f5ddff9be}
- {b79c984e-3c84-4c94-8ac0-dad9b7fc1142}
+ {eee88d55-f8ae-4ae6-9ae5-1661bc90d8ae}
- {b42abe38-646d-4dd8-9ca9-14d517aac75b}
+ {342f801f-4d5a-4cb5-aab0-1079e7dcc4c5}
- {3c50e562-d3f8-45b9-b1d1-9bbba13c4b8a}
+ {83e9d0ea-284d-44f9-a362-0af7865a6a31}
- {2bdeac5c-a341-4008-85de-0a7f686d8aca}
+ {717ff287-ab17-4386-a662-a9c39ca8847f}
diff --git a/Data/SQLite/SQLite_x64_vs120.sln b/Data/SQLite/SQLite_x64_vs120.sln
index 57473e127..6653705cc 100644
--- a/Data/SQLite/SQLite_x64_vs120.sln
+++ b/Data/SQLite/SQLite_x64_vs120.sln
@@ -1,45 +1,58 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite_x64_vs120.vcxproj", "{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs120.vcxproj", "{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}"
+ ProjectSection(ProjectDependencies) = postProject
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} = {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
debug_shared|x64 = debug_shared|x64
- debug_static_md|x64 = debug_static_md|x64
- debug_static_mt|x64 = debug_static_mt|x64
release_shared|x64 = release_shared|x64
- release_static_md|x64 = release_static_md|x64
+ debug_static_mt|x64 = debug_static_mt|x64
release_static_mt|x64 = release_static_mt|x64
+ debug_static_md|x64 = debug_static_md|x64
+ release_static_md|x64 = release_static_md|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|x64.ActiveCfg = debug_shared|x64
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|x64.Build.0 = debug_shared|x64
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_shared|x64.Deploy.0 = debug_shared|x64
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|x64.ActiveCfg = release_shared|x64
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|x64.Build.0 = release_shared|x64
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.Build.0 = release_static_md|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_shared|x64.Deploy.0 = release_shared|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.Build.0 = release_static_md|x64
+ {5B889CE7-AD42-4CFE-BBC3-532B61F8329E}.release_static_md|x64.Deploy.0 = release_static_md|x64
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.ActiveCfg = debug_shared|x64
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.Build.0 = debug_shared|x64
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Build.0 = debug_static_md|x64
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_shared|x64.Deploy.0 = debug_shared|x64
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.ActiveCfg = release_shared|x64
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.Build.0 = release_shared|x64
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.ActiveCfg = release_static_md|x64
- {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Build.0 = release_static_md|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_shared|x64.Deploy.0 = release_shared|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Build.0 = debug_static_mt|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.ActiveCfg = release_static_mt|x64
{45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.Build.0 = release_static_mt|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_mt|x64.Deploy.0 = release_static_mt|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.ActiveCfg = debug_static_md|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Build.0 = debug_static_md|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.debug_static_md|x64.Deploy.0 = debug_static_md|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.ActiveCfg = release_static_md|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Build.0 = release_static_md|x64
+ {45528A81-2523-48DD-AEB3-6B6BD73A2C5D}.release_static_md|x64.Deploy.0 = release_static_md|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Data/SQLite/SQLite_x64_vs120.vcxproj b/Data/SQLite/SQLite_x64_vs120.vcxproj
index ccc0ff7be..af5c052ec 100644
--- a/Data/SQLite/SQLite_x64_vs120.vcxproj
+++ b/Data/SQLite/SQLite_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
SQLiteWin32Proj
-
+ StaticLibraryMultiByte
@@ -63,43 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- ..\..\bin64\
- obj64\$(Configuration)\
- true
- ..\..\bin64\
- obj64\$(Configuration)\
- false
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
- ..\..\lib64\
- obj64\$(Configuration)\
+ <_ProjectFileVersion>11.0.61030.0
PocoDataSQLite64dPocoDataSQLitemddPocoDataSQLitemtd
@@ -107,11 +93,37 @@
PocoDataSQLitemdPocoDataSQLitemt
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ ..\..\bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+
+
+ ..\..\lib64\
+ obj64\$(Configuration)\
+ Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -120,14 +132,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault4996;4244;4018;%(DisableSpecificWarnings)
- %(AdditionalDependencies)..\..\bin64\PocoDataSQLite64d.dlltruetrue
@@ -146,21 +157,20 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;%(PreprocessorDefinitions)trueMultiThreadedDLLfalsetruetruetrue
-
+ Level3
-
+ Default4996;4244;4018;%(DisableSpecificWarnings)
- %(AdditionalDependencies)..\..\bin64\PocoDataSQLite64.dlltruefalse
@@ -176,7 +186,7 @@
Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -185,7 +195,7 @@
truetruetrue
-
+ ..\..\lib64\PocoDataSQLitemtd.pdbLevel3ProgramDatabase
@@ -204,16 +214,16 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedfalsetruetruetrue
-
+ Level3
-
+ Default4996;4244;4018;%(DisableSpecificWarnings)
@@ -225,7 +235,7 @@
Disabled.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -234,7 +244,7 @@
truetruetrue
-
+ ..\..\lib64\PocoDataSQLitemdd.pdbLevel3ProgramDatabase
@@ -253,16 +263,16 @@
Speedtrue.\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;%(PreprocessorDefinitions)trueMultiThreadedDLLfalsetruetruetrue
-
+ Level3
-
+ Default4996;4244;4018;%(DisableSpecificWarnings)
@@ -271,28 +281,28 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/SQLite/SQLite_x64_vs120.vcxproj.filters b/Data/SQLite/SQLite_x64_vs120.vcxproj.filters
index acfd661e6..1fa6323e9 100644
--- a/Data/SQLite/SQLite_x64_vs120.vcxproj.filters
+++ b/Data/SQLite/SQLite_x64_vs120.vcxproj.filters
@@ -2,22 +2,22 @@
- {e3a116ea-ab9d-47d6-b9cc-5c16ef9b5dbd}
+ {5554edb4-89d6-428f-923a-8eee3660a6e1}
- {eface8d0-944f-4a5b-898c-bea65b4ae4fa}
+ {62663b21-1d9d-472f-a472-b9a1ef3b18cc}
- {b79c984e-3c84-4c94-8ac0-dad9b7fc1142}
+ {8571d73c-f488-4e1e-9aae-ac66b73b10e2}
- {b42abe38-646d-4dd8-9ca9-14d517aac75b}
+ {630bdc92-55ca-4e2b-a392-17e94da346d8}
- {3c50e562-d3f8-45b9-b1d1-9bbba13c4b8a}
+ {95d73268-0239-4746-9a97-f11bfdacecf5}
- {2bdeac5c-a341-4008-85de-0a7f686d8aca}
+ {16b63c46-cb7e-436a-aea9-cf321fdd2690}
diff --git a/Data/SQLite/SQLite_x64_vs90.vcproj b/Data/SQLite/SQLite_x64_vs90.vcproj
index 371001ac9..c108fe2eb 100644
--- a/Data/SQLite/SQLite_x64_vs90.vcproj
+++ b/Data/SQLite/SQLite_x64_vs90.vcproj
@@ -32,7 +32,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -104,7 +104,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@@ -172,7 +172,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -233,7 +233,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
RuntimeLibrary="0"
BufferSecurityCheck="false"
@@ -287,7 +287,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -348,7 +348,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories=".\include;..\..\Foundation\include;..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Binder.h b/Data/SQLite/include/Poco/Data/SQLite/Binder.h
old mode 100644
new mode 100755
index 4b15bbc57..c19770f41
--- a/Data/SQLite/include/Poco/Data/SQLite/Binder.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/Binder.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Connector.h b/Data/SQLite/include/Poco/Data/SQLite/Connector.h
old mode 100644
new mode 100755
index 266508712..ce1fbc3bb
--- a/Data/SQLite/include/Poco/Data/SQLite/Connector.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/Connector.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -133,7 +113,7 @@ struct SQLite_API SQLiteConnectorRegistrator
#if defined(POCO_OS_FAMILY_WINDOWS)
extern "C" const struct SQLite_API SQLiteConnectorRegistrator pocoSQLiteConnectorRegistrator;
#if defined(SQLite_EXPORTS)
- #if defined(_WIN64 || defined(_WIN32_WCE)
+ #if defined(_WIN64) || defined(_WIN32_WCE)
#define POCO_DATA_SQLITE_FORCE_SYMBOL(s) __pragma(comment (linker, "/export:"#s))
#elif defined(_WIN32)
#define POCO_DATA_SQLITE_FORCE_SYMBOL(s) __pragma(comment (linker, "/export:_"#s))
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Extractor.h b/Data/SQLite/include/Poco/Data/SQLite/Extractor.h
old mode 100644
new mode 100755
index d95dd184e..2e7fa4cb3
--- a/Data/SQLite/include/Poco/Data/SQLite/Extractor.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/Extractor.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h
old mode 100644
new mode 100755
index dfddb1127..77ec24775
--- a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLite.h b/Data/SQLite/include/Poco/Data/SQLite/SQLite.h
old mode 100644
new mode 100755
index 15ea80b9b..36590001b
--- a/Data/SQLite/include/Poco/Data/SQLite/SQLite.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/SQLite.h
@@ -4,7 +4,7 @@
// $Id: //poco/Main/Data/SQLite/include/Poco/Data/SQLite/SQLite.h#3 $
//
// Library: SQLite
-// Package: SQLIte
+// Package: SQLite
// Module: SQLite
//
// Basic definitions for the Poco SQLite library.
@@ -14,27 +14,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -81,15 +61,4 @@
#endif
-//
-// Thread safety mode defaults to "serialized".
-// See http://www.sqlite.org/threadsafe.html for details.
-// Threading mode may significantly affect performance
-// (see TestSuite::benchmarkThreadModesTiming)
-//
-#ifndef SQLITE_THREADSAFE
- #define SQLITE_THREADSAFE 1
-#endif
-
-
#endif // SQLite_SQLite_INCLUDED
diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h b/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h
old mode 100644
new mode 100755
index 36bc13fbe..708093739
--- a/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h
old mode 100644
new mode 100755
index 40864e0e7..eb2a6ccdc
--- a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h
old mode 100644
new mode 100755
index dd758f583..1be2dd1e7
--- a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Utility.h b/Data/SQLite/include/Poco/Data/SQLite/Utility.h
old mode 100644
new mode 100755
index a274c8c67..305bae873
--- a/Data/SQLite/include/Poco/Data/SQLite/Utility.h
+++ b/Data/SQLite/include/Poco/Data/SQLite/Utility.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -223,10 +203,7 @@ private:
inline sqlite3* Utility::dbHandle(const Session& session)
{
-#ifdef POCO_COMPILER_CLANG
- sqlite3* p = 0; Any a = p; // ??? clang fails to AnyCast without these ???
-#endif
- return AnyCast(session.getProperty("handle"));
+ return reinterpret_cast(AnyCast(session.getProperty("handle")));
}
diff --git a/Data/SQLite/src/Binder.cpp b/Data/SQLite/src/Binder.cpp
old mode 100644
new mode 100755
index da10efda1..2375645a8
--- a/Data/SQLite/src/Binder.cpp
+++ b/Data/SQLite/src/Binder.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/src/Connector.cpp b/Data/SQLite/src/Connector.cpp
old mode 100644
new mode 100755
index 70de69a80..62ca1fce7
--- a/Data/SQLite/src/Connector.cpp
+++ b/Data/SQLite/src/Connector.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/src/Extractor.cpp b/Data/SQLite/src/Extractor.cpp
old mode 100644
new mode 100755
index e1cd19bf7..1db985fba
--- a/Data/SQLite/src/Extractor.cpp
+++ b/Data/SQLite/src/Extractor.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -118,7 +98,7 @@ bool Extractor::extract(std::size_t pos, std::string& val)
if (!pBuf)
val.clear();
else
- val = std::string(pBuf);
+ val.assign(pBuf);
return true;
}
diff --git a/Data/SQLite/src/Notifier.cpp b/Data/SQLite/src/Notifier.cpp
old mode 100644
new mode 100755
index 00a77a8f3..2aff29a77
--- a/Data/SQLite/src/Notifier.cpp
+++ b/Data/SQLite/src/Notifier.cpp
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/src/SQLiteException.cpp b/Data/SQLite/src/SQLiteException.cpp
old mode 100644
new mode 100755
index dee3bc2fc..8b3a9f66e
--- a/Data/SQLite/src/SQLiteException.cpp
+++ b/Data/SQLite/src/SQLiteException.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/src/SQLiteStatementImpl.cpp b/Data/SQLite/src/SQLiteStatementImpl.cpp
old mode 100644
new mode 100755
index 99b451639..d67f2649f
--- a/Data/SQLite/src/SQLiteStatementImpl.cpp
+++ b/Data/SQLite/src/SQLiteStatementImpl.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/src/SessionImpl.cpp b/Data/SQLite/src/SessionImpl.cpp
old mode 100644
new mode 100755
index ccc40e46d..d3f542a55
--- a/Data/SQLite/src/SessionImpl.cpp
+++ b/Data/SQLite/src/SessionImpl.cpp
@@ -10,27 +10,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -67,7 +47,7 @@ SessionImpl::SessionImpl(const std::string& fileName, std::size_t loginTimeout):
{
open();
setConnectionTimeout(CONNECTION_TIMEOUT_DEFAULT);
- setProperty("handle", _pDB);
+ setProperty("handle", static_cast(_pDB));
addFeature("autoCommit",
&SessionImpl::autoCommit,
&SessionImpl::isAutoCommit);
diff --git a/Data/SQLite/src/Utility.cpp b/Data/SQLite/src/Utility.cpp
old mode 100644
new mode 100755
index 762eb3a15..0d412fe12
--- a/Data/SQLite/src/Utility.cpp
+++ b/Data/SQLite/src/Utility.cpp
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -110,6 +90,9 @@ Utility::Utility()
_types.insert(TypeMap::value_type("INT64", MetaColumn::FDT_INT64));
_types.insert(TypeMap::value_type("LONG", MetaColumn::FDT_INT64));
_types.insert(TypeMap::value_type("INTEGER64", MetaColumn::FDT_INT64));
+ _types.insert(TypeMap::value_type("TINYINT", MetaColumn::FDT_INT8));
+ _types.insert(TypeMap::value_type("SMALLINT", MetaColumn::FDT_INT16));
+ _types.insert(TypeMap::value_type("BIGINT", MetaColumn::FDT_INT64));
_types.insert(TypeMap::value_type("COUNTER", MetaColumn::FDT_UINT64));
_types.insert(TypeMap::value_type("AUTOINCREMENT", MetaColumn::FDT_UINT64));
_types.insert(TypeMap::value_type("REAL", MetaColumn::FDT_DOUBLE));
diff --git a/Data/SQLite/testsuite/TestSuite_VS71.vcproj b/Data/SQLite/testsuite/TestSuite_VS71.vcproj
index 1ec2678dc..a1641762b 100644
--- a/Data/SQLite/testsuite/TestSuite_VS71.vcproj
+++ b/Data/SQLite/testsuite/TestSuite_VS71.vcproj
@@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
StringPooling="TRUE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -87,7 +87,7 @@
OmitFramePointers="TRUE"
OptimizeForWindowsApplication="TRUE"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
StringPooling="TRUE"
RuntimeLibrary="2"
BufferSecurityCheck="FALSE"
@@ -147,7 +147,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="TRUE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -213,7 +213,7 @@
OmitFramePointers="TRUE"
OptimizeForWindowsApplication="TRUE"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="TRUE"
RuntimeLibrary="0"
BufferSecurityCheck="FALSE"
@@ -274,7 +274,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="TRUE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@@ -339,7 +339,7 @@
OmitFramePointers="TRUE"
OptimizeForWindowsApplication="TRUE"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="TRUE"
RuntimeLibrary="2"
BufferSecurityCheck="FALSE"
diff --git a/Data/SQLite/testsuite/TestSuite_VS80.vcproj b/Data/SQLite/testsuite/TestSuite_VS80.vcproj
index bb0e0a277..1e01fc903 100644
--- a/Data/SQLite/testsuite/TestSuite_VS80.vcproj
+++ b/Data/SQLite/testsuite/TestSuite_VS80.vcproj
@@ -33,7 +33,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@@ -171,7 +171,7 @@
Name="VCCLCompilerTool"
Optimization="4"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -244,7 +244,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
RuntimeLibrary="0"
BufferSecurityCheck="false"
@@ -311,7 +311,7 @@
Name="VCCLCompilerTool"
Optimization="4"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -383,7 +383,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
diff --git a/Data/SQLite/testsuite/TestSuite_VS90.vcproj b/Data/SQLite/testsuite/TestSuite_VS90.vcproj
index 7ae6a6054..e7db76a1b 100644
--- a/Data/SQLite/testsuite/TestSuite_VS90.vcproj
+++ b/Data/SQLite/testsuite/TestSuite_VS90.vcproj
@@ -33,7 +33,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@@ -171,7 +171,7 @@
Name="VCCLCompilerTool"
Optimization="4"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -244,7 +244,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
RuntimeLibrary="0"
BufferSecurityCheck="false"
@@ -311,7 +311,7 @@
Name="VCCLCompilerTool"
Optimization="4"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -383,7 +383,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
diff --git a/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj
index 293050c06..88ff9d4d6 100644
--- a/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj
+++ b/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj
@@ -1,29 +1,29 @@
-
+ debug_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
@@ -32,101 +32,101 @@
en-US11.0true
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300CE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+
-
+
-
+
-
+
-
+
-
+
<_ProjectFileVersion>11.0.61030.0
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+ bin\$(Platform)\shared\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\shared\obj\$(Platform)\$(Configuration)\false
-
+ bin\$(Platform)\static_mt\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\static_mt\obj\$(Platform)\$(Configuration)\false
-
+ bin\$(Platform)\static_md\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\static_md\obj\$(Platform)\$(Configuration)\false
-
+ Win32
@@ -154,7 +154,7 @@
WindowsCE
-
+ Win32
@@ -184,7 +184,7 @@
WindowsCE
-
+ Win32
@@ -212,7 +212,7 @@
WindowsCE
-
+ Win32
@@ -245,7 +245,7 @@
WindowsCE
-
+ Win32
@@ -273,7 +273,7 @@
WindowsCE
-
+ Win32
diff --git a/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
index abf6c2dca..0b2f56fde 100644
--- a/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
+++ b/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
- {4bacbd0d-6176-4522-938e-ec9ec3e1e248}
+ {3535331d-a727-4c3c-952d-6c605c46e299}
- {1794fb61-41a0-465a-b6a4-15b3d412e261}
+ {8b77cd93-bc3d-4fe2-aa58-3a71019fc652}
- {e375a291-a06e-4911-8075-64341512a825}
+ {59485ed4-205f-477f-a092-4299eb657993}
- {b82b9229-9a8f-4193-a526-6af67519e4c2}
+ {c602ea06-1f70-4b19-bbe7-a11360ee2653}
- {adf3fce1-718e-417e-bdf7-d7f7758dd2a5}
+ {60dab515-4e7f-4bc5-995b-9f9eea556050}
- {781bda7d-7707-4178-9849-48c2a8b210a5}
+ {b9e3336d-4256-460d-a57d-55ebbbab1c0b}
- {b23ca940-b2f9-46dd-bd96-95aca0d8dc12}
+ {a63f2894-4a05-4703-8e95-b951ff5768ea}
- {e7d006ee-bd8b-412e-abb7-7bbbafce076e}
+ {8b1baeea-9332-466e-ba91-008bad096fa9}
diff --git a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj
index 446f363a3..c41c07459 100644
--- a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj
+++ b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj
@@ -33,85 +33,85 @@
Win32Proj
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ bin\
+ obj\$(Configuration)\
+ true
+ bin\
+ obj\$(Configuration)\
+ false
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -141,7 +141,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -173,7 +173,7 @@
MachineX86
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -204,7 +204,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -237,7 +237,7 @@
MachineX86
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -267,7 +267,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
diff --git a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters
index 1b73ebbcf..00b5b5d72 100644
--- a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
- {63b3db95-ecde-4028-a692-2a708d812c5f}
+ {ce70b33b-f445-4e47-8a7c-83c876dcc432}
- {868a0fb3-51a3-45a2-81f9-2253af50121e}
+ {8ac91aeb-69d7-4323-afa2-43d9ba51f98b}
- {9b8ab938-db21-4497-8d38-f8970e01dc7b}
+ {5014fecb-3dfe-43f3-844f-8c19623caa10}
- {fb387daf-61d6-405f-ab9c-b58d2a860aa5}
+ {36ccc698-5871-4558-8b8d-dbc51ff0d144}
- {33e1aa5f-4bcd-4aed-915b-66aa0b38b475}
+ {7095a95b-ccec-4633-b843-5cca0b6c85ea}
- {44ab69ab-7904-4018-ae00-6ae20529de04}
+ {0e1d4cec-f692-4db5-ab98-c7dfb302d067}
- {2babeeec-e0a3-40ae-b270-59e7aba452c1}
+ {baf21283-da1a-4f55-ad6b-fe9ef0035edd}
- {317bb695-d836-4468-bf34-d0bdc528e891}
+ {86fab0fb-c9be-4df4-b7d5-2c4e2204ad72}
diff --git a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj
index c6bd69faa..0ca6eed33 100644
--- a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj
+++ b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj
@@ -33,37 +33,37 @@
Win32Proj
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiByte
@@ -71,53 +71,65 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ <_ProjectFileVersion>11.0.61030.0
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -134,7 +146,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies)
@@ -147,7 +158,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -166,7 +177,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies)
@@ -179,7 +189,7 @@
MachineX86
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -196,7 +206,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -210,7 +219,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -229,7 +238,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -243,7 +251,7 @@
MachineX86
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -260,7 +268,6 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -273,7 +280,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -292,7 +299,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
diff --git a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters
index 09226aae4..a9ced7780 100644
--- a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters
+++ b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
- {0662a8ea-3883-4e35-8ec6-7d870a14b969}
+ {b890c730-f3e5-4a1f-83c5-2e03413e82c9}
- {61ffd2c4-5462-4b8f-8d59-975032b98058}
+ {3886ddee-d477-41e1-972f-e95bc999f6b7}
- {099cbc40-aa50-4fd1-8db7-ab27ffe6cb84}
+ {affe1d18-e2c2-468f-9722-915214bd52a3}
- {5e5f5bf6-7159-4c2f-91a0-ad00c23b8199}
+ {a2787e67-75af-4bb5-877e-1f3d3864f2b2}
- {3a853a0c-9d8c-4ee8-a623-6c5800666808}
+ {ecff4d01-8e5a-4764-87ad-af6fa5cda377}
- {c96364cf-ec64-4448-a6a8-a3fdd2a44909}
+ {13d24074-fbc2-46f7-97b3-e534c26f8b9a}
- {4c007f51-0179-4ed0-a019-b38f7c44dd3b}
+ {c247ab47-a3dc-43c6-8667-23ac597e72a1}
- {b644ff17-c8ee-44f1-a89b-e4344471fae0}
+ {b21aed73-2d7a-4a2f-8be8-8feb17a606be}
diff --git a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj
index 4f857395e..1600502be 100644
--- a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj
+++ b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,84 +32,60 @@
TestSuiteWin32Proj
-
+ Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -117,6 +93,36 @@
TestSuiteTestSuite
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ Disabled
@@ -130,11 +136,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitd.lib;%(AdditionalDependencies)
@@ -162,11 +167,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnit.lib;%(AdditionalDependencies)
@@ -192,17 +196,15 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- CppUnitmtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies)
+ CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin\static_mt\TestSuited.exe..\..\..\lib;%(AdditionalLibraryDirectories)
- nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)truetruebin\static_mt\TestSuited.pdb
@@ -225,17 +227,15 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies)
+ CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin\static_mt\TestSuite.exe..\..\..\lib;%(AdditionalLibraryDirectories)
- nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)falseConsoletrue
@@ -256,11 +256,10 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)
@@ -288,11 +287,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)
@@ -306,14 +304,14 @@
-
-
+
+
-
-
-
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters
index a6bafbc07..b5cea0b33 100644
--- a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters
+++ b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
- {0662a8ea-3883-4e35-8ec6-7d870a14b969}
+ {b1136989-e823-4778-aad5-f2ee47d0424c}
- {61ffd2c4-5462-4b8f-8d59-975032b98058}
+ {8821a6ba-8091-4855-af6b-8a5a9a2962c2}
- {099cbc40-aa50-4fd1-8db7-ab27ffe6cb84}
+ {a860d90f-2b9b-4e2d-bbdc-02d32f3ed75d}
- {5e5f5bf6-7159-4c2f-91a0-ad00c23b8199}
+ {3de1350d-d30c-4394-94b2-f5d600beb3df}
- {3a853a0c-9d8c-4ee8-a623-6c5800666808}
+ {816bae34-a075-4e7b-8e3a-3141024eef50}
- {c96364cf-ec64-4448-a6a8-a3fdd2a44909}
+ {9b4363f8-fd04-43e9-8d64-eb94214b03c3}
- {4c007f51-0179-4ed0-a019-b38f7c44dd3b}
+ {dffc5cb0-7d15-4049-81a2-0bb714de6118}
- {b644ff17-c8ee-44f1-a89b-e4344471fae0}
+ {e1097f3d-3e0e-4fc1-a8a9-797a37553611}
diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj
index f85b7fad3..164fc9e02 100644
--- a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj
+++ b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj
@@ -33,85 +33,85 @@
Win32Proj
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationStaticMultiByte
-
+ ApplicationDynamicMultiByte
-
+ ApplicationDynamicMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ bin64\
+ obj64\$(Configuration)\
+ true
+ bin64\
+ obj64\$(Configuration)\
+ false
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -141,7 +141,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -173,7 +173,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -204,7 +204,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -237,7 +237,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -267,7 +267,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters
index c0f26a91d..55d58173f 100644
--- a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters
+++ b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters
@@ -2,28 +2,28 @@
- {fff903bd-ba4c-4a5d-9488-6cfeab5f713b}
+ {f4d5b02f-8e3f-4cc6-af60-93cf8b7aa7a3}
- {9cdc94ed-fba4-4ae7-a30c-96664254cede}
+ {95772d97-1a80-445d-bc0b-7bfe404d384f}
- {40d2cce8-a1ac-4276-91fd-9fd1c9397ea5}
+ {a0a4f278-4bfb-4c63-ba46-0d589d6b6894}
- {140ee65e-f5c2-45c6-a013-28be2fe111f5}
+ {94ba1fb4-b0aa-4b3a-843a-50cbc1862477}
- {7ae0327a-eb00-4286-b5e9-0390a17513b1}
+ {485e27e2-f5c9-4dfc-9020-493ce6a7b3d5}
- {748d9483-8726-4334-904b-3d1b91cf1d29}
+ {cea6e52c-ee9f-4137-8b69-18dcb399e730}
- {66719422-976f-498a-a87f-f6c4c081fb0e}
+ {fa2ddf82-1654-440a-9305-53d3b040a165}
- {65cfd2c0-8b43-4e77-8d8d-1f83fdc85157}
+ {023a0b6f-34bb-497b-a472-274b7613301e}
diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj
index 9bdd9edf1..7d9dd7354 100644
--- a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj
+++ b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj
@@ -33,37 +33,37 @@
Win32Proj
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationStaticMultiBytev110
-
+ ApplicationDynamicMultiBytev110
-
+ ApplicationDynamicMultiByte
@@ -71,53 +71,65 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- TestSuited
- TestSuited
- TestSuited
- TestSuite
- TestSuite
- TestSuite
+ <_ProjectFileVersion>11.0.61030.0
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
-
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -134,7 +146,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitd.lib;WinTestRunnerd.lib;%(AdditionalDependencies)
@@ -147,7 +158,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -166,7 +177,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnit.lib;WinTestRunner.lib;%(AdditionalDependencies)
@@ -179,7 +189,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -196,7 +206,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -210,7 +219,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -229,7 +238,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -243,7 +251,7 @@
MachineX64
-
+ Disabled..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)
@@ -260,7 +268,6 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
@@ -273,7 +280,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -292,7 +299,6 @@
Level3Default
- %(DisableSpecificWarnings)CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies)
diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters
index e56cef929..17ea609a1 100644
--- a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters
+++ b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters
@@ -2,28 +2,28 @@
- {92265c65-9aab-49eb-893f-8b7525e1482a}
+ {e062d948-8d59-433f-88cc-82d444073d02}
- {9878a3bd-8ef8-4f0b-8d35-4a62f7c0f429}
+ {338cf7a4-f178-4c22-bc3a-f65318d3e422}
- {b4b05e39-fdce-4146-b271-889b219fbe99}
+ {2a24d61c-4a8c-433c-a52a-98f2282e058b}
- {b241bcbf-6cbd-4485-9388-124d89635e93}
+ {e4c7fa93-0d90-4ded-96a1-2bc67401ae2c}
- {68d4069e-b364-4d3f-8256-a9fbdf435a56}
+ {acda1983-abf0-439b-981b-76fe542fce09}
- {d1a62fec-a9cc-4db5-bc76-84e148d54f16}
+ {bb7b52dc-2a97-423c-8d80-3d9ae4aebb3d}
- {639d0d88-6f91-4c81-a34d-28b5f87d11a2}
+ {64656ae3-ef76-47aa-b7ca-d17f02499b5d}
- {bc4741f4-35a3-4a6b-979b-1209bc96dfbd}
+ {153d1452-cde8-43a7-8e5e-ac696f8206e4}
diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj
index b46941382..77cd0c38f 100644
--- a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj
+++ b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,84 +32,60 @@
TestSuiteWin32Proj
-
+ Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120Application
- falseMultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
TestSuitedTestSuitedTestSuited
@@ -117,6 +93,36 @@
TestSuiteTestSuite
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ Disabled
@@ -130,11 +136,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitd.lib;%(AdditionalDependencies)
@@ -162,11 +167,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnit.lib;%(AdditionalDependencies)
@@ -192,17 +196,15 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- CppUnitmtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies)
+ CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin64\static_mt\TestSuited.exe..\..\..\lib64;%(AdditionalLibraryDirectories)
- nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)truetruebin64\static_mt\TestSuited.pdb
@@ -225,17 +227,15 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- CppUnitmt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies)
+ CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)bin64\static_mt\TestSuite.exe..\..\..\lib64;%(AdditionalLibraryDirectories)
- nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)falseConsoletrue
@@ -256,11 +256,10 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)
@@ -288,11 +287,10 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)
@@ -306,14 +304,14 @@
-
-
+
+
-
-
-
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters
index 1c9517b39..866ec5fee 100644
--- a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters
+++ b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters
@@ -2,28 +2,28 @@
- {92265c65-9aab-49eb-893f-8b7525e1482a}
+ {83f8b97e-1d3e-4023-8216-b794986b55a3}
- {9878a3bd-8ef8-4f0b-8d35-4a62f7c0f429}
+ {725dc2e8-e21e-46e9-adcf-162de64d80c2}
- {b4b05e39-fdce-4146-b271-889b219fbe99}
+ {933f3952-83cf-4a14-8d99-0322b50620f0}
- {b241bcbf-6cbd-4485-9388-124d89635e93}
+ {90e17a2f-43a6-40ea-9916-1dbd95ea4426}
- {68d4069e-b364-4d3f-8256-a9fbdf435a56}
+ {4de16d62-690c-4816-aaeb-d8d06159315a}
- {d1a62fec-a9cc-4db5-bc76-84e148d54f16}
+ {10928012-e7cf-48fc-9db4-ad99240748ab}
- {639d0d88-6f91-4c81-a34d-28b5f87d11a2}
+ {28dd6a4e-3b79-4250-ba02-e2eaa025481b}
- {bc4741f4-35a3-4a6b-979b-1209bc96dfbd}
+ {a612699c-39f3-4f64-8663-40263899c040}
@@ -41,7 +41,7 @@
_Suite\Source Files
-
+ _Driver\Source Files
diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj
index bfc7c129c..decd1cf0f 100644
--- a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj
+++ b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj
@@ -33,7 +33,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
@@ -171,7 +171,7 @@
Name="VCCLCompilerTool"
Optimization="4"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -244,7 +244,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
RuntimeLibrary="0"
BufferSecurityCheck="false"
@@ -311,7 +311,7 @@
Name="VCCLCompilerTool"
Optimization="4"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -383,7 +383,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
+ PreprocessorDefinitions="SQLITE_ENABLE_FTS3;WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="false"
diff --git a/Data/SQLite/testsuite/src/Driver.cpp b/Data/SQLite/testsuite/src/Driver.cpp
old mode 100644
new mode 100755
index 4644f01a4..2688cddb2
--- a/Data/SQLite/testsuite/src/Driver.cpp
+++ b/Data/SQLite/testsuite/src/Driver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/testsuite/src/SQLiteTest.cpp b/Data/SQLite/testsuite/src/SQLiteTest.cpp
old mode 100644
new mode 100755
index 498fca1d9..47368f534
--- a/Data/SQLite/testsuite/src/SQLiteTest.cpp
+++ b/Data/SQLite/testsuite/src/SQLiteTest.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -3287,6 +3267,51 @@ void SQLiteTest::testTransactor()
}
+void SQLiteTest::testFTS3()
+{
+#ifdef SQLITE_ENABLE_FTS3
+ Session session(Poco::Data::SQLite::Connector::KEY, "dummy.db");
+ assert(session.isConnected());
+
+ session << "DROP TABLE IF EXISTS docs", now;
+ session << "CREATE VIRTUAL TABLE docs USING fts3()", now;
+
+ session << "INSERT INTO docs(docid, content) VALUES(1, 'a database is a software system')", now;
+ session << "INSERT INTO docs(docid, content) VALUES(2, 'sqlite is a software system')", now;
+ session << "INSERT INTO docs(docid, content) VALUES(3, 'sqlite is a database')", now;
+
+ int docid = 0;
+ session << "SELECT docid FROM docs WHERE docs MATCH 'sqlite AND database'", into(docid), now;
+ assert(docid == 3);
+
+ docid = 0;
+ session << "SELECT docid FROM docs WHERE docs MATCH 'database sqlite'", into(docid), now;
+ assert(docid == 3);
+
+ std::vector docids;
+ session << "SELECT docid FROM docs WHERE docs MATCH 'sqlite OR database' ORDER BY docid",
+ into(docids), now;
+ assert(docids.size() == 3);
+ assert(docids[0] == 1);
+ assert(docids[1] == 2);
+ assert(docids[2] == 3);
+
+ std::string content;
+ docid = 0;
+ session << "SELECT docid, content FROM docs WHERE docs MATCH 'database NOT sqlite'",
+ into(docid), into(content), now;
+ assert(docid == 1);
+ assert(content == "a database is a software system");
+
+ docid = 0;
+ session << "SELECT count(*) FROM docs WHERE docs MATCH 'database and sqlite'", into(docid), now;
+ assert(docid == 0);
+#else
+ std::cout << "SQLite FTS not enabled, test not executed." << std::endl;
+#endif // SQLITE_ENABLE_FTS3
+}
+
+
void SQLiteTest::setUp()
{
}
@@ -3385,6 +3410,7 @@ CppUnit::Test* SQLiteTest::suite()
CppUnit_addTest(pSuite, SQLiteTest, testSessionTransaction);
CppUnit_addTest(pSuite, SQLiteTest, testTransaction);
CppUnit_addTest(pSuite, SQLiteTest, testTransactor);
+ CppUnit_addTest(pSuite, SQLiteTest, testFTS3);
return pSuite;
}
diff --git a/Data/SQLite/testsuite/src/SQLiteTest.h b/Data/SQLite/testsuite/src/SQLiteTest.h
old mode 100644
new mode 100755
index bac29ea2e..8f3045032
--- a/Data/SQLite/testsuite/src/SQLiteTest.h
+++ b/Data/SQLite/testsuite/src/SQLiteTest.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -152,6 +132,8 @@ public:
void testTransaction();
void testTransactor();
+ void testFTS3();
+
void setUp();
void tearDown();
diff --git a/Data/SQLite/testsuite/src/SQLiteTestSuite.cpp b/Data/SQLite/testsuite/src/SQLiteTestSuite.cpp
old mode 100644
new mode 100755
index 081d4dbff..28d9bb56f
--- a/Data/SQLite/testsuite/src/SQLiteTestSuite.cpp
+++ b/Data/SQLite/testsuite/src/SQLiteTestSuite.cpp
@@ -6,27 +6,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/testsuite/src/SQLiteTestSuite.h b/Data/SQLite/testsuite/src/SQLiteTestSuite.h
old mode 100644
new mode 100755
index ca0390548..b52d2b9dd
--- a/Data/SQLite/testsuite/src/SQLiteTestSuite.h
+++ b/Data/SQLite/testsuite/src/SQLiteTestSuite.h
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/testsuite/src/WinCEDriver.cpp b/Data/SQLite/testsuite/src/WinCEDriver.cpp
old mode 100644
new mode 100755
index bb2b64876..9027a28be
--- a/Data/SQLite/testsuite/src/WinCEDriver.cpp
+++ b/Data/SQLite/testsuite/src/WinCEDriver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2004-2010, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/SQLite/testsuite/src/WinDriver.cpp b/Data/SQLite/testsuite/src/WinDriver.cpp
old mode 100644
new mode 100755
index 8f4737264..c79148653
--- a/Data/SQLite/testsuite/src/WinDriver.cpp
+++ b/Data/SQLite/testsuite/src/WinDriver.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/AbstractBinder.h b/Data/include/Poco/Data/AbstractBinder.h
old mode 100644
new mode 100755
index b6387d62f..e622d4951
--- a/Data/include/Poco/Data/AbstractBinder.h
+++ b/Data/include/Poco/Data/AbstractBinder.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/AbstractBinding.h b/Data/include/Poco/Data/AbstractBinding.h
old mode 100644
new mode 100755
index 0a200afd2..318b78ef0
--- a/Data/include/Poco/Data/AbstractBinding.h
+++ b/Data/include/Poco/Data/AbstractBinding.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/AbstractExtraction.h b/Data/include/Poco/Data/AbstractExtraction.h
old mode 100644
new mode 100755
index 8197a6578..adf861e41
--- a/Data/include/Poco/Data/AbstractExtraction.h
+++ b/Data/include/Poco/Data/AbstractExtraction.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/AbstractExtractor.h b/Data/include/Poco/Data/AbstractExtractor.h
old mode 100644
new mode 100755
index d898948ee..915f171c7
--- a/Data/include/Poco/Data/AbstractExtractor.h
+++ b/Data/include/Poco/Data/AbstractExtractor.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/AbstractPreparation.h b/Data/include/Poco/Data/AbstractPreparation.h
old mode 100644
new mode 100755
index 6dcaebdbf..41cabd083
--- a/Data/include/Poco/Data/AbstractPreparation.h
+++ b/Data/include/Poco/Data/AbstractPreparation.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/AbstractPreparator.h b/Data/include/Poco/Data/AbstractPreparator.h
old mode 100644
new mode 100755
index 7a2381454..e47dce279
--- a/Data/include/Poco/Data/AbstractPreparator.h
+++ b/Data/include/Poco/Data/AbstractPreparator.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/AbstractSessionImpl.h b/Data/include/Poco/Data/AbstractSessionImpl.h
old mode 100644
new mode 100755
index 5e68579df..c7b6e26f0
--- a/Data/include/Poco/Data/AbstractSessionImpl.h
+++ b/Data/include/Poco/Data/AbstractSessionImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/ArchiveStrategy.h b/Data/include/Poco/Data/ArchiveStrategy.h
old mode 100644
new mode 100755
index 6cfbc0990..89c9013c6
--- a/Data/include/Poco/Data/ArchiveStrategy.h
+++ b/Data/include/Poco/Data/ArchiveStrategy.h
@@ -12,27 +12,7 @@
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/AutoTransaction.h b/Data/include/Poco/Data/AutoTransaction.h
old mode 100644
new mode 100755
index b3104fc9b..bc4f49687
--- a/Data/include/Poco/Data/AutoTransaction.h
+++ b/Data/include/Poco/Data/AutoTransaction.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Binding.h b/Data/include/Poco/Data/Binding.h
old mode 100644
new mode 100755
index 30ea6109f..70758f98f
--- a/Data/include/Poco/Data/Binding.h
+++ b/Data/include/Poco/Data/Binding.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Bulk.h b/Data/include/Poco/Data/Bulk.h
old mode 100644
new mode 100755
index d331bc59c..92630d146
--- a/Data/include/Poco/Data/Bulk.h
+++ b/Data/include/Poco/Data/Bulk.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/BulkBinding.h b/Data/include/Poco/Data/BulkBinding.h
old mode 100644
new mode 100755
index 82de6eee7..de54d4ba1
--- a/Data/include/Poco/Data/BulkBinding.h
+++ b/Data/include/Poco/Data/BulkBinding.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/BulkExtraction.h b/Data/include/Poco/Data/BulkExtraction.h
old mode 100644
new mode 100755
index 413c6881c..7b329bec5
--- a/Data/include/Poco/Data/BulkExtraction.h
+++ b/Data/include/Poco/Data/BulkExtraction.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Column.h b/Data/include/Poco/Data/Column.h
old mode 100644
new mode 100755
index 0f0a3ff70..fb2a9d80b
--- a/Data/include/Poco/Data/Column.h
+++ b/Data/include/Poco/Data/Column.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Connector.h b/Data/include/Poco/Data/Connector.h
old mode 100644
new mode 100755
index a44ae3feb..58551da5b
--- a/Data/include/Poco/Data/Connector.h
+++ b/Data/include/Poco/Data/Connector.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Constants.h b/Data/include/Poco/Data/Constants.h
old mode 100644
new mode 100755
index 74ead6018..54fb77984
--- a/Data/include/Poco/Data/Constants.h
+++ b/Data/include/Poco/Data/Constants.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Data.h b/Data/include/Poco/Data/Data.h
old mode 100644
new mode 100755
index 5ddf088f8..542c48031
--- a/Data/include/Poco/Data/Data.h
+++ b/Data/include/Poco/Data/Data.h
@@ -14,27 +14,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/DataException.h b/Data/include/Poco/Data/DataException.h
old mode 100644
new mode 100755
index 164a4f632..a8801d94e
--- a/Data/include/Poco/Data/DataException.h
+++ b/Data/include/Poco/Data/DataException.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Date.h b/Data/include/Poco/Data/Date.h
old mode 100644
new mode 100755
index 876c70555..289066848
--- a/Data/include/Poco/Data/Date.h
+++ b/Data/include/Poco/Data/Date.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -99,16 +79,16 @@ public:
Date& operator = (const Poco::Dynamic::Var& var);
/// Assignment operator for Var.
- bool operator == (const Date& date);
+ bool operator == (const Date& date) const;
/// Equality operator.
- bool operator != (const Date& date);
+ bool operator != (const Date& date) const;
/// Inequality operator.
- bool operator < (const Date& date);
+ bool operator < (const Date& date) const;
/// Less then operator.
- bool operator > (const Date& date);
+ bool operator > (const Date& date) const;
/// Greater then operator.
private:
@@ -153,7 +133,7 @@ inline Date& Date::operator = (const DateTime& dt)
}
-inline bool Date::operator == (const Date& date)
+inline bool Date::operator == (const Date& date) const
{
return _year == date.year() &&
_month == date.month() &&
@@ -161,13 +141,13 @@ inline bool Date::operator == (const Date& date)
}
-inline bool Date::operator != (const Date& date)
+inline bool Date::operator != (const Date& date) const
{
return !(*this == date);
}
-inline bool Date::operator > (const Date& date)
+inline bool Date::operator > (const Date& date) const
{
return !(*this == date) && !(*this < date);
}
diff --git a/Data/include/Poco/Data/DynamicDateTime.h b/Data/include/Poco/Data/DynamicDateTime.h
old mode 100644
new mode 100755
index b5291571b..ee006db96
--- a/Data/include/Poco/Data/DynamicDateTime.h
+++ b/Data/include/Poco/Data/DynamicDateTime.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/DynamicLOB.h b/Data/include/Poco/Data/DynamicLOB.h
old mode 100644
new mode 100755
index 85bb2b995..9c748618b
--- a/Data/include/Poco/Data/DynamicLOB.h
+++ b/Data/include/Poco/Data/DynamicLOB.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Extraction.h b/Data/include/Poco/Data/Extraction.h
old mode 100644
new mode 100755
index 476e8d7d4..e929e7da8
--- a/Data/include/Poco/Data/Extraction.h
+++ b/Data/include/Poco/Data/Extraction.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -200,7 +180,8 @@ public:
try
{
return _nulls.at(row);
- }catch (std::out_of_range& ex)
+ }
+ catch (std::out_of_range& ex)
{
throw RangeException(ex.what());
}
@@ -220,6 +201,11 @@ public:
return new Preparation(pPrep, pos, _default);
}
+ void reset()
+ {
+ _nulls.clear();
+ }
+
protected:
const std::vector& result() const
@@ -284,7 +270,8 @@ public:
try
{
return _nulls.at(row);
- }catch (std::out_of_range& ex)
+ }
+ catch (std::out_of_range& ex)
{
throw RangeException(ex.what());
}
@@ -306,6 +293,11 @@ public:
return new Preparation(pPrep, pos, _default);
}
+ void reset()
+ {
+ _nulls.clear();
+ }
+
protected:
const std::vector& result() const
@@ -370,7 +362,8 @@ public:
try
{
return _nulls.at(row);
- }catch (std::out_of_range& ex)
+ }
+ catch (std::out_of_range& ex)
{
throw RangeException(ex.what());
}
@@ -390,6 +383,11 @@ public:
return new Preparation(pPrep, pos, _default);
}
+ void reset()
+ {
+ _nulls.clear();
+ }
+
protected:
const std::list& result() const
@@ -454,7 +452,8 @@ public:
try
{
return _nulls.at(row);
- }catch (std::out_of_range& ex)
+ }
+ catch (std::out_of_range& ex)
{
throw RangeException(ex.what());
}
@@ -474,6 +473,11 @@ public:
return new Preparation(pPrep, pos, _default);
}
+ void reset()
+ {
+ _nulls.clear();
+ }
+
protected:
const std::deque& result() const
@@ -522,6 +526,7 @@ public:
void reset()
{
+ Extraction::reset();
_pColumn->reset();
}
diff --git a/Data/include/Poco/Data/LOB.h b/Data/include/Poco/Data/LOB.h
old mode 100644
new mode 100755
index cbaa98416..8bcb6b8b0
--- a/Data/include/Poco/Data/LOB.h
+++ b/Data/include/Poco/Data/LOB.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/LOBStream.h b/Data/include/Poco/Data/LOBStream.h
old mode 100644
new mode 100755
index 9d7cfd819..826466342
--- a/Data/include/Poco/Data/LOBStream.h
+++ b/Data/include/Poco/Data/LOBStream.h
@@ -12,27 +12,7 @@
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Limit.h b/Data/include/Poco/Data/Limit.h
old mode 100644
new mode 100755
index 8cc394b2f..f3b0451d8
--- a/Data/include/Poco/Data/Limit.h
+++ b/Data/include/Poco/Data/Limit.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/MetaColumn.h b/Data/include/Poco/Data/MetaColumn.h
old mode 100644
new mode 100755
index 02e235416..b9f844c8b
--- a/Data/include/Poco/Data/MetaColumn.h
+++ b/Data/include/Poco/Data/MetaColumn.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/PooledSessionHolder.h b/Data/include/Poco/Data/PooledSessionHolder.h
old mode 100644
new mode 100755
index b88792bca..8bf3e356c
--- a/Data/include/Poco/Data/PooledSessionHolder.h
+++ b/Data/include/Poco/Data/PooledSessionHolder.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/PooledSessionImpl.h b/Data/include/Poco/Data/PooledSessionImpl.h
old mode 100644
new mode 100755
index 6ee85b415..6e9cbd96b
--- a/Data/include/Poco/Data/PooledSessionImpl.h
+++ b/Data/include/Poco/Data/PooledSessionImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Position.h b/Data/include/Poco/Data/Position.h
old mode 100644
new mode 100755
index 898d70ad1..0d0f251eb
--- a/Data/include/Poco/Data/Position.h
+++ b/Data/include/Poco/Data/Position.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Preparation.h b/Data/include/Poco/Data/Preparation.h
old mode 100644
new mode 100755
index 004e3e8c7..53564ff31
--- a/Data/include/Poco/Data/Preparation.h
+++ b/Data/include/Poco/Data/Preparation.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Range.h b/Data/include/Poco/Data/Range.h
old mode 100644
new mode 100755
index bb746b8cb..bb91c4203
--- a/Data/include/Poco/Data/Range.h
+++ b/Data/include/Poco/Data/Range.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/RecordSet.h b/Data/include/Poco/Data/RecordSet.h
old mode 100644
new mode 100755
index 30db9ebb4..48fe0c14d
--- a/Data/include/Poco/Data/RecordSet.h
+++ b/Data/include/Poco/Data/RecordSet.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Row.h b/Data/include/Poco/Data/Row.h
old mode 100644
new mode 100755
index ef41ed13c..ba3351226
--- a/Data/include/Poco/Data/Row.h
+++ b/Data/include/Poco/Data/Row.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/RowFilter.h b/Data/include/Poco/Data/RowFilter.h
old mode 100644
new mode 100755
index 0b997889b..6ce35c55d
--- a/Data/include/Poco/Data/RowFilter.h
+++ b/Data/include/Poco/Data/RowFilter.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/RowFormatter.h b/Data/include/Poco/Data/RowFormatter.h
old mode 100644
new mode 100755
index 579e38b47..90e144aba
--- a/Data/include/Poco/Data/RowFormatter.h
+++ b/Data/include/Poco/Data/RowFormatter.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/RowIterator.h b/Data/include/Poco/Data/RowIterator.h
old mode 100644
new mode 100755
index 8ba0998d0..e91118ca3
--- a/Data/include/Poco/Data/RowIterator.h
+++ b/Data/include/Poco/Data/RowIterator.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/SQLChannel.h b/Data/include/Poco/Data/SQLChannel.h
old mode 100644
new mode 100755
index 46402e607..8b66c5ca4
--- a/Data/include/Poco/Data/SQLChannel.h
+++ b/Data/include/Poco/Data/SQLChannel.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Session.h b/Data/include/Poco/Data/Session.h
old mode 100644
new mode 100755
index 5811ff1ae..c93bb1a96
--- a/Data/include/Poco/Data/Session.h
+++ b/Data/include/Poco/Data/Session.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/SessionFactory.h b/Data/include/Poco/Data/SessionFactory.h
old mode 100644
new mode 100755
index 7865d679a..1580d33c0
--- a/Data/include/Poco/Data/SessionFactory.h
+++ b/Data/include/Poco/Data/SessionFactory.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/SessionImpl.h b/Data/include/Poco/Data/SessionImpl.h
old mode 100644
new mode 100755
index abc21ea98..2e71291d8
--- a/Data/include/Poco/Data/SessionImpl.h
+++ b/Data/include/Poco/Data/SessionImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/SessionPool.h b/Data/include/Poco/Data/SessionPool.h
old mode 100644
new mode 100755
index 1edc58608..0c4f19ca0
--- a/Data/include/Poco/Data/SessionPool.h
+++ b/Data/include/Poco/Data/SessionPool.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/SessionPoolContainer.h b/Data/include/Poco/Data/SessionPoolContainer.h
old mode 100644
new mode 100755
index 20f65eae1..b1e4c8ee3
--- a/Data/include/Poco/Data/SessionPoolContainer.h
+++ b/Data/include/Poco/Data/SessionPoolContainer.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/SimpleRowFormatter.h b/Data/include/Poco/Data/SimpleRowFormatter.h
old mode 100644
new mode 100755
index e8c67fc34..c9a26da71
--- a/Data/include/Poco/Data/SimpleRowFormatter.h
+++ b/Data/include/Poco/Data/SimpleRowFormatter.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Statement.h b/Data/include/Poco/Data/Statement.h
old mode 100644
new mode 100755
index fa5ec0365..acbf89a10
--- a/Data/include/Poco/Data/Statement.h
+++ b/Data/include/Poco/Data/Statement.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/StatementCreator.h b/Data/include/Poco/Data/StatementCreator.h
old mode 100644
new mode 100755
index e440f8481..76421136c
--- a/Data/include/Poco/Data/StatementCreator.h
+++ b/Data/include/Poco/Data/StatementCreator.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/StatementImpl.h b/Data/include/Poco/Data/StatementImpl.h
old mode 100644
new mode 100755
index 0a1ae4f22..04f2df568
--- a/Data/include/Poco/Data/StatementImpl.h
+++ b/Data/include/Poco/Data/StatementImpl.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/Time.h b/Data/include/Poco/Data/Time.h
old mode 100644
new mode 100755
index 758e7cf94..f62ef9537
--- a/Data/include/Poco/Data/Time.h
+++ b/Data/include/Poco/Data/Time.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
@@ -99,16 +79,16 @@ public:
Time& operator = (const Poco::Dynamic::Var& var);
/// Assignment operator for Var.
- bool operator == (const Time& time);
+ bool operator == (const Time& time) const;
/// Equality operator.
- bool operator != (const Time& time);
+ bool operator != (const Time& time) const;
/// Inequality operator.
- bool operator < (const Time& time);
+ bool operator < (const Time& time) const;
/// Less then operator.
- bool operator > (const Time& time);
+ bool operator > (const Time& time) const;
/// Greater then operator.
private:
@@ -153,7 +133,7 @@ inline Time& Time::operator = (const DateTime& dt)
}
-inline bool Time::operator == (const Time& time)
+inline bool Time::operator == (const Time& time) const
{
return _hour == time.hour() &&
_minute == time.minute() &&
@@ -161,13 +141,13 @@ inline bool Time::operator == (const Time& time)
}
-inline bool Time::operator != (const Time& time)
+inline bool Time::operator != (const Time& time) const
{
return !(*this == time);
}
-inline bool Time::operator > (const Time& time)
+inline bool Time::operator > (const Time& time) const
{
return !(*this == time) && !(*this < time);
}
diff --git a/Data/include/Poco/Data/Transaction.h b/Data/include/Poco/Data/Transaction.h
old mode 100644
new mode 100755
index 784f59e85..c00e18332
--- a/Data/include/Poco/Data/Transaction.h
+++ b/Data/include/Poco/Data/Transaction.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/include/Poco/Data/TypeHandler.h b/Data/include/Poco/Data/TypeHandler.h
old mode 100644
new mode 100755
index 8bca1bdef..bd3c5d510
--- a/Data/include/Poco/Data/TypeHandler.h
+++ b/Data/include/Poco/Data/TypeHandler.h
@@ -12,27 +12,7 @@
// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
//
diff --git a/Data/samples/Binding/Binding_WEC2013_vs110.vcxproj b/Data/samples/Binding/Binding_WEC2013_vs110.vcxproj
index deccf50f6..7ea64d53e 100644
--- a/Data/samples/Binding/Binding_WEC2013_vs110.vcxproj
+++ b/Data/samples/Binding/Binding_WEC2013_vs110.vcxproj
@@ -1,29 +1,29 @@
-
+ debug_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
@@ -32,101 +32,101 @@
en-US11.0true
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300CE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+
-
+
-
+
-
+
-
+
-
+
<_ProjectFileVersion>11.0.61030.0
- Bindingd
- Bindingd
- Bindingd
- Binding
- Binding
- Binding
+ Bindingd
+ Bindingd
+ Bindingd
+ Binding
+ Binding
+ Binding
-
+ bin\$(Platform)\shared\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\shared\obj\$(Platform)\$(Configuration)\false
-
+ bin\$(Platform)\static_mt\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\static_mt\obj\$(Platform)\$(Configuration)\false
-
+ bin\$(Platform)\static_md\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\static_md\obj\$(Platform)\$(Configuration)\false
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -151,7 +151,7 @@
WindowsCE
-
+ Disabledtrue
@@ -178,7 +178,7 @@
WindowsCE
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -203,7 +203,7 @@
WindowsCE
-
+ DisabledDefault
@@ -233,7 +233,7 @@
WindowsCE
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -258,7 +258,7 @@
WindowsCE
-
+ DisabledDefault
diff --git a/Data/samples/Binding/Binding_WEC2013_vs110.vcxproj.filters b/Data/samples/Binding/Binding_WEC2013_vs110.vcxproj.filters
index b0eef092b..001ce1a6e 100644
--- a/Data/samples/Binding/Binding_WEC2013_vs110.vcxproj.filters
+++ b/Data/samples/Binding/Binding_WEC2013_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {843a96f5-b0e1-4579-800a-5e954112f6d6}
+ {0251586b-64d9-46c8-ae5c-727d4ca4b72e}
- {37c121a7-6f12-4505-bf8f-fb71a2bf374a}
+ {418f66ba-adc3-4195-b10f-fd48429f1f55}
diff --git a/Data/samples/Binding/Binding_vs100.vcxproj b/Data/samples/Binding/Binding_vs100.vcxproj
index 0bbec249f..2a9097fa5 100644
--- a/Data/samples/Binding/Binding_vs100.vcxproj
+++ b/Data/samples/Binding/Binding_vs100.vcxproj
@@ -33,79 +33,79 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- Bindingd
- Bindingd
- Bindingd
- Binding
- Binding
- Binding
+ bin\
+ obj\$(Configuration)\
+ true
+ bin\
+ obj\$(Configuration)\
+ false
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ Bindingd
+ Bindingd
+ Bindingd
+ Binding
+ Binding
+ Binding
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -125,7 +125,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\Bindingd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -135,7 +135,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -157,7 +157,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\Binding.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -167,7 +167,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -187,7 +187,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\Bindingd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -197,7 +197,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -219,7 +219,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\Binding.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -229,7 +229,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -249,7 +249,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\Bindingd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -259,7 +259,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -281,7 +281,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\Binding.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/Binding/Binding_vs100.vcxproj.filters b/Data/samples/Binding/Binding_vs100.vcxproj.filters
index 1455b5281..5e7877326 100644
--- a/Data/samples/Binding/Binding_vs100.vcxproj.filters
+++ b/Data/samples/Binding/Binding_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
- {59b3834a-33cc-445d-bc2c-207a05a34cf8}
+ {f2bd424a-15f3-4e67-8064-fe933e0756b5}
- {85b3efc1-1bc0-45c2-9ed1-97cf9ccdb7a3}
+ {0331bf57-3031-4ccb-994a-6583c3c894b8}
diff --git a/Data/samples/Binding/Binding_vs110.vcxproj b/Data/samples/Binding/Binding_vs110.vcxproj
index cacd4d1a7..b047e6995 100644
--- a/Data/samples/Binding/Binding_vs110.vcxproj
+++ b/Data/samples/Binding/Binding_vs110.vcxproj
@@ -33,85 +33,97 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- Bindingd
- Bindingd
- Bindingd
- Binding
- Binding
- Binding
+ <_ProjectFileVersion>11.0.61030.0
+ Bindingd
+ Bindingd
+ Bindingd
+ Binding
+ Binding
+ Binding
-
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -128,10 +140,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\Bindingd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -141,7 +152,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -160,10 +171,9 @@
Level3Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\Binding.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -173,7 +183,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -190,10 +200,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\Bindingd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -203,7 +212,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -222,10 +231,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\Binding.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -235,7 +243,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -252,10 +260,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\Bindingd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -265,7 +272,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -284,10 +291,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\Binding.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/Binding/Binding_vs110.vcxproj.filters b/Data/samples/Binding/Binding_vs110.vcxproj.filters
index 379ee3004..7b6acb612 100644
--- a/Data/samples/Binding/Binding_vs110.vcxproj.filters
+++ b/Data/samples/Binding/Binding_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {271a256f-87f8-4f4c-a95b-2d9fb1b21db2}
+ {281d099c-f640-4541-aef8-04a6f05369d3}
- {52deecb9-bcbf-47b1-b991-beab0a91d75a}
+ {a570943e-8689-4b05-af88-daab51c05533}
diff --git a/Data/samples/Binding/Binding_vs120.vcxproj b/Data/samples/Binding/Binding_vs120.vcxproj
index 413c31e20..dc83f2cd0 100644
--- a/Data/samples/Binding/Binding_vs120.vcxproj
+++ b/Data/samples/Binding/Binding_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
BindingWin32Proj
-
+ ApplicationMultiByte
@@ -63,47 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
BindingdBindingdBindingd
@@ -111,6 +93,36 @@
BindingBinding
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ Disabled
@@ -124,14 +136,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\Bindingd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -156,14 +167,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\Binding.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -186,14 +196,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\Bindingd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -218,14 +227,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\Binding.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -248,14 +256,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\Bindingd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -280,14 +287,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\Binding.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -298,8 +304,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/samples/Binding/Binding_vs120.vcxproj.filters b/Data/samples/Binding/Binding_vs120.vcxproj.filters
index 379ee3004..58d6d7b12 100644
--- a/Data/samples/Binding/Binding_vs120.vcxproj.filters
+++ b/Data/samples/Binding/Binding_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
- {271a256f-87f8-4f4c-a95b-2d9fb1b21db2}
+ {764a2ab5-6299-4dfa-bda3-fa76ef954bc0}
- {52deecb9-bcbf-47b1-b991-beab0a91d75a}
+ {7bb8ff52-29c5-40f3-af67-eec719802e98}
diff --git a/Data/samples/Binding/Binding_x64_vs100.vcxproj b/Data/samples/Binding/Binding_x64_vs100.vcxproj
index 91341ea0d..a7b21e6f5 100644
--- a/Data/samples/Binding/Binding_x64_vs100.vcxproj
+++ b/Data/samples/Binding/Binding_x64_vs100.vcxproj
@@ -33,79 +33,79 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- Bindingd
- Bindingd
- Bindingd
- Binding
- Binding
- Binding
+ bin64\
+ obj64\$(Configuration)\
+ true
+ bin64\
+ obj64\$(Configuration)\
+ false
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ Bindingd
+ Bindingd
+ Bindingd
+ Binding
+ Binding
+ Binding
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -125,7 +125,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\Bindingd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -135,7 +135,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -157,7 +157,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\Binding.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -167,7 +167,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -187,7 +187,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\Bindingd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -197,7 +197,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -219,7 +219,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\Binding.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -229,7 +229,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -249,7 +249,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\Bindingd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -259,7 +259,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -281,7 +281,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\Binding.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/Binding/Binding_x64_vs100.vcxproj.filters b/Data/samples/Binding/Binding_x64_vs100.vcxproj.filters
index 1e936390e..c4ab561b8 100644
--- a/Data/samples/Binding/Binding_x64_vs100.vcxproj.filters
+++ b/Data/samples/Binding/Binding_x64_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
- {e632f5f6-92dc-4bd4-a2c0-792e900a14e3}
+ {0e83e2ee-0252-49ca-9fa2-4eb44cb8d5cf}
- {6eda1939-2478-4c10-9ae7-a65a16b74db5}
+ {93fe9333-e447-4e4f-8b75-af5b07b33101}
diff --git a/Data/samples/Binding/Binding_x64_vs110.vcxproj b/Data/samples/Binding/Binding_x64_vs110.vcxproj
index 401abac40..3ffc1c204 100644
--- a/Data/samples/Binding/Binding_x64_vs110.vcxproj
+++ b/Data/samples/Binding/Binding_x64_vs110.vcxproj
@@ -33,85 +33,97 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- Bindingd
- Bindingd
- Bindingd
- Binding
- Binding
- Binding
+ <_ProjectFileVersion>11.0.61030.0
+ Bindingd
+ Bindingd
+ Bindingd
+ Binding
+ Binding
+ Binding
-
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -128,10 +140,9 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\Bindingd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -141,7 +152,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -160,10 +171,9 @@
Level3Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\Binding.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -173,7 +183,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -190,10 +200,9 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\Bindingd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -203,7 +212,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -222,10 +231,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\Binding.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -235,7 +243,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -252,10 +260,9 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\Bindingd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -265,7 +272,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -284,10 +291,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\Binding.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/Binding/Binding_x64_vs110.vcxproj.filters b/Data/samples/Binding/Binding_x64_vs110.vcxproj.filters
index cb3296356..3c0b41e33 100644
--- a/Data/samples/Binding/Binding_x64_vs110.vcxproj.filters
+++ b/Data/samples/Binding/Binding_x64_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {7a2bddf7-0f40-4466-9bea-5a7d428406a4}
+ {b4f3fe67-6203-4a89-a3fb-4dba6599b343}
- {74e010a0-6275-41f8-aeaa-21cec3ec3a64}
+ {c9544301-1fdf-47d3-bfc1-68238a66523e}
diff --git a/Data/samples/Binding/Binding_x64_vs120.vcxproj b/Data/samples/Binding/Binding_x64_vs120.vcxproj
index ed9acd591..ab71b2f41 100644
--- a/Data/samples/Binding/Binding_x64_vs120.vcxproj
+++ b/Data/samples/Binding/Binding_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
BindingWin32Proj
-
+ ApplicationMultiByte
@@ -63,47 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
BindingdBindingdBindingd
@@ -111,6 +93,36 @@
BindingBinding
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ Disabled
@@ -124,14 +136,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\Bindingd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -156,14 +167,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\Binding.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -186,14 +196,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\Bindingd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -218,14 +227,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\Binding.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -248,14 +256,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\Bindingd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -280,14 +287,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\Binding.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -298,8 +304,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/samples/Binding/Binding_x64_vs120.vcxproj.filters b/Data/samples/Binding/Binding_x64_vs120.vcxproj.filters
index cb3296356..fbf454b0d 100644
--- a/Data/samples/Binding/Binding_x64_vs120.vcxproj.filters
+++ b/Data/samples/Binding/Binding_x64_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
- {7a2bddf7-0f40-4466-9bea-5a7d428406a4}
+ {ff6b76a6-2c02-46ab-b4d2-40555b0b7f0b}
- {74e010a0-6275-41f8-aeaa-21cec3ec3a64}
+ {f1d66615-c3af-467d-b3aa-daad84df9d46}
diff --git a/Data/samples/Binding/src/Binding.cpp b/Data/samples/Binding/src/Binding.cpp
old mode 100644
new mode 100755
index 07964acd8..d4929af93
--- a/Data/samples/Binding/src/Binding.cpp
+++ b/Data/samples/Binding/src/Binding.cpp
@@ -8,27 +8,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
#include "Poco/Data/Session.h"
diff --git a/Data/samples/RecordSet/RecordSet_WEC2013_vs110.vcxproj b/Data/samples/RecordSet/RecordSet_WEC2013_vs110.vcxproj
index b12a3649f..da9b410c3 100644
--- a/Data/samples/RecordSet/RecordSet_WEC2013_vs110.vcxproj
+++ b/Data/samples/RecordSet/RecordSet_WEC2013_vs110.vcxproj
@@ -1,29 +1,29 @@
-
+ debug_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
@@ -32,101 +32,101 @@
en-US11.0true
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300CE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+
-
+
-
+
-
+
-
+
-
+
<_ProjectFileVersion>11.0.61030.0
- RecordSetd
- RecordSetd
- RecordSetd
- RecordSet
- RecordSet
- RecordSet
+ RecordSetd
+ RecordSetd
+ RecordSetd
+ RecordSet
+ RecordSet
+ RecordSet
-
+ bin\$(Platform)\shared\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\shared\obj\$(Platform)\$(Configuration)\false
-
+ bin\$(Platform)\static_mt\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\static_mt\obj\$(Platform)\$(Configuration)\false
-
+ bin\$(Platform)\static_md\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\static_md\obj\$(Platform)\$(Configuration)\false
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -151,7 +151,7 @@
WindowsCE
-
+ Disabledtrue
@@ -178,7 +178,7 @@
WindowsCE
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -203,7 +203,7 @@
WindowsCE
-
+ DisabledDefault
@@ -233,7 +233,7 @@
WindowsCE
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -258,7 +258,7 @@
WindowsCE
-
+ DisabledDefault
diff --git a/Data/samples/RecordSet/RecordSet_WEC2013_vs110.vcxproj.filters b/Data/samples/RecordSet/RecordSet_WEC2013_vs110.vcxproj.filters
index 969dbc7b6..d378db5da 100644
--- a/Data/samples/RecordSet/RecordSet_WEC2013_vs110.vcxproj.filters
+++ b/Data/samples/RecordSet/RecordSet_WEC2013_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {72e29cbc-ff00-4b39-934f-488850a5238b}
+ {95e9ed46-9bec-4415-a112-bce96dca6eff}
- {ac9484a6-ff7e-4150-8123-9ee7e2d44e9e}
+ {ecbf664a-e330-4b3c-b15b-9ac64bc532b5}
diff --git a/Data/samples/RecordSet/RecordSet_vs100.vcxproj b/Data/samples/RecordSet/RecordSet_vs100.vcxproj
index 234912723..2fcd686b0 100644
--- a/Data/samples/RecordSet/RecordSet_vs100.vcxproj
+++ b/Data/samples/RecordSet/RecordSet_vs100.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -32,7 +32,7 @@
RecordSetWin32Proj
-
+ ApplicationMultiByte
@@ -57,27 +57,27 @@
ApplicationMultiByte
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
<_ProjectFileVersion>10.0.40219.1
bin\
@@ -109,7 +109,7 @@
Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_DLL;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)truetrueEnableFastChecks
@@ -118,14 +118,14 @@
truetruetrue
-
+ Level3EditAndContinueDefault%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RecordSetd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -150,14 +150,14 @@
truetruetrue
-
+ Level3
-
+ Default%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RecordSet.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -180,14 +180,14 @@
truetruetrue
-
+ Level3EditAndContinueDefault%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RecordSetd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -212,14 +212,14 @@
truetruetrue
-
+ Level3
-
+ Default%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RecordSet.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -242,14 +242,14 @@
truetruetrue
-
+ Level3EditAndContinueDefault%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RecordSetd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -274,14 +274,14 @@
truetruetrue
-
+ Level3
-
+ Default%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RecordSet.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -292,8 +292,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/samples/RecordSet/RecordSet_vs100.vcxproj.filters b/Data/samples/RecordSet/RecordSet_vs100.vcxproj.filters
index a982dae41..8c9da6eef 100644
--- a/Data/samples/RecordSet/RecordSet_vs100.vcxproj.filters
+++ b/Data/samples/RecordSet/RecordSet_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
- {13f6cfa3-be64-41c3-aa7c-3713138706d0}
+ {11604c8c-3173-4fe4-8a40-8ff7393f4070}
- {2728742f-3940-4f07-ab48-09242ed77157}
+ {c354e337-fa23-42f4-8d82-c9a8cd751598}
diff --git a/Data/samples/RecordSet/RecordSet_vs110.vcxproj b/Data/samples/RecordSet/RecordSet_vs110.vcxproj
index 8936925a8..2d36f0026 100644
--- a/Data/samples/RecordSet/RecordSet_vs110.vcxproj
+++ b/Data/samples/RecordSet/RecordSet_vs110.vcxproj
@@ -33,85 +33,97 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- RecordSetd
- RecordSetd
- RecordSetd
- RecordSet
- RecordSet
- RecordSet
+ <_ProjectFileVersion>11.0.61030.0
+ RecordSetd
+ RecordSetd
+ RecordSetd
+ RecordSet
+ RecordSet
+ RecordSet
-
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -128,10 +140,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RecordSetd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -141,7 +152,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -160,10 +171,9 @@
Level3Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RecordSet.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -173,7 +183,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -190,10 +200,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RecordSetd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -203,7 +212,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -222,10 +231,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RecordSet.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -235,7 +243,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -252,10 +260,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RecordSetd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -265,7 +272,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -284,10 +291,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RecordSet.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/RecordSet/RecordSet_vs110.vcxproj.filters b/Data/samples/RecordSet/RecordSet_vs110.vcxproj.filters
index 40255c3c2..270b019fc 100644
--- a/Data/samples/RecordSet/RecordSet_vs110.vcxproj.filters
+++ b/Data/samples/RecordSet/RecordSet_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {e45c2332-bc5d-42ca-9026-388657786459}
+ {8b7036bb-43f2-4244-a01c-9db23b82f22c}
- {af8dd17b-0b74-47de-b36d-fdec40d1d90d}
+ {2121c00d-5ee0-4595-a305-6e199868381f}
diff --git a/Data/samples/RecordSet/RecordSet_vs120.vcxproj b/Data/samples/RecordSet/RecordSet_vs120.vcxproj
index d9633fec3..c7b44c99f 100644
--- a/Data/samples/RecordSet/RecordSet_vs120.vcxproj
+++ b/Data/samples/RecordSet/RecordSet_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
RecordSetWin32Proj
-
+ ApplicationMultiByte
@@ -63,47 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
RecordSetdRecordSetdRecordSetd
@@ -111,6 +93,36 @@
RecordSetRecordSet
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ Disabled
@@ -124,14 +136,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RecordSetd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -156,14 +167,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RecordSet.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -186,14 +196,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RecordSetd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -218,14 +227,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RecordSet.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -248,14 +256,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RecordSetd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -280,14 +287,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RecordSet.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -298,8 +304,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/samples/RecordSet/RecordSet_vs120.vcxproj.filters b/Data/samples/RecordSet/RecordSet_vs120.vcxproj.filters
index 40255c3c2..7faeb141e 100644
--- a/Data/samples/RecordSet/RecordSet_vs120.vcxproj.filters
+++ b/Data/samples/RecordSet/RecordSet_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
- {e45c2332-bc5d-42ca-9026-388657786459}
+ {6237e1f1-277f-499a-8d1b-1e6b899132ff}
- {af8dd17b-0b74-47de-b36d-fdec40d1d90d}
+ {c84f6093-11d7-4d38-b121-a0378abeff1d}
diff --git a/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj b/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj
index 13e0c7ae0..87c246796 100644
--- a/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj
+++ b/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj
@@ -33,79 +33,79 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- RecordSetd
- RecordSetd
- RecordSetd
- RecordSet
- RecordSet
- RecordSet
+ bin64\
+ obj64\$(Configuration)\
+ true
+ bin64\
+ obj64\$(Configuration)\
+ false
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ RecordSetd
+ RecordSetd
+ RecordSetd
+ RecordSet
+ RecordSet
+ RecordSet
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -125,7 +125,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RecordSetd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -135,7 +135,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -157,7 +157,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RecordSet.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -167,7 +167,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -187,7 +187,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RecordSetd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -197,7 +197,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -219,7 +219,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RecordSet.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -229,7 +229,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -249,7 +249,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RecordSetd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -259,7 +259,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -281,7 +281,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RecordSet.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj.filters b/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj.filters
index 6d7db4a52..d1335270b 100644
--- a/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj.filters
+++ b/Data/samples/RecordSet/RecordSet_x64_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
- {5a0c1ff6-b3db-48bd-b7f4-6540528bb8e7}
+ {ec60424b-4795-4cb4-9a22-78cb92c93f6d}
- {4e881fb2-92f2-4c76-bf17-ef191bfbdc32}
+ {3cd2a9bf-8879-481f-a137-0166dc1a2ecb}
diff --git a/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj b/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj
index d4d59183e..f3b03a55b 100644
--- a/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj
+++ b/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj
@@ -33,85 +33,97 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- RecordSetd
- RecordSetd
- RecordSetd
- RecordSet
- RecordSet
- RecordSet
+ <_ProjectFileVersion>11.0.61030.0
+ RecordSetd
+ RecordSetd
+ RecordSetd
+ RecordSet
+ RecordSet
+ RecordSet
-
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -128,10 +140,9 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RecordSetd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -141,7 +152,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -160,10 +171,9 @@
Level3Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RecordSet.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -173,7 +183,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -190,10 +200,9 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RecordSetd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -203,7 +212,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -222,10 +231,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RecordSet.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -235,7 +243,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -252,10 +260,9 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RecordSetd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -265,7 +272,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -284,10 +291,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RecordSet.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.filters b/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.filters
index 1ec1da21e..01f426bfd 100644
--- a/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.filters
+++ b/Data/samples/RecordSet/RecordSet_x64_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {25e43f11-2fc6-438b-ad55-210ab53dc2f2}
+ {e21da48c-edf1-4bcc-94e5-9711a8d56fbb}
- {2d4bd2eb-7cf8-41fb-a1f4-dfa4e2ce3baa}
+ {ba78aaa9-d0f2-4dab-9bc3-ab75b897a022}
diff --git a/Data/samples/RecordSet/RecordSet_x64_vs120.vcxproj b/Data/samples/RecordSet/RecordSet_x64_vs120.vcxproj
index a67c1bf31..b722e41af 100644
--- a/Data/samples/RecordSet/RecordSet_x64_vs120.vcxproj
+++ b/Data/samples/RecordSet/RecordSet_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
RecordSetWin32Proj
-
+ ApplicationMultiByte
@@ -63,47 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
RecordSetdRecordSetdRecordSetd
@@ -111,6 +93,36 @@
RecordSetRecordSet
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ Disabled
@@ -124,14 +136,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RecordSetd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -156,14 +167,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RecordSet.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -186,14 +196,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RecordSetd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -218,14 +227,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RecordSet.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -248,14 +256,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RecordSetd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -280,14 +287,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RecordSet.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -298,8 +304,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/samples/RecordSet/RecordSet_x64_vs120.vcxproj.filters b/Data/samples/RecordSet/RecordSet_x64_vs120.vcxproj.filters
index 1ec1da21e..b319a8c84 100644
--- a/Data/samples/RecordSet/RecordSet_x64_vs120.vcxproj.filters
+++ b/Data/samples/RecordSet/RecordSet_x64_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
- {25e43f11-2fc6-438b-ad55-210ab53dc2f2}
+ {48855408-4d6e-4942-a492-8a9f3abca64f}
- {2d4bd2eb-7cf8-41fb-a1f4-dfa4e2ce3baa}
+ {c34e753b-bd67-495e-8d9a-37b6a674bb37}
diff --git a/Data/samples/RecordSet/src/RecordSet.cpp b/Data/samples/RecordSet/src/RecordSet.cpp
old mode 100644
new mode 100755
index bec933b92..0502f9e3f
--- a/Data/samples/RecordSet/src/RecordSet.cpp
+++ b/Data/samples/RecordSet/src/RecordSet.cpp
@@ -8,27 +8,7 @@
/// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
#include "Poco/SharedPtr.h"
diff --git a/Data/samples/RowFormatter/RowFormatter_WEC2013_vs110.vcxproj b/Data/samples/RowFormatter/RowFormatter_WEC2013_vs110.vcxproj
index 36c87e08e..39ee80476 100644
--- a/Data/samples/RowFormatter/RowFormatter_WEC2013_vs110.vcxproj
+++ b/Data/samples/RowFormatter/RowFormatter_WEC2013_vs110.vcxproj
@@ -1,29 +1,29 @@
-
+ debug_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
@@ -32,101 +32,101 @@
en-US11.0true
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300CE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+
-
+
-
+
-
+
-
+
-
+
<_ProjectFileVersion>11.0.61030.0
- RowFormatterd
- RowFormatterd
- RowFormatterd
- RowFormatter
- RowFormatter
- RowFormatter
+ RowFormatterd
+ RowFormatterd
+ RowFormatterd
+ RowFormatter
+ RowFormatter
+ RowFormatter
-
+ bin\$(Platform)\shared\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\shared\obj\$(Platform)\$(Configuration)\false
-
+ bin\$(Platform)\static_mt\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\static_mt\obj\$(Platform)\$(Configuration)\false
-
+ bin\$(Platform)\static_md\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\static_md\obj\$(Platform)\$(Configuration)\false
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -151,7 +151,7 @@
WindowsCE
-
+ Disabledtrue
@@ -178,7 +178,7 @@
WindowsCE
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -203,7 +203,7 @@
WindowsCE
-
+ DisabledDefault
@@ -233,7 +233,7 @@
WindowsCE
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -258,7 +258,7 @@
WindowsCE
-
+ DisabledDefault
diff --git a/Data/samples/RowFormatter/RowFormatter_WEC2013_vs110.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_WEC2013_vs110.vcxproj.filters
index 769e9d560..c1fe33ec3 100644
--- a/Data/samples/RowFormatter/RowFormatter_WEC2013_vs110.vcxproj.filters
+++ b/Data/samples/RowFormatter/RowFormatter_WEC2013_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {65267fc0-6537-4299-af49-02af0c1024b2}
+ {fe4e6ed2-fc33-4bf6-9995-be35a97c17a8}
- {98ebbded-52d6-413c-87a7-c199013236ed}
+ {f82d241a-cb72-4ac6-a490-c32516cc916a}
diff --git a/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj b/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj
index 8d3a9d341..7c9eb4eef 100644
--- a/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj
+++ b/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj
@@ -33,79 +33,79 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- RowFormatterd
- RowFormatterd
- RowFormatterd
- RowFormatter
- RowFormatter
- RowFormatter
+ bin\
+ obj\$(Configuration)\
+ true
+ bin\
+ obj\$(Configuration)\
+ false
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ RowFormatterd
+ RowFormatterd
+ RowFormatterd
+ RowFormatter
+ RowFormatter
+ RowFormatter
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -125,7 +125,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RowFormatterd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -135,7 +135,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -157,7 +157,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RowFormatter.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -167,7 +167,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -187,7 +187,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RowFormatterd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -197,7 +197,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -219,7 +219,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RowFormatter.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -229,7 +229,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -249,7 +249,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RowFormatterd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -259,7 +259,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -281,7 +281,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RowFormatter.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj.filters
index e5ee3a991..18c4cc1a3 100644
--- a/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj.filters
+++ b/Data/samples/RowFormatter/RowFormatter_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
- {510d304f-3103-452b-a37a-6645fc85ea64}
+ {09a91a3c-9c1b-45a8-b913-20ba98c572de}
- {bd78f743-f2e4-49fe-affb-edef598cbf23}
+ {2ff6a3ea-eee3-41e6-9127-c76dfb7a45ec}
diff --git a/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj b/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj
index 67d1e0d34..6834d090c 100644
--- a/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj
+++ b/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj
@@ -33,85 +33,97 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- RowFormatterd
- RowFormatterd
- RowFormatterd
- RowFormatter
- RowFormatter
- RowFormatter
+ <_ProjectFileVersion>11.0.61030.0
+ RowFormatterd
+ RowFormatterd
+ RowFormatterd
+ RowFormatter
+ RowFormatter
+ RowFormatter
-
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -128,10 +140,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RowFormatterd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -141,7 +152,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -160,10 +171,9 @@
Level3Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RowFormatter.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -173,7 +183,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -190,10 +200,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RowFormatterd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -203,7 +212,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -222,10 +231,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RowFormatter.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -235,7 +243,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -252,10 +260,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RowFormatterd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -265,7 +272,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -284,10 +291,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RowFormatter.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.filters
index 98c1f4b2c..ff52d9f7b 100644
--- a/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.filters
+++ b/Data/samples/RowFormatter/RowFormatter_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {54148e6f-e05b-4516-ad24-7fbd79706c55}
+ {187164e3-6208-4c69-8f5b-7bd1b1c76fb3}
- {ee4b08dc-256d-466e-b911-1c464c49be51}
+ {3091c2df-6c2f-4803-8de6-bc2af76b65f1}
diff --git a/Data/samples/RowFormatter/RowFormatter_vs120.vcxproj b/Data/samples/RowFormatter/RowFormatter_vs120.vcxproj
index ead87b781..970f4be0c 100644
--- a/Data/samples/RowFormatter/RowFormatter_vs120.vcxproj
+++ b/Data/samples/RowFormatter/RowFormatter_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
RowFormatterWin32Proj
-
+ ApplicationMultiByte
@@ -63,47 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
RowFormatterdRowFormatterdRowFormatterd
@@ -111,6 +93,36 @@
RowFormatterRowFormatter
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ Disabled
@@ -124,14 +136,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RowFormatterd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -156,14 +167,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\RowFormatter.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -186,14 +196,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RowFormatterd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -218,14 +227,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\RowFormatter.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -248,14 +256,13 @@
truetruetrue
-
+ Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RowFormatterd.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -280,14 +287,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\RowFormatter.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -298,8 +304,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/samples/RowFormatter/RowFormatter_vs120.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_vs120.vcxproj.filters
index 98c1f4b2c..d7c3fee07 100644
--- a/Data/samples/RowFormatter/RowFormatter_vs120.vcxproj.filters
+++ b/Data/samples/RowFormatter/RowFormatter_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
- {54148e6f-e05b-4516-ad24-7fbd79706c55}
+ {6a0d8bad-328c-46ad-bacc-d990084380d3}
- {ee4b08dc-256d-466e-b911-1c464c49be51}
+ {09651fbc-86e8-4b70-ab2f-07cfc2c23abb}
diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj b/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj
index 1d0dd2863..ac6baa67e 100644
--- a/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj
+++ b/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj
@@ -33,79 +33,79 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- RowFormatterd
- RowFormatterd
- RowFormatterd
- RowFormatter
- RowFormatter
- RowFormatter
+ bin64\
+ obj64\$(Configuration)\
+ true
+ bin64\
+ obj64\$(Configuration)\
+ false
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ RowFormatterd
+ RowFormatterd
+ RowFormatterd
+ RowFormatter
+ RowFormatter
+ RowFormatter
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -125,7 +125,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RowFormatterd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -135,7 +135,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -157,7 +157,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RowFormatter.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -167,7 +167,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -187,7 +187,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RowFormatterd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -197,7 +197,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -219,7 +219,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RowFormatter.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -229,7 +229,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -249,7 +249,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RowFormatterd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -259,7 +259,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -281,7 +281,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RowFormatter.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj.filters
index f97233945..30798e250 100644
--- a/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj.filters
+++ b/Data/samples/RowFormatter/RowFormatter_x64_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
- {3e78d069-dd5f-480d-9195-6f1c1de37dab}
+ {cce5d764-4172-4f35-8894-73fa8e95355a}
- {e1d33694-777b-4a34-898a-5d19a463278f}
+ {07b2796d-acfe-46e2-8e6c-f19761b085a6}
diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj b/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj
index 82c3bb4a7..6417427ad 100644
--- a/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj
+++ b/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj
@@ -33,85 +33,97 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
- RowFormatterd
- RowFormatterd
- RowFormatterd
- RowFormatter
- RowFormatter
- RowFormatter
+ <_ProjectFileVersion>11.0.61030.0
+ RowFormatterd
+ RowFormatterd
+ RowFormatterd
+ RowFormatter
+ RowFormatter
+ RowFormatter
-
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -128,10 +140,9 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RowFormatterd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -141,7 +152,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -160,10 +171,9 @@
Level3Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RowFormatter.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -173,7 +183,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -190,10 +200,9 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RowFormatterd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -203,7 +212,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -222,10 +231,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RowFormatter.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -235,7 +243,7 @@
MachineX64
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -252,10 +260,9 @@
Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RowFormatterd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -265,7 +272,7 @@
MachineX64
-
+ DisabledOnlyExplicitInline
@@ -284,10 +291,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RowFormatter.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.filters
index 5f8102463..b3c200c78 100644
--- a/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.filters
+++ b/Data/samples/RowFormatter/RowFormatter_x64_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {1a0b9e86-2482-4cd5-907a-6bf396974db3}
+ {cee04c2a-4f07-4a52-9fc6-3b7fa0980d56}
- {75b1142f-c8c2-4cb7-ac5d-85bfc34c2b2e}
+ {1c377984-c4fe-4de9-b925-771da63bdf74}
diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs120.vcxproj b/Data/samples/RowFormatter/RowFormatter_x64_vs120.vcxproj
index ae896699d..fdb50d67c 100644
--- a/Data/samples/RowFormatter/RowFormatter_x64_vs120.vcxproj
+++ b/Data/samples/RowFormatter/RowFormatter_x64_vs120.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+debug_shared
@@ -32,7 +32,7 @@
RowFormatterWin32Proj
-
+ ApplicationMultiByte
@@ -63,47 +63,29 @@
MultiBytev120
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>10.0.40219.1
- bin64\
- obj64\$(Configuration)\
- true
- bin64\
- obj64\$(Configuration)\
- false
- bin64\static_mt\
- obj64\$(Configuration)\
- true
- bin64\static_mt\
- obj64\$(Configuration)\
- false
- bin64\static_md\
- obj64\$(Configuration)\
- true
- bin64\static_md\
- obj64\$(Configuration)\
- false
+ <_ProjectFileVersion>11.0.61030.0
RowFormatterdRowFormatterdRowFormatterd
@@ -111,6 +93,36 @@
RowFormatterRowFormatter
+
+ bin64\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_mt\
+ obj64\$(Configuration)\
+ false
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ true
+
+
+ bin64\static_md\
+ obj64\$(Configuration)\
+ false
+ Disabled
@@ -124,14 +136,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RowFormatterd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -156,14 +167,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin64\RowFormatter.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -186,14 +196,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RowFormatterd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -218,14 +227,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_mt\RowFormatter.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -248,14 +256,13 @@
truetruetrue
-
+ Level3ProgramDatabaseDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RowFormatterd.exe..\..\..\lib64;%(AdditionalLibraryDirectories)true
@@ -280,14 +287,13 @@
truetruetrue
-
+ Level3
-
+ Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin64\static_md\RowFormatter.exe..\..\..\lib64;%(AdditionalLibraryDirectories)false
@@ -298,8 +304,8 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Data/samples/RowFormatter/RowFormatter_x64_vs120.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_x64_vs120.vcxproj.filters
index 5f8102463..603ce1bb6 100644
--- a/Data/samples/RowFormatter/RowFormatter_x64_vs120.vcxproj.filters
+++ b/Data/samples/RowFormatter/RowFormatter_x64_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
- {1a0b9e86-2482-4cd5-907a-6bf396974db3}
+ {bc5a76c9-984a-4890-b1a7-10c343974446}
- {75b1142f-c8c2-4cb7-ac5d-85bfc34c2b2e}
+ {43727883-6f26-4817-8fda-e60a828233b4}
diff --git a/Data/samples/RowFormatter/src/RowFormatter.cpp b/Data/samples/RowFormatter/src/RowFormatter.cpp
old mode 100644
new mode 100755
index b93e8bd20..18eaadfeb
--- a/Data/samples/RowFormatter/src/RowFormatter.cpp
+++ b/Data/samples/RowFormatter/src/RowFormatter.cpp
@@ -9,27 +9,7 @@
// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
-// Permission is hereby granted, free of charge, to any person or organization
-// obtaining a copy of the software and accompanying documentation covered by
-// this license (the "Software") to use, reproduce, display, distribute,
-// execute, and transmit the Software, and to prepare derivative works of the
-// Software, and to permit third-parties to whom the Software is furnished to
-// do so, all subject to the following:
-//
-// The copyright notices in the Software and this entire statement, including
-// the above license grant, this restriction and the following disclaimer,
-// must be included in all copies of the Software, in whole or in part, and
-// all derivative works of the Software, unless such copies or derivative
-// works are solely in the form of machine-executable object code generated by
-// a source language processor.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// SPDX-License-Identifier: BSL-1.0
#include "Poco/SharedPtr.h"
diff --git a/Data/samples/Tuple/Tuple_WEC2013_vs110.vcxproj b/Data/samples/Tuple/Tuple_WEC2013_vs110.vcxproj
index 0abfe77b2..cb24ddf69 100644
--- a/Data/samples/Tuple/Tuple_WEC2013_vs110.vcxproj
+++ b/Data/samples/Tuple/Tuple_WEC2013_vs110.vcxproj
@@ -1,29 +1,29 @@
-
+ debug_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ debug_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_shared
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_md
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
-
+ release_static_mt
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300
@@ -32,101 +32,101 @@
en-US11.0true
- SDK_AM335X_SK_WEC2013
+ SDK_AM335X_SK_WEC2013_V300CE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+ ApplicationUnicodeCE800
-
+
-
+
-
+
-
+
-
+
-
+
<_ProjectFileVersion>11.0.61030.0
- Tupled
- Tupled
- Tupled
- Tuple
- Tuple
- Tuple
+ Tupled
+ Tupled
+ Tupled
+ Tuple
+ Tuple
+ Tuple
-
+ bin\$(Platform)\shared\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\shared\obj\$(Platform)\$(Configuration)\false
-
+ bin\$(Platform)\static_mt\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\static_mt\obj\$(Platform)\$(Configuration)\false
-
+ bin\$(Platform)\static_md\obj\$(Platform)\$(Configuration)\true
-
+ bin\$(Platform)\static_md\obj\$(Platform)\$(Configuration)\false
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -151,7 +151,7 @@
WindowsCE
-
+ Disabledtrue
@@ -178,7 +178,7 @@
WindowsCE
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -203,7 +203,7 @@
WindowsCE
-
+ DisabledDefault
@@ -233,7 +233,7 @@
WindowsCE
-
+ Disabled..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -258,7 +258,7 @@
WindowsCE
-
+ DisabledDefault
diff --git a/Data/samples/Tuple/Tuple_WEC2013_vs110.vcxproj.filters b/Data/samples/Tuple/Tuple_WEC2013_vs110.vcxproj.filters
index dad2c1bb3..7f986684c 100644
--- a/Data/samples/Tuple/Tuple_WEC2013_vs110.vcxproj.filters
+++ b/Data/samples/Tuple/Tuple_WEC2013_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
- {26d1e0a1-302f-4e18-aea2-d24d41969fad}
+ {ccd95993-240c-4b35-8da0-1967a2646077}
- {3d26ef34-5676-439c-a07a-048d38e6083f}
+ {06522ff2-fc20-49b5-a62b-6b641448d5c4}
diff --git a/Data/samples/Tuple/Tuple_vs100.vcxproj b/Data/samples/Tuple/Tuple_vs100.vcxproj
index 717086854..c77a9a93b 100644
--- a/Data/samples/Tuple/Tuple_vs100.vcxproj
+++ b/Data/samples/Tuple/Tuple_vs100.vcxproj
@@ -33,79 +33,79 @@
Win32Proj
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
+ ApplicationMultiByte
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
<_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- Tupled
- Tupled
- Tupled
- Tuple
- Tuple
- Tuple
+ bin\
+ obj\$(Configuration)\
+ true
+ bin\
+ obj\$(Configuration)\
+ false
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+ Tupled
+ Tupled
+ Tupled
+ Tuple
+ Tuple
+ Tuple
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -125,7 +125,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\Tupled.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -135,7 +135,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -157,7 +157,7 @@
%(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\Tuple.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -167,7 +167,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -187,7 +187,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\Tupled.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -197,7 +197,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -219,7 +219,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\Tuple.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -229,7 +229,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -249,7 +249,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\Tupled.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -259,7 +259,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -281,7 +281,7 @@
%(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\Tuple.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/Tuple/Tuple_vs100.vcxproj.filters b/Data/samples/Tuple/Tuple_vs100.vcxproj.filters
index 1f4829e46..b69ea77f0 100644
--- a/Data/samples/Tuple/Tuple_vs100.vcxproj.filters
+++ b/Data/samples/Tuple/Tuple_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
- {a641278d-3b31-4330-b35e-f96580cc4a38}
+ {80f6027f-08ee-4586-8acf-3b733071da04}
- {2a53eeac-a72f-4287-b62b-0f2e4812e051}
+ {9fb1e4e9-4e08-48c9-9853-54da2d5b206a}
diff --git a/Data/samples/Tuple/Tuple_vs110.vcxproj b/Data/samples/Tuple/Tuple_vs110.vcxproj
index 7915c51cf..99aa8cd65 100644
--- a/Data/samples/Tuple/Tuple_vs110.vcxproj
+++ b/Data/samples/Tuple/Tuple_vs110.vcxproj
@@ -33,85 +33,97 @@
Win32Proj
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
+ ApplicationMultiBytev110
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- <_ProjectFileVersion>10.0.40219.1
- bin\
- obj\$(Configuration)\
- true
- bin\
- obj\$(Configuration)\
- false
- bin\static_mt\
- obj\$(Configuration)\
- true
- bin\static_mt\
- obj\$(Configuration)\
- false
- bin\static_md\
- obj\$(Configuration)\
- true
- bin\static_md\
- obj\$(Configuration)\
- false
- Tupled
- Tupled
- Tupled
- Tuple
- Tuple
- Tuple
+ <_ProjectFileVersion>11.0.61030.0
+ Tupled
+ Tupled
+ Tupled
+ Tuple
+ Tuple
+ Tuple
-
+
+ bin\
+ obj\$(Configuration)\
+ true
+
+
+ bin\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_mt\
+ obj\$(Configuration)\
+ false
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ true
+
+
+ bin\static_md\
+ obj\$(Configuration)\
+ false
+
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -128,10 +140,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\Tupled.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -141,7 +152,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -160,10 +171,9 @@
Level3Default
- %(DisableSpecificWarnings)
- ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;%(AdditionalDependencies)bin\Tuple.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -173,7 +183,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -190,10 +200,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\Tupled.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -203,7 +212,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -222,10 +231,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_mt\Tuple.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
@@ -235,7 +243,7 @@
MachineX86
-
+ Disabled.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)
@@ -252,10 +260,9 @@
Level3EditAndContinueDefault
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\Tupled.exe..\..\..\lib;%(AdditionalLibraryDirectories)true
@@ -265,7 +272,7 @@
MachineX86
-
+ DisabledOnlyExplicitInline
@@ -284,10 +291,9 @@
Level3Default
- %(DisableSpecificWarnings)
- iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
+ iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)bin\static_md\Tuple.exe..\..\..\lib;%(AdditionalLibraryDirectories)false
diff --git a/Data/samples/Tuple/Tuple_vs110.vcxproj.filters b/Data/samples/Tuple/Tuple_vs110.vcxproj.filters
index d12dc7cfe..6b627b71b 100644
--- a/Data/samples/Tuple/Tuple_vs110.vcxproj.filters
+++ b/Data/samples/Tuple/Tuple_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
-