ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [46/50] [abbrv] ignite git commit: Fix for C++ compiliation.
Date Mon, 13 Mar 2017 09:07:53 GMT
Fix for C++ compiliation.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75a4077f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75a4077f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75a4077f

Branch: refs/heads/ignite-4768
Commit: 75a4077f77457187f4a08644d1f7e5db3d74a17f
Parents: e18fcda
Author: Igor Sapego <isapego@gridgain.com>
Authored: Fri Mar 10 14:57:02 2017 +0300
Committer: Igor Sapego <isapego@gridgain.com>
Committed: Fri Mar 10 14:57:02 2017 +0300

----------------------------------------------------------------------
 modules/platforms/cpp/core-test/src/test_utils.cpp          | 6 +++---
 .../cpp/core/include/ignite/impl/interop/interop_target.h   | 2 +-
 modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp    | 8 ++++----
 modules/platforms/cpp/jni/include/ignite/jni/utils.h        | 9 +++++++++
 modules/platforms/cpp/jni/os/linux/src/utils.cpp            | 6 ------
 modules/platforms/cpp/jni/os/win/src/utils.cpp              | 6 ------
 6 files changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/75a4077f/modules/platforms/cpp/core-test/src/test_utils.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/test_utils.cpp b/modules/platforms/cpp/core-test/src/test_utils.cpp
index b706511..7323028 100644
--- a/modules/platforms/cpp/core-test/src/test_utils.cpp
+++ b/modules/platforms/cpp/core-test/src/test_utils.cpp
@@ -37,12 +37,12 @@ namespace ignite_test
         cfg.jvmOpts.push_back("-DIGNITE_CONSOLE_APPENDER=false");
         cfg.jvmOpts.push_back("-DIGNITE_UPDATE_NOTIFIER=false");
 
-        bool homeFound;
-        std::string home = jni::ResolveIgniteHome(0, &homeFound);
+        std::string home;
+        bool homeFound = jni::ResolveIgniteHome("", home);
 
         assert(homeFound);
 
-        cfg.jvmClassPath = jni::CreateIgniteClasspath(0, &home, true);
+        cfg.jvmClassPath = jni::CreateIgniteHomeClasspath(home, true);
 
 #ifdef IGNITE_TESTS_32
         cfg.jvmInitMem = 256;

http://git-wip-us.apache.org/repos/asf/ignite/blob/75a4077f/modules/platforms/cpp/core/include/ignite/impl/interop/interop_target.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/impl/interop/interop_target.h b/modules/platforms/cpp/core/include/ignite/impl/interop/interop_target.h
index 7ab6a6c..5ce8cfa 100644
--- a/modules/platforms/cpp/core/include/ignite/impl/interop/interop_target.h
+++ b/modules/platforms/cpp/core/include/ignite/impl/interop/interop_target.h
@@ -129,7 +129,7 @@ namespace ignite
                  * @param err Error.
                  * @return Operation result.
                  */
-                OperationResult InStreamOutLong(int32_t opType, InteropMemory& outInMem,
IgniteError* err);
+                OperationResult InStreamOutLong(int32_t opType, InteropMemory& outInMem,
IgniteError& err);
 
                 /**
                 * Internal out-in operation.

http://git-wip-us.apache.org/repos/asf/ignite/blob/75a4077f/modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp b/modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp
index a8c1c6b..dfef8e4 100644
--- a/modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp
+++ b/modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp
@@ -355,9 +355,9 @@ namespace ignite
 
                 out.Synchronize();
 
-                InStreamOutLong(OP_LOAD_CACHE, *mem.Get(), &err);
+                InStreamOutLong(OP_LOAD_CACHE, *mem.Get(), err);
 
-                IgniteError::SetError(jniErr.code, jniErr.errCls, jniErr.errMsg, &err);
+                IgniteError::SetError(jniErr.code, jniErr.errCls, jniErr.errMsg, err);
             }
 
             void CacheImpl::LocalLoadCache(IgniteError & err)
@@ -376,9 +376,9 @@ namespace ignite
 
                 out.Synchronize();
 
-                InStreamOutLong(OP_LOC_LOAD_CACHE, *mem.Get(), &err);
+                InStreamOutLong(OP_LOC_LOAD_CACHE, *mem.Get(), err);
 
-                IgniteError::SetError(jniErr.code, jniErr.errCls, jniErr.errMsg, &err);
+                IgniteError::SetError(jniErr.code, jniErr.errCls, jniErr.errMsg, err);
             }
 
             struct DummyQry { void Write(BinaryRawWriter&) const { }};

http://git-wip-us.apache.org/repos/asf/ignite/blob/75a4077f/modules/platforms/cpp/jni/include/ignite/jni/utils.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/jni/include/ignite/jni/utils.h b/modules/platforms/cpp/jni/include/ignite/jni/utils.h
index bbd461d..a6eb37a 100644
--- a/modules/platforms/cpp/jni/include/ignite/jni/utils.h
+++ b/modules/platforms/cpp/jni/include/ignite/jni/utils.h
@@ -150,6 +150,15 @@ namespace ignite
         IGNITE_IMPORT_EXPORT bool LoadJvmLibrary(const std::string& path);
 
         /**
+         * Helper function to create classpath based on Ignite home directory.
+         *
+         * @param home Home directory; expected to be valid.
+         * @param forceTest Force test classpath.
+         * @return Classpath.
+         */
+        IGNITE_IMPORT_EXPORT std::string CreateIgniteHomeClasspath(const std::string&
home, bool forceTest);
+
+        /**
          * Create Ignite classpath based on user input directory.
          *
          * @param usrCp User's classpath.

http://git-wip-us.apache.org/repos/asf/ignite/blob/75a4077f/modules/platforms/cpp/jni/os/linux/src/utils.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/jni/os/linux/src/utils.cpp b/modules/platforms/cpp/jni/os/linux/src/utils.cpp
index 924779c..e74e4e0 100644
--- a/modules/platforms/cpp/jni/os/linux/src/utils.cpp
+++ b/modules/platforms/cpp/jni/os/linux/src/utils.cpp
@@ -234,12 +234,6 @@ namespace ignite
             return res;
         }
 
-        /**
-         * Helper function to create classpath based on Ignite home directory.
-         *
-         * @param home Home directory; expected to be valid.
-         * @param forceTest Force test classpath.
-         */
         std::string CreateIgniteHomeClasspath(const std::string& home, bool forceTest)
         {
             std::string res = std::string();

http://git-wip-us.apache.org/repos/asf/ignite/blob/75a4077f/modules/platforms/cpp/jni/os/win/src/utils.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/jni/os/win/src/utils.cpp b/modules/platforms/cpp/jni/os/win/src/utils.cpp
index 3b2033b..17ab6c3 100644
--- a/modules/platforms/cpp/jni/os/win/src/utils.cpp
+++ b/modules/platforms/cpp/jni/os/win/src/utils.cpp
@@ -209,12 +209,6 @@ namespace ignite
             return res;
         }
 
-        /**
-         * Helper function to create classpath based on Ignite home directory.
-         *
-         * @param home Home directory; expected to be valid.
-         * @param forceTest Force test classpath.
-         */
         std::string CreateIgniteHomeClasspath(const std::string& home, bool forceTest)
         {
             std::string res;


Mime
View raw message