You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/01/25 12:55:11 UTC
[09/50] ignite git commit: IGNITE-2223: Fix for tests.
IGNITE-2223: Fix for tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9c904bfd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9c904bfd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9c904bfd
Branch: refs/heads/ignite-1786
Commit: 9c904bfd955c3e09e7983e26a99756016555e0df
Parents: 7e32752
Author: isapego <is...@gridgain.com>
Authored: Mon Jan 11 21:34:26 2016 +0300
Committer: isapego <is...@gridgain.com>
Committed: Mon Jan 11 21:34:26 2016 +0300
----------------------------------------------------------------------
modules/platforms/cpp/odbc/odbc-driver/src/decimal.cpp | 8 ++++----
modules/platforms/cpp/odbc/odbc-driver/src/utility.cpp | 4 ++--
.../cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj | 1 +
.../cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj.filters | 3 +++
4 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c904bfd/modules/platforms/cpp/odbc/odbc-driver/src/decimal.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/odbc-driver/src/decimal.cpp b/modules/platforms/cpp/odbc/odbc-driver/src/decimal.cpp
index 2df48d8..af16747 100644
--- a/modules/platforms/cpp/odbc/odbc-driver/src/decimal.cpp
+++ b/modules/platforms/cpp/odbc/odbc-driver/src/decimal.cpp
@@ -28,7 +28,7 @@ namespace ignite
{
}
- Decimal::Decimal(int32_t scale, const int8_t * mag, int32_t len) :
+ Decimal::Decimal(int32_t scale, const int8_t* mag, int32_t len) :
scale(scale), len(len), magnitude(0)
{
magnitude = new int8_t[len];
@@ -36,7 +36,7 @@ namespace ignite
memcpy(magnitude, mag, len);
}
- Decimal::Decimal(const Decimal & other) :
+ Decimal::Decimal(const Decimal& other) :
scale(other.scale), len(other.len), magnitude(0)
{
magnitude = new int8_t[len];
@@ -69,12 +69,12 @@ namespace ignite
return scale;
}
- const int8_t * Decimal::GetMagnitude() const
+ const int8_t* Decimal::GetMagnitude() const
{
return magnitude;
}
- void swap(Decimal & first, Decimal & second)
+ void swap(Decimal& first, Decimal& second)
{
using std::swap;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c904bfd/modules/platforms/cpp/odbc/odbc-driver/src/utility.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/odbc-driver/src/utility.cpp b/modules/platforms/cpp/odbc/odbc-driver/src/utility.cpp
index 3d30d43..c7210c3 100644
--- a/modules/platforms/cpp/odbc/odbc-driver/src/utility.cpp
+++ b/modules/platforms/cpp/odbc/odbc-driver/src/utility.cpp
@@ -75,9 +75,9 @@ namespace ignite
mag.resize(len);
- reader.ReadInt8Array(mag.data(), mag.size());
+ reader.ReadInt8Array(mag.data(), static_cast<int32_t>(mag.size()));
- Decimal res(scale, mag.data(), mag.size());
+ Decimal res(scale, mag.data(), static_cast<int32_t>(mag.size()));
swap(decimal, res);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c904bfd/modules/platforms/cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj b/modules/platforms/cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj
index ce4ce0b..8c90fa6 100644
--- a/modules/platforms/cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj
+++ b/modules/platforms/cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj
@@ -153,6 +153,7 @@
<ClCompile Include="..\..\..\odbc-driver\src\config\configuration.cpp" />
<ClCompile Include="..\..\..\odbc-driver\src\config\connection_info.cpp" />
<ClCompile Include="..\..\..\odbc-driver\src\cursor.cpp" />
+ <ClCompile Include="..\..\..\odbc-driver\src\decimal.cpp" />
<ClCompile Include="..\..\..\odbc-driver\src\result_page.cpp" />
<ClCompile Include="..\..\..\odbc-driver\src\row.cpp" />
<ClCompile Include="..\..\..\odbc-driver\src\utility.cpp" />
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c904bfd/modules/platforms/cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj.filters
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj.filters b/modules/platforms/cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj.filters
index 7f58082..0591e93 100644
--- a/modules/platforms/cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj.filters
+++ b/modules/platforms/cpp/odbc/odbc-test/project/vs/odbc-test.vcxproj.filters
@@ -61,6 +61,9 @@
<ClCompile Include="..\..\..\odbc-driver\src\app\application_data_buffer.cpp">
<Filter>Externals</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\odbc-driver\src\decimal.cpp">
+ <Filter>Externals</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\teamcity_messages.h">