IGNITE-1786: Debug functions fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a5b73aa7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a5b73aa7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a5b73aa7 Branch: refs/heads/ignite-1786 Commit: a5b73aa76a326625efa99d3f96b47181c41a3657 Parents: b0b2c90 Author: isapego <[email protected]> Authored: Fri Jan 15 16:53:07 2016 +0300 Committer: isapego <[email protected]> Committed: Fri Jan 15 16:53:07 2016 +0300 ---------------------------------------------------------------------- .../odbc-driver/include/ignite/odbc/config/connection_info.h | 2 +- .../odbc/odbc-driver/include/ignite/odbc/meta/column_meta.h | 2 +- .../cpp/odbc/odbc-driver/include/ignite/odbc/type_traits.h | 2 +- .../cpp/odbc/odbc-driver/include/ignite/odbc/utility.h | 2 +- .../cpp/odbc/odbc-driver/project/vs/odbc-driver.vcxproj | 8 ++++---- .../cpp/odbc/odbc-driver/src/config/connection_info.cpp | 2 +- .../platforms/cpp/odbc/odbc-driver/src/meta/column_meta.cpp | 2 +- modules/platforms/cpp/odbc/odbc-driver/src/type_traits.cpp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a5b73aa7/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/config/connection_info.h ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/config/connection_info.h b/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/config/connection_info.h index 3cdc1bb..7f2738c 100644 --- a/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/config/connection_info.h +++ b/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/config/connection_info.h @@ -40,7 +40,7 @@ namespace ignite /** Info type. */ typedef unsigned short InfoType; -#ifdef _DEBUG +#ifdef ODBC_DEBUG /** * Convert type to string containing its name. * Debug function. http://git-wip-us.apache.org/repos/asf/ignite/blob/a5b73aa7/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/meta/column_meta.h ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/meta/column_meta.h b/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/meta/column_meta.h index e90070e..9bc7227 100644 --- a/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/meta/column_meta.h +++ b/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/meta/column_meta.h @@ -38,7 +38,7 @@ namespace ignite class ColumnMeta { public: -#ifdef _DEBUG +#ifdef ODBC_DEBUG /** * Convert attribute ID to string containing its name. * Debug function. http://git-wip-us.apache.org/repos/asf/ignite/blob/a5b73aa7/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/type_traits.h ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/type_traits.h b/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/type_traits.h index ba7b78a..230a4ec 100644 --- a/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/type_traits.h +++ b/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/type_traits.h @@ -28,7 +28,7 @@ namespace ignite { namespace type_traits { -#ifdef _DEBUG +#ifdef ODBC_DEBUG /** * Convert statement attribute ID to string containing its name. * Debug function. http://git-wip-us.apache.org/repos/asf/ignite/blob/a5b73aa7/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/utility.h ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/utility.h b/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/utility.h index dbaefc9..922e5e2 100644 --- a/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/utility.h +++ b/modules/platforms/cpp/odbc/odbc-driver/include/ignite/odbc/utility.h @@ -41,7 +41,7 @@ void logInit(const char*); # define LOG_MSG(fmt, ...) \ do { \ - logInit("D:\\odbc.log"); \ + logInit(ODBC_LOG_PATH); \ fprintf(log_file, "%s: " fmt, __FUNCTION__, __VA_ARGS__); \ fflush(log_file); \ } while (false) http://git-wip-us.apache.org/repos/asf/ignite/blob/a5b73aa7/modules/platforms/cpp/odbc/odbc-driver/project/vs/odbc-driver.vcxproj ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc/odbc-driver/project/vs/odbc-driver.vcxproj b/modules/platforms/cpp/odbc/odbc-driver/project/vs/odbc-driver.vcxproj index 2f48e8d..3c701be 100644 --- a/modules/platforms/cpp/odbc/odbc-driver/project/vs/odbc-driver.vcxproj +++ b/modules/platforms/cpp/odbc/odbc-driver/project/vs/odbc-driver.vcxproj @@ -90,7 +90,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>false</SDLCheck> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\..\common\include;$(ProjectDir)\..\..\..\..\common\os\win\include;$(ProjectDir)\..\..\src;$(ProjectDir)\..\..\os\win;$(ProjectDir)\..\..\..\..\binary\include;$(ProjectDir)\..\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;ODBC_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -104,7 +104,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>false</SDLCheck> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\..\common\include;$(ProjectDir)\..\..\..\..\common\os\win\include;$(ProjectDir)\..\..\src;$(ProjectDir)\..\..\os\win;$(ProjectDir)\..\..\..\..\binary\include;$(ProjectDir)\..\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;ODBC_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -120,7 +120,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>false</SDLCheck> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\..\common\include;$(ProjectDir)\..\..\..\..\common\os\win\include;$(ProjectDir)\..\..\src;$(ProjectDir)\..\..\os\win;$(ProjectDir)\..\..\..\..\binary\include;$(ProjectDir)\..\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;ODBC_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -138,7 +138,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>false</SDLCheck> <AdditionalIncludeDirectories>$(ProjectDir)\..\..\..\..\common\include;$(ProjectDir)\..\..\..\..\common\os\win\include;$(ProjectDir)\..\..\src;$(ProjectDir)\..\..\os\win;$(ProjectDir)\..\..\..\..\binary\include;$(ProjectDir)\..\..\..\..\binary\os\win\include;$(ProjectDir)\..\..\include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;ODBC_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> http://git-wip-us.apache.org/repos/asf/ignite/blob/a5b73aa7/modules/platforms/cpp/odbc/odbc-driver/src/config/connection_info.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc/odbc-driver/src/config/connection_info.cpp b/modules/platforms/cpp/odbc/odbc-driver/src/config/connection_info.cpp index 05f50aa..0e8e748 100644 --- a/modules/platforms/cpp/odbc/odbc-driver/src/config/connection_info.cpp +++ b/modules/platforms/cpp/odbc/odbc-driver/src/config/connection_info.cpp @@ -42,7 +42,7 @@ namespace ignite namespace config { -#ifdef _DEBUG +#ifdef ODBC_DEBUG #define DBG_STR_CASE(x) case x: return #x http://git-wip-us.apache.org/repos/asf/ignite/blob/a5b73aa7/modules/platforms/cpp/odbc/odbc-driver/src/meta/column_meta.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc/odbc-driver/src/meta/column_meta.cpp b/modules/platforms/cpp/odbc/odbc-driver/src/meta/column_meta.cpp index ab12aad..114dd03 100644 --- a/modules/platforms/cpp/odbc/odbc-driver/src/meta/column_meta.cpp +++ b/modules/platforms/cpp/odbc/odbc-driver/src/meta/column_meta.cpp @@ -27,7 +27,7 @@ namespace ignite namespace meta { -#ifdef _DEBUG +#ifdef ODBC_DEBUG #define DBG_STR_CASE(x) case x: return #x http://git-wip-us.apache.org/repos/asf/ignite/blob/a5b73aa7/modules/platforms/cpp/odbc/odbc-driver/src/type_traits.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc/odbc-driver/src/type_traits.cpp b/modules/platforms/cpp/odbc/odbc-driver/src/type_traits.cpp index 8cf9aff..03e525f 100644 --- a/modules/platforms/cpp/odbc/odbc-driver/src/type_traits.cpp +++ b/modules/platforms/cpp/odbc/odbc-driver/src/type_traits.cpp @@ -59,7 +59,7 @@ namespace ignite const std::string SqlTypeName::GUID("GUID"); -#ifdef _DEBUG +#ifdef ODBC_DEBUG #define DBG_STR_CASE(x) case x: return #x
