diff --git a/CMakeLists.txt b/CMakeLists.txt index 74db32235..d2593826f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ SET(RELEASE_NAME "Unstable-trunk") SET(PROJECT_VERSION ${COMPLETE_VERSION}) #set(COMMON_CXX "-Wall -Wno-sign-compare") -set(DEBUG_CXX_FLAGS "${COMMON_CXX} ${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") -set(RELEASE_CXX_FLAGS "${COMMON_CXX} ${CMAKE_CXX_FLAGS_MINSIZEREL}") +set(DEBUG_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") +set(RELEASE_CXX_FLAGS "${CMAKE_CXX_FLAGS_MINSIZEREL}") option(ENABLE_TESTS "Set to OFF|ON (default is OFF) to control build of POCO tests & samples" OFF) @@ -50,8 +50,14 @@ include(contrib/cmake/FindApache2.cmake) # OS Detection if(CMAKE_SYSTEM MATCHES "Windows") - add_definitions( -DPOCO_OS_FAMILY_WINDOWS -DPOCO_WIN32_UTF8) - set(SYSLIBS iphlpapi gdi32 odbc32) + + add_definitions( -DPOCO_OS_FAMILY_WINDOWS) + set(SYSLIBS iphlpapi gdi32 odbc32) + + if (CMAKE_C_COMPILER_ID MATCHES "MSVC") + message(STATUS "XXX: MS Visual Compiler detected") + endif (CMAKE_C_COMPILER_ID MATCHES "MSVC") + endif(CMAKE_SYSTEM MATCHES "Windows") if (CMAKE_SYSTEM MATCHES "Linux") @@ -69,14 +75,14 @@ if (CMAKE_SYSTEM MATCHES "SunOS") endif(CMAKE_SYSTEM MATCHES "SunOS") if (CMAKE_COMPILER_IS_MINGW) - add_definitions(-DWC_NO_BEST_FIT_CHARS=0x400) + add_definitions(-DWC_NO_BEST_FIT_CHARS=0x400 -DPOCO_WIN32_UTF8) add_definitions(-mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DODBCVER=0x0300 -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED ) link_directories(/usr/local/lib /usr/lib) include_directories(/usr/local/include /usr/include) endif (CMAKE_COMPILER_IS_MINGW) if (CMAKE_COMPILER_IS_CYGWIN) -# add_definitions(-DWC_NO_BEST_FIT_CHARS=0x400) +# add_definitions(-DWC_NO_BEST_FIT_CHARS=0x400 -DPOCO_WIN32_UTF8) endif (CMAKE_COMPILER_IS_CYGWIN) # SunPro C++ @@ -129,7 +135,12 @@ SET(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr/local") INCLUDE(CPack) +set(DEBUG_CXX_FLAGS "") +set(RELEASE_CXX_FLAGS "") +set(CXX_FLAGS "") +set(C_FLAGS "") + message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") -message(STATUS "XXX: CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}") -message(STATUS "XXX: CMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}") -message(STATUS "XXX: CMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}") \ No newline at end of file +message(STATUS "XXX: DEBUG =${DEBUG_CXX_FLAGS}") +message(STATUS "XXX: RELEASE=${RELEASE_CXX_FLAGS}") + diff --git a/Data/Data_vs100.vcxproj b/Data/Data_vs100.vcxproj index 3599eaadd..4cfa98eda 100644 --- a/Data/Data_vs100.vcxproj +++ b/Data/Data_vs100.vcxproj @@ -1,329 +1,363 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - Data - {240E83C3-368D-11DB-9FBC-00123FC423B5} - Data - Win32Proj - - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.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 - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoDatad.dll - true - true - ..\bin\PocoDatad.pdb - ..\lib;%(AdditionalLibraryDirectories) - Console - ..\lib\PocoDatad.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\bin\PocoData.dll - true - false - ..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\lib\PocoData.lib - MachineX86 - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\lib\PocoDatamtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoDatamtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoDatamt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\lib\PocoDatamdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\lib\PocoDatamdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\lib\PocoDatamd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - %(AdditionalDependencies) - ..\lib\PocoDatamd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + Data + {240E83C3-368D-11DB-9FBC-00123FC423B5} + Data + Win32Proj + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.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 + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoDatad.dll + true + true + ..\bin\PocoDatad.pdb + ..\lib;%(AdditionalLibraryDirectories) + Console + ..\lib\PocoDatad.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\bin\PocoData.dll + true + false + ..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\lib\PocoData.lib + MachineX86 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\lib\PocoDatamtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoDatamtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoDatamt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\lib\PocoDatamdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\lib\PocoDatamdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\lib\PocoDatamd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + %(AdditionalDependencies) + ..\lib\PocoDatamd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Data/Data_vs100.vcxproj.filters b/Data/Data_vs100.vcxproj.filters index a710c824f..2d399eca1 100644 --- a/Data/Data_vs100.vcxproj.filters +++ b/Data/Data_vs100.vcxproj.filters @@ -1,189 +1,291 @@ - - - - - {be23cad9-48a2-49cd-ad09-5519919fdf69} - - - {0e3cfe8b-efbf-4679-823e-2294e350b954} - - - {972be6f9-955a-4b04-9036-42d0a731fb88} - - - {94ac43f0-ed08-4b33-a2b2-80e745bfdd96} - - - {ee89f0a2-10a7-40c0-be6f-de09b2e844c7} - - - {60881336-74f0-4876-8ed8-ff1817997b8e} - - - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - DataCore\Header Files - - - SessionPooling\Header Files - - - SessionPooling\Header Files - - - SessionPooling\Header Files - - - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - DataCore\Source Files - - - SessionPooling\Source Files - - - SessionPooling\Source Files - - - SessionPooling\Source Files - - + + + + + {be23cad9-48a2-49cd-ad09-5519919fdf69} + + + {0e3cfe8b-efbf-4679-823e-2294e350b954} + + + {972be6f9-955a-4b04-9036-42d0a731fb88} + + + {94ac43f0-ed08-4b33-a2b2-80e745bfdd96} + + + {ee89f0a2-10a7-40c0-be6f-de09b2e844c7} + + + {60881336-74f0-4876-8ed8-ff1817997b8e} + + + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + SessionPooling\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + DataCore\Header Files + + + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + SessionPooling\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + DataCore\Source Files + + + SessionPooling\Source Files + + \ No newline at end of file diff --git a/Data/ODBC/ODBC_vs100.vcxproj b/Data/ODBC/ODBC_vs100.vcxproj index 4835636db..0bec6b870 100644 --- a/Data/ODBC/ODBC_vs100.vcxproj +++ b/Data/ODBC/ODBC_vs100.vcxproj @@ -1,305 +1,306 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - ODBC - {1B29820D-375F-11DB-837B-00123FC423B5} - ODBC - Win32Proj - - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.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 - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\bin\PocoDataODBCd.dll - true - true - ..\..\bin\PocoDataODBCd.pdb - ..\..\lib;%(AdditionalLibraryDirectories) - Console - ..\..\lib\PocoDataODBCd.lib - MachineX86 - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\bin\PocoDataODBC.dll - true - false - ..\..\lib;%(AdditionalLibraryDirectories) - Console - true - true - ..\..\lib\PocoDataODBC.lib - MachineX86 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - ..\..\lib\PocoDataODBCmtd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\..\lib\PocoDataODBCmtd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - %(DisableSpecificWarnings) - - - ..\..\lib\PocoDataODBCmt.lib - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - ..\..\lib\PocoDataODBCmdd.pdb - Level3 - EditAndContinue - Default - %(DisableSpecificWarnings) - - - ..\..\lib\PocoDataODBCmdd.lib - - - - - Disabled - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - ..\..\lib\PocoDataODBCmd.pdb - Level3 - - Default - %(DisableSpecificWarnings) - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\lib\PocoDataODBCmd.lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + debug_shared + Win32 + + + debug_static_md + Win32 + + + debug_static_mt + Win32 + + + release_shared + Win32 + + + release_static_md + Win32 + + + release_static_mt + Win32 + + + + ODBC + {1B29820D-375F-11DB-837B-00123FC423B5} + ODBC + Win32Proj + + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.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 + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataODBCd.dll + true + true + ..\..\bin\PocoDataODBCd.pdb + ..\..\lib;%(AdditionalLibraryDirectories) + Console + ..\..\lib\PocoDataODBCd.lib + MachineX86 + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\bin\PocoDataODBC.dll + true + false + ..\..\lib;%(AdditionalLibraryDirectories) + Console + true + true + ..\..\lib\PocoDataODBC.lib + MachineX86 + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\..\lib\PocoDataODBCmtd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\..\lib\PocoDataODBCmtd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + %(DisableSpecificWarnings) + + + ..\..\lib\PocoDataODBCmt.lib + + + + + Disabled + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\..\lib\PocoDataODBCmdd.pdb + Level3 + EditAndContinue + Default + %(DisableSpecificWarnings) + + + ..\..\lib\PocoDataODBCmdd.lib + + + + + Disabled + OnlyExplicitInline + true + Speed + true + .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + ..\..\lib\PocoDataODBCmd.pdb + Level3 + + Default + %(DisableSpecificWarnings) + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\lib\PocoDataODBCmd.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Data/ODBC/ODBC_vs100.vcxproj.filters b/Data/ODBC/ODBC_vs100.vcxproj.filters index 724d26cc0..100cbad7a 100644 --- a/Data/ODBC/ODBC_vs100.vcxproj.filters +++ b/Data/ODBC/ODBC_vs100.vcxproj.filters @@ -1,108 +1,111 @@ - - - - - {db5f4f77-bbb7-453a-8e73-2ea3605a3f6e} - - - {23ed131f-6343-4cf5-b23f-2b53b3282630} - - - {0614dd35-c076-4922-9c14-658e427e6189} - - - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - ODBC\Header Files - - - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - - ODBC\Source Files - - + + + + + {db5f4f77-bbb7-453a-8e73-2ea3605a3f6e} + + + {23ed131f-6343-4cf5-b23f-2b53b3282630} + + + {0614dd35-c076-4922-9c14-658e427e6189} + + + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + ODBC\Header Files + + + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + + ODBC\Source Files + + \ No newline at end of file diff --git a/Data/ODBC/src/Binder.cpp b/Data/ODBC/src/Binder.cpp index 4ce968e54..a3474ef4b 100644 --- a/Data/ODBC/src/Binder.cpp +++ b/Data/ODBC/src/Binder.cpp @@ -251,7 +251,7 @@ void Binder::bind(std::size_t pos, const NullData& val, Direction dir) if (isOutBound(dir) || !isInBound(dir)) throw NotImplementedException("NULL parameter type can only be inbound."); - _inParams.insert(ParamMap::value_type(0, 0)); + _inParams.insert(ParamMap::value_type(SQLPOINTER(0), SQLINTEGER(0))); SQLLEN* pLenIn = new SQLLEN; *pLenIn = SQL_NULL_DATA; diff --git a/Data/ODBC/testsuite/src/SQLExecutor.cpp b/Data/ODBC/testsuite/src/SQLExecutor.cpp index 20b0fa48c..c0c9d0189 100644 --- a/Data/ODBC/testsuite/src/SQLExecutor.cpp +++ b/Data/ODBC/testsuite/src/SQLExecutor.cpp @@ -2634,7 +2634,7 @@ void SQLExecutor::internalExtraction() int i = rset.value(0,0); assert (1 == i); - std::string s = rset.value(0,0); + std::string s = rset.value(0,0).convert(); assert ("1" == s); int a = rset.value(0,2); diff --git a/Data/include/Poco/Data/DynamicDateTime.h b/Data/include/Poco/Data/DynamicDateTime.h index eec7b875f..a96899cce 100644 --- a/Data/include/Poco/Data/DynamicDateTime.h +++ b/Data/include/Poco/Data/DynamicDateTime.h @@ -41,6 +41,8 @@ #include "Poco/Data/Data.h" +#include "Poco/Data/Date.h" +#include "Poco/Data/Time.h" #include "Poco/Dynamic/Var.h" diff --git a/Data/include/Poco/Data/DynamicLOB.h b/Data/include/Poco/Data/DynamicLOB.h index 19b9f6449..6640fd52b 100644 --- a/Data/include/Poco/Data/DynamicLOB.h +++ b/Data/include/Poco/Data/DynamicLOB.h @@ -41,6 +41,7 @@ #include "Poco/Data/Data.h" +#include "Poco/Data/LOB.h" #include "Poco/Dynamic/Var.h" diff --git a/Data/src/ArchiveStrategy.cpp b/Data/src/ArchiveStrategy.cpp index ce9c254e0..b95a16964 100644 --- a/Data/src/ArchiveStrategy.cpp +++ b/Data/src/ArchiveStrategy.cpp @@ -35,7 +35,7 @@ #include "Poco/Data/ArchiveStrategy.h" - +#include "Poco/Ascii.h" namespace Poco { namespace Data { @@ -43,7 +43,6 @@ namespace Data { using namespace Keywords; - // // ArchiveStrategy // @@ -142,11 +141,11 @@ void ArchiveByAgeStrategy::setThreshold(const std::string& age) std::string::const_iterator it = age.begin(); std::string::const_iterator end = age.end(); int n = 0; - while (it != end && std::isspace(*it)) ++it; - while (it != end && std::isdigit(*it)) { n *= 10; n += *it++ - '0'; } - while (it != end && std::isspace(*it)) ++it; + while (it != end && Ascii::isSpace(*it)) ++it; + while (it != end && Ascii::isDigit(*it)) { n *= 10; n += *it++ - '0'; } + while (it != end && Ascii::isSpace(*it)) ++it; std::string unit; - while (it != end && std::isalpha(*it)) unit += *it++; + while (it != end && Ascii::isAlpha(*it)) unit += *it++; Timespan::TimeDiff factor = Timespan::SECONDS; if (unit == "minutes")