IGNITE-2678 Fix types in JNI interop for configuration-related methods
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d2e6535d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2e6535d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2e6535d Branch: refs/heads/ignite-2407 Commit: d2e6535deeb217a33c1e79c782bb18d2eae520c8 Parents: a2f66b9 Author: Pavel Tupitsyn <[email protected]> Authored: Wed Feb 17 19:05:23 2016 +0300 Committer: Pavel Tupitsyn <[email protected]> Committed: Wed Feb 17 19:05:23 2016 +0300 ---------------------------------------------------------------------- .../cpp/common/include/ignite/common/exports.h | 6 +++--- .../platforms/cpp/common/include/ignite/common/java.h | 12 ++++++------ modules/platforms/cpp/common/src/exports.cpp | 6 +++--- modules/platforms/cpp/common/src/java.cpp | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d2e6535d/modules/platforms/cpp/common/include/ignite/common/exports.h ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/common/include/ignite/common/exports.h b/modules/platforms/cpp/common/include/ignite/common/exports.h index 15911a6..6f2049d 100644 --- a/modules/platforms/cpp/common/include/ignite/common/exports.h +++ b/modules/platforms/cpp/common/include/ignite/common/exports.h @@ -36,8 +36,8 @@ extern "C" { void* IGNITE_CALL IgniteProcessorCache(gcj::JniContext* ctx, void* obj, char* name); void* IGNITE_CALL IgniteProcessorCreateCache(gcj::JniContext* ctx, void* obj, char* name); void* IGNITE_CALL IgniteProcessorGetOrCreateCache(gcj::JniContext* ctx, void* obj, char* name); - void* IGNITE_CALL IgniteProcessorCreateCacheFromConfig(gcj::JniContext* ctx, void* obj, long memPtr); - void* IGNITE_CALL IgniteProcessorGetOrCreateCacheFromConfig(gcj::JniContext* ctx, void* obj, long memPtr); + void* IGNITE_CALL IgniteProcessorCreateCacheFromConfig(gcj::JniContext* ctx, void* obj, long long memPtr); + void* IGNITE_CALL IgniteProcessorGetOrCreateCacheFromConfig(gcj::JniContext* ctx, void* obj, long long memPtr); void IGNITE_CALL IgniteProcessorDestroyCache(gcj::JniContext* ctx, void* obj, char* name); void* IGNITE_CALL IgniteProcessorAffinity(gcj::JniContext* ctx, void* obj, char* name); void* IGNITE_CALL IgniteProcessorDataStreamer(gcj::JniContext* ctx, void* obj, char* name, bool keepPortable); @@ -50,7 +50,7 @@ extern "C" { void* IGNITE_CALL IgniteProcessorAtomicLong(gcj::JniContext* ctx, void* obj, char* name, long long initVal, bool create); void* IGNITE_CALL IgniteProcessorAtomicSequence(gcj::JniContext* ctx, void* obj, char* name, long long initVal, bool create); void* IGNITE_CALL IgniteProcessorAtomicReference(gcj::JniContext* ctx, void* obj, char* name, long long memPtr, bool create); - void IGNITE_CALL IgniteProcessorGetIgniteConfiguration(gcj::JniContext* ctx, void* obj, long memPtr); + void IGNITE_CALL IgniteProcessorGetIgniteConfiguration(gcj::JniContext* ctx, void* obj, long long memPtr); long long IGNITE_CALL IgniteTargetInStreamOutLong(gcj::JniContext* ctx, void* obj, int opType, long long memPtr); void IGNITE_CALL IgniteTargetInStreamOutStream(gcj::JniContext* ctx, void* obj, int opType, long long inMemPtr, long long outMemPtr); http://git-wip-us.apache.org/repos/asf/ignite/blob/d2e6535d/modules/platforms/cpp/common/include/ignite/common/java.h ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/common/include/ignite/common/java.h b/modules/platforms/cpp/common/include/ignite/common/java.h index ed47bc3..4b79665 100644 --- a/modules/platforms/cpp/common/include/ignite/common/java.h +++ b/modules/platforms/cpp/common/include/ignite/common/java.h @@ -515,10 +515,10 @@ namespace ignite jobject ProcessorCreateCache(jobject obj, const char* name, JniErrorInfo* errInfo); jobject ProcessorGetOrCreateCache(jobject obj, const char* name); jobject ProcessorGetOrCreateCache(jobject obj, const char* name, JniErrorInfo* errInfo); - jobject ProcessorCreateCacheFromConfig(jobject obj, long memPtr); - jobject ProcessorCreateCacheFromConfig(jobject obj, long memPtr, JniErrorInfo* errInfo); - jobject ProcessorGetOrCreateCacheFromConfig(jobject obj, long memPtr); - jobject ProcessorGetOrCreateCacheFromConfig(jobject obj, long memPtr, JniErrorInfo* errInfo); + jobject ProcessorCreateCacheFromConfig(jobject obj, long long memPtr); + jobject ProcessorCreateCacheFromConfig(jobject obj, long long memPtr, JniErrorInfo* errInfo); + jobject ProcessorGetOrCreateCacheFromConfig(jobject obj, long long memPtr); + jobject ProcessorGetOrCreateCacheFromConfig(jobject obj, long long memPtr, JniErrorInfo* errInfo); void ProcessorDestroyCache(jobject obj, const char* name); void ProcessorDestroyCache(jobject obj, const char* name, JniErrorInfo* errInfo); jobject ProcessorAffinity(jobject obj, const char* name); @@ -532,7 +532,7 @@ namespace ignite jobject ProcessorAtomicLong(jobject obj, char* name, long long initVal, bool create); jobject ProcessorAtomicSequence(jobject obj, char* name, long long initVal, bool create); jobject ProcessorAtomicReference(jobject obj, char* name, long long memPtr, bool create); - void ProcessorGetIgniteConfiguration(jobject obj, long memPtr); + void ProcessorGetIgniteConfiguration(jobject obj, long long memPtr); long long TargetInStreamOutLong(jobject obj, int type, long long memPtr, JniErrorInfo* errInfo = NULL); void TargetInStreamOutStream(jobject obj, int opType, long long inMemPtr, long long outMemPtr, JniErrorInfo* errInfo = NULL); @@ -664,7 +664,7 @@ namespace ignite void ExceptionCheck(JNIEnv* env, JniErrorInfo* errInfo); jobject LocalToGlobal(JNIEnv* env, jobject obj); jobject ProcessorCache0(jobject proc, const char* name, jmethodID mthd, JniErrorInfo* errInfo); - jobject ProcessorCacheFromConfig0(jobject proc, long memPtr, jmethodID mthd, JniErrorInfo* errInfo); + jobject ProcessorCacheFromConfig0(jobject proc, long long memPtr, jmethodID mthd, JniErrorInfo* errInfo); }; JNIEXPORT jlong JNICALL JniCacheStoreCreate(JNIEnv *env, jclass cls, jlong envPtr, jlong memPtr); http://git-wip-us.apache.org/repos/asf/ignite/blob/d2e6535d/modules/platforms/cpp/common/src/exports.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/common/src/exports.cpp b/modules/platforms/cpp/common/src/exports.cpp index fff2a16..93fd337 100644 --- a/modules/platforms/cpp/common/src/exports.cpp +++ b/modules/platforms/cpp/common/src/exports.cpp @@ -66,11 +66,11 @@ extern "C" { return ctx->ProcessorGetOrCreateCache(static_cast<jobject>(obj), name); } - void* IGNITE_CALL IgniteProcessorCreateCacheFromConfig(gcj::JniContext* ctx, void* obj, long memPtr) { + void* IGNITE_CALL IgniteProcessorCreateCacheFromConfig(gcj::JniContext* ctx, void* obj, long long memPtr) { return ctx->ProcessorCreateCacheFromConfig(static_cast<jobject>(obj), memPtr); } - void* IGNITE_CALL IgniteProcessorGetOrCreateCacheFromConfig(gcj::JniContext* ctx, void* obj, long memPtr) { + void* IGNITE_CALL IgniteProcessorGetOrCreateCacheFromConfig(gcj::JniContext* ctx, void* obj, long long memPtr) { return ctx->ProcessorGetOrCreateCacheFromConfig(static_cast<jobject>(obj), memPtr); } @@ -122,7 +122,7 @@ extern "C" { return ctx->ProcessorAtomicReference(static_cast<jobject>(obj), name, memPtr, create); } - void IGNITE_CALL IgniteProcessorGetIgniteConfiguration(gcj::JniContext* ctx, void* obj, long memPtr) { + void IGNITE_CALL IgniteProcessorGetIgniteConfiguration(gcj::JniContext* ctx, void* obj, long long memPtr) { return ctx->ProcessorGetIgniteConfiguration(static_cast<jobject>(obj), memPtr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/d2e6535d/modules/platforms/cpp/common/src/java.cpp ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/common/src/java.cpp b/modules/platforms/cpp/common/src/java.cpp index 8fc2293..89f4713 100644 --- a/modules/platforms/cpp/common/src/java.cpp +++ b/modules/platforms/cpp/common/src/java.cpp @@ -1166,7 +1166,7 @@ namespace ignite return LocalToGlobal(env, cache); } - jobject JniContext::ProcessorCacheFromConfig0(jobject obj, long memPtr, jmethodID mthd, JniErrorInfo* errInfo) + jobject JniContext::ProcessorCacheFromConfig0(jobject obj, long long memPtr, jmethodID mthd, JniErrorInfo* errInfo) { JNIEnv* env = Attach(); @@ -1221,20 +1221,20 @@ namespace ignite ExceptionCheck(env, errInfo); } - jobject JniContext::ProcessorCreateCacheFromConfig(jobject obj, long memPtr) { + jobject JniContext::ProcessorCreateCacheFromConfig(jobject obj, long long memPtr) { return ProcessorCreateCacheFromConfig(obj, memPtr, NULL); } - jobject JniContext::ProcessorCreateCacheFromConfig(jobject obj, long memPtr, JniErrorInfo* errInfo) + jobject JniContext::ProcessorCreateCacheFromConfig(jobject obj, long long memPtr, JniErrorInfo* errInfo) { return ProcessorCacheFromConfig0(obj, memPtr, jvm->GetMembers().m_PlatformProcessor_createCacheFromConfig, errInfo); } - jobject JniContext::ProcessorGetOrCreateCacheFromConfig(jobject obj, long memPtr) { + jobject JniContext::ProcessorGetOrCreateCacheFromConfig(jobject obj, long long memPtr) { return ProcessorGetOrCreateCacheFromConfig(obj, memPtr, NULL); } - jobject JniContext::ProcessorGetOrCreateCacheFromConfig(jobject obj, long memPtr, JniErrorInfo* errInfo) + jobject JniContext::ProcessorGetOrCreateCacheFromConfig(jobject obj, long long memPtr, JniErrorInfo* errInfo) { return ProcessorCacheFromConfig0(obj, memPtr, jvm->GetMembers().m_PlatformProcessor_getOrCreateCacheFromConfig, errInfo); } @@ -1379,7 +1379,7 @@ namespace ignite return LocalToGlobal(env, res); } - void JniContext::ProcessorGetIgniteConfiguration(jobject obj, long memPtr) + void JniContext::ProcessorGetIgniteConfiguration(jobject obj, long long memPtr) { JNIEnv* env = Attach();
