You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/09/12 08:26:43 UTC
[29/46] ignite git commit: IGNITE-3705: CPP: Fixed warnings for MSVC
14.0. This closes #1038.
IGNITE-3705: CPP: Fixed warnings for MSVC 14.0. This closes #1038.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d672f298
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d672f298
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d672f298
Branch: refs/heads/master
Commit: d672f2989582fe7259260a25f0a8ed26f31f5b09
Parents: b5121ad
Author: Igor Sapego <is...@gridgain.com>
Authored: Wed Sep 7 14:28:06 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 7 14:28:06 2016 +0300
----------------------------------------------------------------------
modules/platforms/cpp/common/include/ignite/ignite_error.h | 9 +++++++++
modules/platforms/cpp/odbc/os/win/src/system/ui/window.cpp | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d672f298/modules/platforms/cpp/common/include/ignite/ignite_error.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/common/include/ignite/ignite_error.h b/modules/platforms/cpp/common/include/ignite/ignite_error.h
index a41a42f..17a24dc 100644
--- a/modules/platforms/cpp/common/include/ignite/ignite_error.h
+++ b/modules/platforms/cpp/common/include/ignite/ignite_error.h
@@ -72,6 +72,11 @@
throw ignite::IgniteError(code, stream.str().c_str()); \
}
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable : 4275)
+#endif //_MSC_VER
+
namespace ignite
{
namespace java
@@ -282,4 +287,8 @@ namespace ignite
};
}
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif //_MSC_VER
+
#endif //_IGNITE_IGNITE_ERROR
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/d672f298/modules/platforms/cpp/odbc/os/win/src/system/ui/window.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc/os/win/src/system/ui/window.cpp b/modules/platforms/cpp/odbc/os/win/src/system/ui/window.cpp
index 1143f01..aca23eb 100644
--- a/modules/platforms/cpp/odbc/os/win/src/system/ui/window.cpp
+++ b/modules/platforms/cpp/odbc/os/win/src/system/ui/window.cpp
@@ -89,7 +89,7 @@ namespace ignite
width,
height,
parent ? parent->GetHandle() : NULL,
- reinterpret_cast<HMENU>(id),
+ reinterpret_cast<HMENU>(static_cast<ptrdiff_t>(id)),
GetHInstance(),
this
);