From c7f873eee8d990e9b7ceb2622c9c6c12ab1551b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Mon, 22 Jul 2013 20:44:35 +0200 Subject: [PATCH] added missing x64_vs90 project files, fixed Util x64 project files, fixed some warnings --- Data/MySQL/MySQL_vs110.vcxproj | 168 +++-- Data/MySQL/MySQL_x64_vs90.sln | 60 ++ Data/MySQL/MySQL_x64_vs90.vcproj | 446 ++++++++++++ Data/ODBC/ODBC_vs100.vcxproj.filters | 6 +- Data/ODBC/ODBC_vs110.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs100.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs110.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs90.sln | 60 ++ Data/ODBC/ODBC_x64_vs90.vcproj | 545 ++++++++++++++ Data/SQLite/SQLite_CE_vs90.vcproj | 37 - Data/SQLite/SQLite_vs100.vcxproj | 160 ++--- Data/SQLite/SQLite_vs100.vcxproj.filters | 24 +- Data/SQLite/SQLite_vs110.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs100.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs110.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs90.sln | 60 ++ Data/SQLite/SQLite_x64_vs90.vcproj | 446 ++++++++++++ JSON/include/Poco/JSON/Parser.h | 4 +- Util/Util_CE_vs90.vcproj | 704 ++++++------------- Util/Util_vs100.vcxproj | 257 +++---- Util/Util_vs100.vcxproj.filters | 39 +- Util/Util_vs110.vcxproj.filters | 36 +- Util/Util_vs71.vcproj | 6 +- Util/Util_vs80.vcproj | 6 +- Util/Util_vs90.vcproj | 666 ++++++------------ Util/Util_x64_vs100.vcxproj | 2 + Util/Util_x64_vs100.vcxproj.filters | 36 +- Util/Util_x64_vs110.vcxproj.filters | 36 +- Util/Util_x64_vs90.vcproj | 18 +- Util/src/JSONConfiguration.cpp | 6 +- 30 files changed, 2479 insertions(+), 1403 deletions(-) create mode 100644 Data/MySQL/MySQL_x64_vs90.sln create mode 100644 Data/MySQL/MySQL_x64_vs90.vcproj create mode 100644 Data/ODBC/ODBC_x64_vs90.sln create mode 100644 Data/ODBC/ODBC_x64_vs90.vcproj create mode 100644 Data/SQLite/SQLite_x64_vs90.sln create mode 100644 Data/SQLite/SQLite_x64_vs90.vcproj diff --git a/Data/MySQL/MySQL_vs110.vcxproj b/Data/MySQL/MySQL_vs110.vcxproj index 9888f3287..41fc678e9 100644 --- a/Data/MySQL/MySQL_vs110.vcxproj +++ b/Data/MySQL/MySQL_vs110.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,86 +32,82 @@ MySQL Win32Proj - - + + StaticLibrary MultiByte v110 - + StaticLibrary MultiByte v110 - + StaticLibrary MultiByte v110 - + StaticLibrary MultiByte v110 - + DynamicLibrary MultiByte v110 - + DynamicLibrary MultiByte v110 - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + <_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 - - C:\Program Files (x86)\MySQL\Connector C 6.0.2\include;$(IncludePath) - C:\Program Files (x86)\MySQL\Connector C 6.0.2\lib\debug;$(LibraryPath) - - + Disabled .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) @@ -124,7 +120,7 @@ true true true - + Level3 EditAndContinue Default @@ -142,7 +138,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -157,9 +153,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -176,7 +172,7 @@ MachineX86 - + Disabled .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) @@ -189,7 +185,7 @@ true true true - + ..\..\lib\PocoDataMySQLmtd.pdb Level3 EditAndContinue @@ -200,7 +196,7 @@ ..\..\lib\PocoDataMySQLmtd.lib - + Disabled OnlyExplicitInline @@ -215,9 +211,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -225,7 +221,7 @@ ..\..\lib\PocoDataMySQLmt.lib - + Disabled .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) @@ -238,7 +234,7 @@ true true true - + ..\..\lib\PocoDataMySQLmdd.pdb Level3 EditAndContinue @@ -249,7 +245,7 @@ ..\..\lib\PocoDataMySQLmdd.lib - + Disabled OnlyExplicitInline @@ -264,10 +260,10 @@ true true true - + ..\..\lib\PocoDataMySQLmd.pdb Level3 - + Default %(DisableSpecificWarnings) @@ -277,30 +273,30 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Data/MySQL/MySQL_x64_vs90.sln b/Data/MySQL/MySQL_x64_vs90.sln new file mode 100644 index 000000000..67589bb49 --- /dev/null +++ b/Data/MySQL/MySQL_x64_vs90.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQL", "MySQL_x64_vs90.vcproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{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 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {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_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_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_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_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 + EndGlobalSection +EndGlobal diff --git a/Data/MySQL/MySQL_x64_vs90.vcproj b/Data/MySQL/MySQL_x64_vs90.vcproj new file mode 100644 index 000000000..17b8d62bf --- /dev/null +++ b/Data/MySQL/MySQL_x64_vs90.vcproj @@ -0,0 +1,446 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/ODBC/ODBC_vs100.vcxproj.filters b/Data/ODBC/ODBC_vs100.vcxproj.filters index b575b42b1..2752bb01d 100644 --- a/Data/ODBC/ODBC_vs100.vcxproj.filters +++ b/Data/ODBC/ODBC_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {996a7b0c-bb7f-4f26-8b63-80f67c2ff845} + {d4014b6f-1483-4cd9-b7fb-61d99b3b2e9f} - {fdf74d4c-d814-4793-82a6-3efc1b78f0f9} + {8d1ade46-c6eb-48c9-83aa-ac9e00d45463} - {d7ec27b1-f709-4068-a380-e9fc24604dfa} + {572b8a58-9631-476d-b604-3faa04705c34} diff --git a/Data/ODBC/ODBC_vs110.vcxproj.filters b/Data/ODBC/ODBC_vs110.vcxproj.filters index 957389d86..f1b61ad26 100644 --- a/Data/ODBC/ODBC_vs110.vcxproj.filters +++ b/Data/ODBC/ODBC_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {03440dec-c896-4fd4-a8db-22536df013c8} + {31525210-febb-4ae6-8293-9227042529bd} - {1e6ce965-d823-48dd-9a98-a34b0a6dcc3d} + {9622c714-71d8-4eff-835d-b78d7c3f5cb2} - {5705317d-df7a-4c45-b630-340dc071021e} + {73178635-6a28-4b12-9c5b-96a9bb733afb} diff --git a/Data/ODBC/ODBC_x64_vs100.vcxproj.filters b/Data/ODBC/ODBC_x64_vs100.vcxproj.filters index c61d5b7b4..37a72e18b 100644 --- a/Data/ODBC/ODBC_x64_vs100.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {597bf389-285b-4ddf-bc50-4c049f96569a} + {0ffa301a-20c8-4b6b-92a2-8eea80201d57} - {abc8ee7c-0e85-4210-bc23-6d314a9e8c41} + {240c2892-805e-4f52-bcb7-02c58714c331} - {d9955098-3f60-4a23-8a7a-2c2dfc2397bd} + {546ca69f-02c7-4287-b651-6ffc4d40bab4} diff --git a/Data/ODBC/ODBC_x64_vs110.vcxproj.filters b/Data/ODBC/ODBC_x64_vs110.vcxproj.filters index 9127ffdc4..3efefe457 100644 --- a/Data/ODBC/ODBC_x64_vs110.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {5fb79c66-d4bb-4bbc-b06d-21acd9b46378} + {4a52ed7a-1ab5-42f8-8eb0-13db7de40005} - {115196b5-3428-45df-b236-56a0b20954f2} + {2d804826-927c-48b7-a53d-c42922803fa7} - {b4f0a46d-6286-480e-9a50-3c44db55c9cc} + {2778a60d-4293-4f80-a11b-b68df93f46b8} diff --git a/Data/ODBC/ODBC_x64_vs90.sln b/Data/ODBC/ODBC_x64_vs90.sln new file mode 100644 index 000000000..a11b38021 --- /dev/null +++ b/Data/ODBC/ODBC_x64_vs90.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ODBC", "ODBC_x64_vs90.vcproj", "{1B29820D-375F-11DB-837B-00123FC423B5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{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 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {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_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_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_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_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 + EndGlobalSection +EndGlobal diff --git a/Data/ODBC/ODBC_x64_vs90.vcproj b/Data/ODBC/ODBC_x64_vs90.vcproj new file mode 100644 index 000000000..b2840172d --- /dev/null +++ b/Data/ODBC/ODBC_x64_vs90.vcproj @@ -0,0 +1,545 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Data/SQLite/SQLite_CE_vs90.vcproj b/Data/SQLite/SQLite_CE_vs90.vcproj index 9c6f3226c..ad77ae1b2 100644 --- a/Data/SQLite/SQLite_CE_vs90.vcproj +++ b/Data/SQLite/SQLite_CE_vs90.vcproj @@ -484,43 +484,6 @@ RelativePath=".\src\sqlite3.c"/> - - - - - - - - - - - - - - - - - - - - diff --git a/Data/SQLite/SQLite_vs100.vcxproj b/Data/SQLite/SQLite_vs100.vcxproj index f8d9c4ae4..3a0ccc242 100644 --- a/Data/SQLite/SQLite_vs100.vcxproj +++ b/Data/SQLite/SQLite_vs100.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,76 +32,76 @@ SQLite Win32Proj - - + + StaticLibrary MultiByte - + StaticLibrary MultiByte - + StaticLibrary MultiByte - + StaticLibrary MultiByte - + DynamicLibrary MultiByte - + DynamicLibrary MultiByte - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + <_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) @@ -114,7 +114,7 @@ true true true - + Level3 EditAndContinue Default @@ -132,7 +132,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -147,9 +147,9 @@ true true true - + Level3 - + Default 4996;4244;4018;%(DisableSpecificWarnings) @@ -166,7 +166,7 @@ MachineX86 - + Disabled .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) @@ -179,7 +179,7 @@ true true true - + ..\..\lib\PocoDataSQLitemtd.pdb Level3 EditAndContinue @@ -190,7 +190,7 @@ ..\..\lib\PocoDataSQLitemtd.lib - + Disabled OnlyExplicitInline @@ -205,9 +205,9 @@ true true true - + Level3 - + Default 4996;4244;4018;%(DisableSpecificWarnings) @@ -215,7 +215,7 @@ ..\..\lib\PocoDataSQLitemt.lib - + Disabled .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) @@ -228,7 +228,7 @@ true true true - + ..\..\lib\PocoDataSQLitemdd.pdb Level3 EditAndContinue @@ -239,7 +239,7 @@ ..\..\lib\PocoDataSQLitemdd.lib - + Disabled OnlyExplicitInline @@ -254,10 +254,10 @@ true true true - + ..\..\lib\PocoDataSQLitemd.pdb Level3 - + Default 4996;4244;4018;%(DisableSpecificWarnings) @@ -267,28 +267,28 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Data/SQLite/SQLite_vs100.vcxproj.filters b/Data/SQLite/SQLite_vs100.vcxproj.filters index 938e58330..c12a1605d 100644 --- a/Data/SQLite/SQLite_vs100.vcxproj.filters +++ b/Data/SQLite/SQLite_vs100.vcxproj.filters @@ -2,22 +2,22 @@ - {8e8a8f9a-e67a-4415-9cc3-ff05daf85222} + {4e609b41-82c4-438d-8840-b4a12d40f739} - {d3ea176a-3cf9-42d7-a95d-441af44526ea} + {c996c461-9baa-4a95-b0ac-429dc187ac3e} - {d432addb-41ca-4d6e-8619-c065c5a8bf38} + {d37df4d4-4503-40f3-8977-c3be47a49356} - {e6c2135b-063d-42ae-b3ea-0b3302797d4d} + {7010d3ee-0c80-48ef-a088-389702d2caf9} - {a6dd3f3b-e1b2-47fe-b939-eafaf61bc73a} + {3d66eb31-a8d0-44da-bbe5-ef0d3d3355ca} - {7743eda6-d171-4d80-b8f5-cbdba1e942f7} + {2b154994-ff36-4807-bce5-7f3f7e5c6bad} @@ -30,6 +30,9 @@ SQLite\Header Files + + SQLite\Header Files + SQLite\Header Files @@ -48,9 +51,6 @@ 3rdparty\Header Files - - SQLite\Header Files - @@ -62,6 +62,9 @@ SQLite\Source Files + + SQLite\Source Files + SQLite\Source Files @@ -77,8 +80,5 @@ 3rdparty\Source Files - - SQLite\Source Files - \ No newline at end of file diff --git a/Data/SQLite/SQLite_vs110.vcxproj.filters b/Data/SQLite/SQLite_vs110.vcxproj.filters index c95bab9d2..0c0e76832 100644 --- a/Data/SQLite/SQLite_vs110.vcxproj.filters +++ b/Data/SQLite/SQLite_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {1a11f0bf-d7d2-41ce-a6b9-189725a7c759} + {1654afe3-8338-4a8d-9531-76243ab57c7e} - {cc1106a7-077d-45cb-91bb-532ec071322f} + {2c59f410-c8bb-4206-ba5d-24344551781d} - {b971f786-32a3-42bf-9622-0f495e128b32} + {1b92e4f7-cd36-41e6-a6b1-0089d05c4e94} - {88f78d93-7bd3-4f0c-bdfb-a0732dc4b514} + {d6252b79-c041-4bc0-9432-73b4cacf86e4} - {42f1eb2b-1c36-4d03-a18a-bcee720e45cc} + {aa9ec1c8-5901-400b-8edd-8837c734a5fe} - {33125f09-7f0b-4e6c-a373-45395d623d45} + {b9f7489c-e59b-489d-b346-86baeb07efd9} diff --git a/Data/SQLite/SQLite_x64_vs100.vcxproj.filters b/Data/SQLite/SQLite_x64_vs100.vcxproj.filters index 2fb96c6c3..f2ba569a3 100644 --- a/Data/SQLite/SQLite_x64_vs100.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs100.vcxproj.filters @@ -2,22 +2,22 @@ - {d61a6cc3-235e-4190-98c4-76bb34c9ddef} + {9c6e655f-fee8-4718-b21a-20d1d155bdc1} - {3edd174a-e015-4d7a-8d65-13bdfaf4dc8f} + {ed02880c-c814-4b29-a13d-857c56672445} - {2de78b3b-204e-439d-9c22-2fd088e2a6e4} + {589cf2c0-4e72-4f22-9c60-42da19d5c61e} - {ec837024-accd-4e9f-8f78-b1962b698e2e} + {8bf16ad5-9f01-4312-ac6d-b2522f958ec5} - {bc89e868-582d-448f-98e7-57ebbde03e0b} + {a666641e-d4cf-4a97-b146-cfe3cab947be} - {c71704f9-f9c4-4a90-93a5-f7859d83a8d8} + {939d9ee8-27c8-44f1-83d1-5a50d2bb9334} diff --git a/Data/SQLite/SQLite_x64_vs110.vcxproj.filters b/Data/SQLite/SQLite_x64_vs110.vcxproj.filters index e3ca79d9c..acfd661e6 100644 --- a/Data/SQLite/SQLite_x64_vs110.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {974d9006-374b-427c-b476-d123b141d9e4} + {e3a116ea-ab9d-47d6-b9cc-5c16ef9b5dbd} - {1b669eb5-0be6-48fb-81da-18a39706df79} + {eface8d0-944f-4a5b-898c-bea65b4ae4fa} - {74179984-e181-4c88-b34d-458b6ee631e8} + {b79c984e-3c84-4c94-8ac0-dad9b7fc1142} - {5078ec57-4db8-4592-b687-6842aeb1d9ef} + {b42abe38-646d-4dd8-9ca9-14d517aac75b} - {f5bccf88-548a-41b5-b7e6-c1c525121815} + {3c50e562-d3f8-45b9-b1d1-9bbba13c4b8a} - {1c7fc6d1-3431-4f04-9278-3c8b78a3bd91} + {2bdeac5c-a341-4008-85de-0a7f686d8aca} diff --git a/Data/SQLite/SQLite_x64_vs90.sln b/Data/SQLite/SQLite_x64_vs90.sln new file mode 100644 index 000000000..2d5b6603d --- /dev/null +++ b/Data/SQLite/SQLite_x64_vs90.sln @@ -0,0 +1,60 @@ +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLite", "SQLite_x64_vs90.vcproj", "{5B889CE7-AD42-4CFE-BBC3-532B61F8329E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{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 + release_shared|x64 = release_shared|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {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_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_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_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_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 + EndGlobalSection +EndGlobal diff --git a/Data/SQLite/SQLite_x64_vs90.vcproj b/Data/SQLite/SQLite_x64_vs90.vcproj new file mode 100644 index 000000000..371001ac9 --- /dev/null +++ b/Data/SQLite/SQLite_x64_vs90.vcproj @@ -0,0 +1,446 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JSON/include/Poco/JSON/Parser.h b/JSON/include/Poco/JSON/Parser.h index 05f7d5122..c2d9c81dc 100644 --- a/JSON/include/Poco/JSON/Parser.h +++ b/JSON/include/Poco/JSON/Parser.h @@ -665,13 +665,13 @@ inline bool Parser::getAllowNullByte() const inline void Parser::setDepth(std::size_t depth) { - _depth = depth; + _depth = static_cast(depth); } inline std::size_t Parser::getDepth() const { - return _depth; + return static_cast(_depth); } diff --git a/Util/Util_CE_vs90.vcproj b/Util/Util_CE_vs90.vcproj index c21ee1711..f38757428 100644 --- a/Util/Util_CE_vs90.vcproj +++ b/Util/Util_CE_vs90.vcproj @@ -1,44 +1,34 @@ + Keyword="Win32Proj"> + Name="Digi JumpStart (ARMV4I)"/> - - + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + InterworkCalls="false"/> + Name="VCManagedResourceCompilerTool"/> + PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"/> + Name="VCPreLinkEventTool"/> + TargetMachine="0"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + InterworkCalls="false"/> + Name="VCManagedResourceCompilerTool"/> + PreprocessorDefinitions="_UNICODE;UNICODE;_WIN32_WCE"/> + Name="VCPreLinkEventTool"/> + TargetMachine="0"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + InterworkCalls="false"/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoUtilmtd.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + InterworkCalls="false"/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoUtilmt.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + InterworkCalls="false"/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoUtilmdd.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + + CharacterSet="1"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + TargetEnvironment="1"/> + InterworkCalls="false"/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoUtilmd.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCCodeSignTool"/> + Name="VCPostBuildEventTool"/> - + AdditionalFiles=""/> + - - + + Name="Application"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\Application.h"/> - + RelativePath=".\include\Poco\Util\LoggingSubsystem.h"/> - + RelativePath=".\include\Poco\Util\ServerApplication.h"/> - + RelativePath=".\include\Poco\Util\Subsystem.h"/> + Name="Source Files"> - + RelativePath=".\src\Application.cpp"/> - + RelativePath=".\src\LoggingSubsystem.cpp"/> - + RelativePath=".\src\ServerApplication.cpp"/> - + RelativePath=".\src\Subsystem.cpp"/> + Name="Configuration"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\AbstractConfiguration.h"/> - + RelativePath=".\include\Poco\Util\ConfigurationMapper.h"/> - + RelativePath=".\include\Poco\Util\ConfigurationView.h"/> - + RelativePath=".\include\Poco\Util\FilesystemConfiguration.h"/> - + RelativePath=".\include\Poco\Util\IniFileConfiguration.h"/> - + RelativePath=".\include\Poco\Util\JSONConfiguration.h"/> - + RelativePath=".\include\Poco\Util\LayeredConfiguration.h"/> - + RelativePath=".\include\Poco\Util\LoggingConfigurator.h"/> - + RelativePath=".\include\Poco\Util\MapConfiguration.h"/> - + RelativePath=".\include\Poco\Util\PropertyFileConfiguration.h"/> - + RelativePath=".\include\Poco\Util\SystemConfiguration.h"/> - + RelativePath=".\include\Poco\Util\XMLConfiguration.h"/> + Name="Source Files"> - + RelativePath=".\src\AbstractConfiguration.cpp"/> - + RelativePath=".\src\ConfigurationMapper.cpp"/> - + RelativePath=".\src\ConfigurationView.cpp"/> - + RelativePath=".\src\FilesystemConfiguration.cpp"/> - + RelativePath=".\src\IniFileConfiguration.cpp"/> - + RelativePath=".\src\JSONConfiguration.cpp"/> - + RelativePath=".\src\LayeredConfiguration.cpp"/> - + RelativePath=".\src\LoggingConfigurator.cpp"/> - + RelativePath=".\src\MapConfiguration.cpp"/> - + RelativePath=".\src\PropertyFileConfiguration.cpp"/> - + RelativePath=".\src\SystemConfiguration.cpp"/> - + RelativePath=".\src\XMLConfiguration.cpp"/> + Name="Options"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\HelpFormatter.h"/> - + RelativePath=".\include\Poco\Util\IntValidator.h"/> - + RelativePath=".\include\Poco\Util\Option.h"/> - + RelativePath=".\include\Poco\Util\OptionCallback.h"/> - + RelativePath=".\include\Poco\Util\OptionException.h"/> - + RelativePath=".\include\Poco\Util\OptionProcessor.h"/> - + RelativePath=".\include\Poco\Util\OptionSet.h"/> - + RelativePath=".\include\Poco\Util\RegExpValidator.h"/> - + RelativePath=".\include\Poco\Util\Validator.h"/> + Name="Source Files"> - + RelativePath=".\src\HelpFormatter.cpp"/> - + RelativePath=".\src\IntValidator.cpp"/> - + RelativePath=".\src\Option.cpp"/> - + RelativePath=".\src\OptionCallback.cpp"/> - + RelativePath=".\src\OptionException.cpp"/> - + RelativePath=".\src\OptionProcessor.cpp"/> - + RelativePath=".\src\OptionSet.cpp"/> - + RelativePath=".\src\RegExpValidator.cpp"/> - + RelativePath=".\src\Validator.cpp"/> + Name="Windows"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\WinRegistryConfiguration.h"/> - + RelativePath=".\include\Poco\Util\WinRegistryKey.h"/> - + RelativePath=".\include\Poco\Util\WinService.h"/> + Name="Source Files"> - + RelativePath=".\src\WinRegistryConfiguration.cpp"/> - + RelativePath=".\src\WinRegistryKey.cpp"/> - + RelativePath=".\src\WinService.cpp"/> + Name="Util"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\Util.h"/> - + Name="Source Files"/> + Name="Timer"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\Timer.h"/> - + RelativePath=".\include\Poco\Util\TimerTask.h"/> - + RelativePath=".\include\Poco\Util\TimerTaskAdapter.h"/> + Name="Source Files"> - + RelativePath=".\src\Timer.cpp"/> - + RelativePath=".\src\TimerTask.cpp"/> + RelativePath="..\DLLVersion.rc"> + + + + + + + ExcludedFromBuild="true"> + Name="VCResourceCompilerTool"/> + ExcludedFromBuild="true"> + Name="VCResourceCompilerTool"/> + ExcludedFromBuild="true"> + Name="VCResourceCompilerTool"/> + ExcludedFromBuild="true"> + Name="VCResourceCompilerTool"/> - - + diff --git a/Util/Util_vs100.vcxproj b/Util/Util_vs100.vcxproj index 094a48e2c..0c02c1e5c 100644 --- a/Util/Util_vs100.vcxproj +++ b/Util/Util_vs100.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,76 +32,76 @@ Util Win32Proj - - + + StaticLibrary MultiByte - + StaticLibrary MultiByte - + StaticLibrary MultiByte - + StaticLibrary MultiByte - + DynamicLibrary MultiByte - + DynamicLibrary MultiByte - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + <_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)\ - PocoUtild - PocoUtilmdd - PocoUtilmtd - PocoUtil - PocoUtilmd - PocoUtilmt + ..\bin\ + obj\$(Configuration)\ + true + ..\bin\ + obj\$(Configuration)\ + false + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + ..\lib\ + obj\$(Configuration)\ + PocoUtild + PocoUtilmdd + PocoUtilmtd + PocoUtil + PocoUtilmd + PocoUtilmt - + Disabled .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) @@ -114,7 +114,7 @@ true true true - + Level3 EditAndContinue Default @@ -132,7 +132,7 @@ MachineX86 - + Disabled OnlyExplicitInline @@ -147,9 +147,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -166,7 +166,7 @@ MachineX86 - + Disabled .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) @@ -179,7 +179,7 @@ true true true - + ..\lib\PocoUtilmtd.pdb Level3 EditAndContinue @@ -190,7 +190,7 @@ ..\lib\PocoUtilmtd.lib - + Disabled OnlyExplicitInline @@ -205,9 +205,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) @@ -215,7 +215,7 @@ ..\lib\PocoUtilmt.lib - + Disabled .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) @@ -228,7 +228,7 @@ true true true - + ..\lib\PocoUtilmdd.pdb Level3 EditAndContinue @@ -239,7 +239,7 @@ ..\lib\PocoUtilmdd.lib - + Disabled OnlyExplicitInline @@ -254,10 +254,10 @@ true true true - + ..\lib\PocoUtilmd.pdb Level3 - + Default %(DisableSpecificWarnings) @@ -267,80 +267,81 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - true - true - true - true + true + true + true + true + true + true - - - \ No newline at end of file + + + diff --git a/Util/Util_vs100.vcxproj.filters b/Util/Util_vs100.vcxproj.filters index 7d6736c6c..136a3837a 100644 --- a/Util/Util_vs100.vcxproj.filters +++ b/Util/Util_vs100.vcxproj.filters @@ -2,58 +2,58 @@ - {0c875a14-ecd8-4fb8-b481-9aa8391d0844} + {e95beba0-64cd-437b-9df4-d479f54b14bb} - {6839a004-99f8-4f70-b2ca-b88ca434be6a} + {f8244d3e-2de9-4d53-92da-4371c937c78b} - {54e14cc4-00f2-404e-89b4-09ee86486467} + {bbb27ae5-da52-47ed-9eda-367bba4a586b} - {c6f7ba89-5194-4849-a723-afbab67f4968} + {ff3aacf0-b0fe-44f5-a69d-7f5ae27d4dec} - {295f15e3-bdaa-4ee8-b514-5dea02fe9195} + {eb6429ab-9fc6-4941-862b-83d1635b8879} - {57d81e33-7df2-4cfb-9ee5-d94213798ee7} + {6d2b083b-6012-4d0b-96aa-3f068236435f} - {d8edc170-be83-42ae-9a5d-5733154f0702} + {4c5584ab-81fd-4da4-b384-c5d0a4518403} - {861a3e82-076f-41a4-b0c4-dd3542ff3b20} + {d28e182d-b8f0-4f07-87ff-7d42696eaf23} - {8d33bd73-22e9-4977-b75a-bb975cc2864e} + {cd9f10e3-3a75-4001-b541-59c70ad69b5c} - {fdcf99bb-5e70-47ef-a06f-dae4e8c094e9} + {0568b057-8742-4807-bc08-3b0c45381913} - {ee751d87-991d-4f86-921a-64ae891ddef8} + {4c593541-a23b-4fac-9d7d-c50c665e6c8f} - {ee5fa5ef-0278-48f0-9fe3-b63a36214b53} + {30c8e559-f904-4d9a-a1ed-749524061a3b} - {ca582c15-1ffe-4f68-acbc-0d84d8001fc4} + {f64a9f5d-c4be-4faf-b8d6-e748d32b0419} - {b889e55c-1379-4205-9a86-fd3bd0ce8d79} + {05b653a3-5a6f-47b6-990d-25e5d5ea7ed7} - {78ecfc54-3cfc-4690-8ca6-4c393e25b19d} + {b799510f-8485-4e77-a3bb-4de06298c5e5} - {a8413194-8672-4e39-8297-9bed1c0b8c68} + {ff0d993c-679b-495a-96e4-85807614f98e} - {10a86d08-f3e5-4db9-bf5b-98b853b18d3d} + {db101fe1-c790-4146-93eb-2360d6a11435} - {cf1299d0-3caf-433d-a96e-13deb4b55578} + {b7d8393b-f62f-453a-9b55-ca7a67f0237b} @@ -153,9 +153,6 @@ Timer\Header Files - - Util\Header Files - diff --git a/Util/Util_vs110.vcxproj.filters b/Util/Util_vs110.vcxproj.filters index 538d146e9..1743f327a 100644 --- a/Util/Util_vs110.vcxproj.filters +++ b/Util/Util_vs110.vcxproj.filters @@ -2,58 +2,58 @@ - {89e9ce11-ef4e-4522-b64c-3fc09d60b20d} + {ee1867e0-562f-448f-ad86-83e4012407fa} - {156806be-c474-4d64-bec4-ffeadcd98d13} + {15d6b0be-e704-4488-b31a-f84e90133e77} - {844b2a7e-f5e6-405c-aad9-f03733101921} + {fe5f7c73-eab1-4335-869e-a03ebee5eb17} - {d62f79bc-ccea-4daa-933a-0c7ff378741a} + {92e08703-6853-41ff-90d9-a2f409b97601} - {483d1cf7-75ae-42a9-9419-952aff09a273} + {634b59c7-f903-4851-8bc6-4d3ba0536d9c} - {0da3117d-a768-4645-bfa2-b31da6f82d2e} + {5652a6c5-1335-4a14-bff0-bd4160ca9983} - {2256319c-ab94-4c9d-a4c7-04cfdd69d43e} + {28230754-902e-4b93-a004-72d3d6bb6b49} - {1c655d58-0b99-44ed-b438-c1b4e0d0b5a4} + {0e0c3f7b-cff9-4e80-bcc5-99d4b0d511e7} - {178ae833-3e0e-425d-a0a7-f9dc380c8e53} + {96cdb3b0-874c-4d04-8fe1-d899da1c9d1d} - {3b4f671f-700e-4494-950d-e44a8c872e8f} + {b25aa509-a98e-4f20-9e40-7f1936fa0b25} - {919595ec-6642-4f7a-9610-3c0ce28bdfe3} + {f4d70318-6244-42c1-81f8-428fc11a27e1} - {1760f260-f9ae-4742-b617-63763a97dbc9} + {1f84d691-e7ab-4ade-a8c7-0ae1b5f9f70c} - {88d98533-a6be-4f87-8710-25a7e4c33184} + {fce00c10-3fc8-4b2c-b5e3-6b5b0fbba852} - {95d0f5af-b5f6-4c87-817c-d0548dcc0151} + {593b0e69-63b2-406f-900f-bb8c28c2fd8d} - {01883964-e333-425d-a58b-92c61fdb06f4} + {4d08c6fd-68ac-4c17-92ac-5e2520c51c27} - {2dcd1e34-74e6-4124-aff0-442071980135} + {e693e7ca-9217-4379-93f8-d4b993b50e1d} - {5beeca2c-1644-4d10-ad2f-3c0ce80ec492} + {f78bf43e-0d73-458c-8186-2e0c7c572f49} - {25a264ac-c7e8-4f40-81e6-8e54815231ca} + {f5a706e6-7370-4cd7-bc5d-f205cd554669} diff --git a/Util/Util_vs71.vcproj b/Util/Util_vs71.vcproj index 14a3917a2..560bdaeba 100644 --- a/Util/Util_vs71.vcproj +++ b/Util/Util_vs71.vcproj @@ -540,12 +540,14 @@ + Name="debug_shared|Win32" + ExcludedFromBuild="TRUE"> + Name="release_shared|Win32" + ExcludedFromBuild="TRUE"> diff --git a/Util/Util_vs80.vcproj b/Util/Util_vs80.vcproj index c945fd688..c3c5a1260 100644 --- a/Util/Util_vs80.vcproj +++ b/Util/Util_vs80.vcproj @@ -561,12 +561,14 @@ + Name="debug_shared|Win32" + ExcludedFromBuild="true"> + Name="release_shared|Win32" + ExcludedFromBuild="true"> diff --git a/Util/Util_vs90.vcproj b/Util/Util_vs90.vcproj index 604c5360f..842c1af71 100644 --- a/Util/Util_vs90.vcproj +++ b/Util/Util_vs90.vcproj @@ -1,43 +1,33 @@ + Keyword="Win32Proj"> + Name="Win32"/> - - + + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="1"/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="1"/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoUtilmtd.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoUtilmt.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoUtilmdd.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + DisableSpecificWarnings=""/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoUtilmd.lib"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> - - + + Name="Application"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\Application.h"/> - + RelativePath=".\include\Poco\Util\LoggingSubsystem.h"/> - + RelativePath=".\include\Poco\Util\ServerApplication.h"/> - + RelativePath=".\include\Poco\Util\Subsystem.h"/> + Name="Source Files"> - + RelativePath=".\src\Application.cpp"/> - + RelativePath=".\src\LoggingSubsystem.cpp"/> - + RelativePath=".\src\ServerApplication.cpp"/> - + RelativePath=".\src\Subsystem.cpp"/> + Name="Configuration"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\AbstractConfiguration.h"/> - + RelativePath=".\include\Poco\Util\ConfigurationMapper.h"/> - + RelativePath=".\include\Poco\Util\ConfigurationView.h"/> - + RelativePath=".\include\Poco\Util\FilesystemConfiguration.h"/> - + RelativePath=".\include\Poco\Util\IniFileConfiguration.h"/> - + RelativePath=".\include\Poco\Util\JSONConfiguration.h"/> - + RelativePath=".\include\Poco\Util\LayeredConfiguration.h"/> - + RelativePath=".\include\Poco\Util\LoggingConfigurator.h"/> - + RelativePath=".\include\Poco\Util\MapConfiguration.h"/> - + RelativePath=".\include\Poco\Util\PropertyFileConfiguration.h"/> - + RelativePath=".\include\Poco\Util\SystemConfiguration.h"/> - + RelativePath=".\include\Poco\Util\XMLConfiguration.h"/> + Name="Source Files"> - + RelativePath=".\src\AbstractConfiguration.cpp"/> - + RelativePath=".\src\ConfigurationMapper.cpp"/> - + RelativePath=".\src\ConfigurationView.cpp"/> - + RelativePath=".\src\FilesystemConfiguration.cpp"/> - + RelativePath=".\src\IniFileConfiguration.cpp"/> - + RelativePath=".\src\JSONConfiguration.cpp"/> - + RelativePath=".\src\LayeredConfiguration.cpp"/> - + RelativePath=".\src\LoggingConfigurator.cpp"/> - + RelativePath=".\src\MapConfiguration.cpp"/> - + RelativePath=".\src\PropertyFileConfiguration.cpp"/> - + RelativePath=".\src\SystemConfiguration.cpp"/> - + RelativePath=".\src\XMLConfiguration.cpp"/> + Name="Options"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\HelpFormatter.h"/> - + RelativePath=".\include\Poco\Util\IntValidator.h"/> - + RelativePath=".\include\Poco\Util\Option.h"/> - + RelativePath=".\include\Poco\Util\OptionCallback.h"/> - + RelativePath=".\include\Poco\Util\OptionException.h"/> - + RelativePath=".\include\Poco\Util\OptionProcessor.h"/> - + RelativePath=".\include\Poco\Util\OptionSet.h"/> - + RelativePath=".\include\Poco\Util\RegExpValidator.h"/> - + RelativePath=".\include\Poco\Util\Validator.h"/> + Name="Source Files"> - + RelativePath=".\src\HelpFormatter.cpp"/> - + RelativePath=".\src\IntValidator.cpp"/> - + RelativePath=".\src\Option.cpp"/> - + RelativePath=".\src\OptionCallback.cpp"/> - + RelativePath=".\src\OptionException.cpp"/> - + RelativePath=".\src\OptionProcessor.cpp"/> - + RelativePath=".\src\OptionSet.cpp"/> - + RelativePath=".\src\RegExpValidator.cpp"/> - + RelativePath=".\src\Validator.cpp"/> + Name="Windows"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\WinRegistryConfiguration.h"/> - + RelativePath=".\include\Poco\Util\WinRegistryKey.h"/> - + RelativePath=".\include\Poco\Util\WinService.h"/> + Name="Source Files"> - + RelativePath=".\src\WinRegistryConfiguration.cpp"/> - + RelativePath=".\src\WinRegistryKey.cpp"/> - + RelativePath=".\src\WinService.cpp"/> + Name="Util"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\Util.h"/> - + Name="Source Files"/> + Name="Timer"> + Name="Header Files"> - + RelativePath=".\include\Poco\Util\Timer.h"/> - + RelativePath=".\include\Poco\Util\TimerTask.h"/> - + RelativePath=".\include\Poco\Util\TimerTaskAdapter.h"/> + Name="Source Files"> - + RelativePath=".\src\Timer.cpp"/> - + RelativePath=".\src\TimerTask.cpp"/> + RelativePath="..\DLLVersion.rc"> + + + + + + + ExcludedFromBuild="true"> + Name="VCResourceCompilerTool"/> + ExcludedFromBuild="true"> + Name="VCResourceCompilerTool"/> + ExcludedFromBuild="true"> + Name="VCResourceCompilerTool"/> + ExcludedFromBuild="true"> + Name="VCResourceCompilerTool"/> - - + diff --git a/Util/Util_x64_vs100.vcxproj b/Util/Util_x64_vs100.vcxproj index 537dbd31a..d6ae82248 100644 --- a/Util/Util_x64_vs100.vcxproj +++ b/Util/Util_x64_vs100.vcxproj @@ -332,8 +332,10 @@ + true true true + true true true diff --git a/Util/Util_x64_vs100.vcxproj.filters b/Util/Util_x64_vs100.vcxproj.filters index 2bda32415..d0c3c708d 100644 --- a/Util/Util_x64_vs100.vcxproj.filters +++ b/Util/Util_x64_vs100.vcxproj.filters @@ -2,58 +2,58 @@ - {6b023ad6-eff0-42a6-87c2-2ae17ac4a2d1} + {036d46f5-89d8-4e4b-85eb-d44cfda1ba3d} - {f4ab6dd2-c4a7-4dc5-8c9b-6a972b90a65d} + {4b677de1-7f65-4d38-8ccf-1a23c6fb19fb} - {ff8531a3-23c8-403b-aa10-c9a5bef65a24} + {c7d72b5c-ff53-4e87-bf85-bc104dd5ad8d} - {4e614de4-8711-47c9-9ba7-a098f453030c} + {35cdceb2-a832-4073-a632-e7d17fa94023} - {4549e18b-9cae-4dc0-b69d-a68b61343312} + {132ee63c-10fd-4d84-9d2b-db1329742dc3} - {f2351900-8afd-47ad-8527-2b3723ea4779} + {2237ea42-bd0a-4f5a-8655-476ff0804dfe} - {7a0de132-5874-424d-b1fb-b988d82530bf} + {92a03b64-ed4f-4bf1-be0e-35536fc7573a} - {ce01c24b-f6b9-43fc-8c2f-e85119f664f7} + {408f3bec-02d2-4027-8fc7-b4492386cf16} - {b078972e-b6b6-454e-9972-7689510ff4f5} + {3b106f29-7323-475c-8041-900ef6a29280} - {4b1fc310-c77f-4010-bf05-b333efc1133a} + {5f0a32d8-37be-4ba6-80eb-89ea4cc6e3df} - {ffb070d7-8c44-4178-89ce-465f108ecfc2} + {7aa1e2cc-8a5e-4388-a6bb-e5c82fd7d4e1} - {a3eb2d1a-7e3c-4830-997a-f64e358cd137} + {5b71700f-0f64-43aa-a658-c434371028b2} - {e0a82fbf-eddf-4c43-a917-3ae8963bf6f2} + {d1759f4e-b87c-4fd6-bb48-262100634c5b} - {6b9993c1-425f-4ce9-a360-65a8a3677814} + {7a55108b-88a4-499d-9b41-314b2546398c} - {5b6116cd-1974-43ef-ae41-abf5cba45908} + {8079d3bc-efd0-408d-ab53-18cd5d117841} - {23729e57-f3f8-456a-80f6-81965aa2dfac} + {0ba45244-9755-40fd-b012-9c732d57f7f7} - {d6f5326e-5810-4b54-a025-5920c3aa6d85} + {a1ac1710-8209-487e-8c9a-c560f1d96b40} - {6d4d2bc8-c96d-4e62-a4f5-44651194ec05} + {d1a116b1-ab30-422c-b452-d34a96b7a516} diff --git a/Util/Util_x64_vs110.vcxproj.filters b/Util/Util_x64_vs110.vcxproj.filters index fb0f22360..1a3ff9892 100644 --- a/Util/Util_x64_vs110.vcxproj.filters +++ b/Util/Util_x64_vs110.vcxproj.filters @@ -2,58 +2,58 @@ - {4c938dec-886a-4f6a-9ed5-4ca1657dbb99} + {bade3c55-c1bd-4ebe-b737-3fbc5dc66fd3} - {4787091a-0354-479e-a461-506d8a10561a} + {120300c8-7e5b-4777-af35-4c8bf8ff969d} - {b6a1fc30-ca3f-4aa6-ba85-44236719b644} + {2921dee4-ef74-462e-aa7a-09b67189602c} - {7c5e16b0-aeed-4edc-a833-e63222608753} + {2fdeb9d5-ce29-426c-928d-366bad038937} - {082b5405-76ba-4702-bd37-0ad2a4d7322b} + {5b2e3311-f302-452d-9e86-d588c39054eb} - {e1b1df08-f3f9-41d7-a4b9-01c5be32b9f0} + {cf84b45e-e4d3-418e-9fdf-734beed9f3ab} - {8c5319cc-29c7-4ffd-8d62-8e473eea41da} + {20086d2b-ac13-4afd-9ef4-808a9a3697e8} - {a5b7fd99-b18f-421b-ab5d-039165656b0d} + {2d315f08-c88e-4688-a36c-46259b2613c5} - {460de766-40ce-4cf7-9c0b-d8ac1310f150} + {b9c29617-dfcc-45dd-bf9e-16c6e579c868} - {5095120f-8346-4d3c-bde1-e9f1bee4127d} + {df5bd95b-45df-47bd-8f52-fe9fe6993b51} - {9e27a9f0-cad5-465c-a634-63b05d50cc54} + {3a9fb72c-a13e-4af3-9d6c-e33fd97f715f} - {b7cfb77b-6cbe-4550-9069-dfde6945b109} + {cec6a8a7-dff4-487e-b45c-44de7aa249fa} - {659bdab4-9562-434f-a0f3-fe23549c8dd1} + {ae9de40a-1295-4502-be45-df2204dab7a5} - {4ba7a51a-8b12-4bb5-939d-3b478c7e5568} + {86a863a9-64f0-48ca-94d6-4a5714b642e4} - {7cc4bd54-d915-4f8c-a58e-0b803da6da9e} + {d08cf8a5-6414-4c8e-9c20-020bd5e61009} - {d7c1b76f-6913-4f4a-9e3a-dd3e2329f0d8} + {06edfebf-c76b-466e-adcc-b98ff3a9ed82} - {f707c2cd-4c56-47b2-8a84-9e8af1b8edef} + {74b30ba5-2840-470a-9af4-db4d06ed89a2} - {e4b18ce1-b54c-43f4-b052-c62055dbe030} + {b9155cbc-8cef-45cc-87af-6c4bb5fad041} diff --git a/Util/Util_x64_vs90.vcproj b/Util/Util_x64_vs90.vcproj index 17138de63..6d52577ad 100644 --- a/Util/Util_x64_vs90.vcproj +++ b/Util/Util_x64_vs90.vcproj @@ -31,7 +31,7 @@ + Name="debug_shared|x64" + ExcludedFromBuild="true"> + Name="release_shared|x64" + ExcludedFromBuild="true"> diff --git a/Util/src/JSONConfiguration.cpp b/Util/src/JSONConfiguration.cpp index 1a0e84a92..2b830ef28 100644 --- a/Util/src/JSONConfiguration.cpp +++ b/Util/src/JSONConfiguration.cpp @@ -132,11 +132,11 @@ void JSONConfiguration::getIndexes(std::string& name, std::vector& indexes) { if ( firstOffset == -1 ) { - firstOffset = matches[0].offset; + firstOffset = static_cast(matches[0].offset); } std::string num = name.substr(matches[1].offset, matches[1].length); indexes.push_back(NumberParser::parse(num)); - offset = matches[0].offset + matches[0].length; + offset = static_cast(matches[0].offset + matches[0].length); } if ( firstOffset != -1 ) @@ -305,7 +305,7 @@ void JSONConfiguration::setValue(const std::string& key, const Poco::DynamicAny& JSON::Array::Ptr nextArray = arr->getArray(*it); if ( nextArray.isNull() ) { - for(int i = arr->size(); i <= *it; ++i) + for(int i = static_cast(arr->size()); i <= *it; ++i) { Poco::DynamicAny nullValue; arr->add(nullValue);