update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rocksdb / java / rocksjni / memtablejni.cc

diff --git a/ceph/src/rocksdb/java/rocksjni/memtablejni.cc b/ceph/src/rocksdb/java/rocksjni/memtablejni.cc
index 1188c5e5998f0bdec78c69adab2d3c24c8e47449..a4d02f354912624b688d12f0e88cca2934365677 100644 (file)
--- a/ceph/src/rocksdb/java/rocksjni/memtablejni.cc
+++ b/ceph/src/rocksdb/java/rocksjni/memtablejni.cc
@@ -10,6 +10,7 @@
 #include "include/org_rocksdb_SkipListMemTableConfig.h"
 #include "include/org_rocksdb_VectorMemTableConfig.h"
 #include "rocksdb/memtablerep.h"
+#include "rocksjni/cplusplus_to_java_convert.h"
 #include "rocksjni/portal.h"
 
 /*
@@ -23,7 +24,7 @@ jlong Java_org_rocksdb_HashSkipListMemTableConfig_newMemTableFactoryHandle(
   ROCKSDB_NAMESPACE::Status s =
       ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(jbucket_count);
   if (s.ok()) {
-    return reinterpret_cast<jlong>(ROCKSDB_NAMESPACE::NewHashSkipListRepFactory(
+    return GET_CPLUSPLUS_POINTER(ROCKSDB_NAMESPACE::NewHashSkipListRepFactory(
         static_cast<size_t>(jbucket_count), static_cast<int32_t>(jheight),
         static_cast<int32_t>(jbranching_factor)));
   }
@@ -46,7 +47,7 @@ jlong Java_org_rocksdb_HashLinkedListMemTableConfig_newMemTableFactoryHandle(
       ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(
           jhuge_page_tlb_size);
   if (statusBucketCount.ok() && statusHugePageTlb.ok()) {
-    return reinterpret_cast<jlong>(ROCKSDB_NAMESPACE::NewHashLinkListRepFactory(
+    return GET_CPLUSPLUS_POINTER(ROCKSDB_NAMESPACE::NewHashLinkListRepFactory(
         static_cast<size_t>(jbucket_count),
         static_cast<size_t>(jhuge_page_tlb_size),
         static_cast<int32_t>(jbucket_entries_logging_threshold),
@@ -68,7 +69,7 @@ jlong Java_org_rocksdb_VectorMemTableConfig_newMemTableFactoryHandle(
   ROCKSDB_NAMESPACE::Status s =
       ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(jreserved_size);
   if (s.ok()) {
-    return reinterpret_cast<jlong>(new ROCKSDB_NAMESPACE::VectorRepFactory(
+    return GET_CPLUSPLUS_POINTER(new ROCKSDB_NAMESPACE::VectorRepFactory(
         static_cast<size_t>(jreserved_size)));
   }
   ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);
@@ -85,7 +86,7 @@ jlong Java_org_rocksdb_SkipListMemTableConfig_newMemTableFactoryHandle0(
   ROCKSDB_NAMESPACE::Status s =
       ROCKSDB_NAMESPACE::JniUtil::check_if_jlong_fits_size_t(jlookahead);
   if (s.ok()) {
-    return reinterpret_cast<jlong>(new ROCKSDB_NAMESPACE::SkipListFactory(
+    return GET_CPLUSPLUS_POINTER(new ROCKSDB_NAMESPACE::SkipListFactory(
         static_cast<size_t>(jlookahead)));
   }
   ROCKSDB_NAMESPACE::IllegalArgumentExceptionJni::ThrowNew(env, s);