update ceph source to reef 18.1.2

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

diff --git a/ceph/src/rocksdb/java/rocksjni/loggerjnicallback.cc b/ceph/src/rocksdb/java/rocksjni/loggerjnicallback.cc
index e9a9ce689160cb3093d09efeb009f12cac34e75d..aa9f95cd4cfbacc5923952757522efab77e75128 100644 (file)
--- a/ceph/src/rocksdb/java/rocksjni/loggerjnicallback.cc
+++ b/ceph/src/rocksdb/java/rocksjni/loggerjnicallback.cc
@@ -6,11 +6,13 @@
 // This file implements the callback "bridge" between Java and C++ for
 // ROCKSDB_NAMESPACE::Logger.
 
-#include "include/org_rocksdb_Logger.h"
+#include "rocksjni/loggerjnicallback.h"
 
 #include <cstdarg>
 #include <cstdio>
-#include "rocksjni/loggerjnicallback.h"
+
+#include "include/org_rocksdb_Logger.h"
+#include "rocksjni/cplusplus_to_java_convert.h"
 #include "rocksjni/portal.h"
 
 namespace ROCKSDB_NAMESPACE {
@@ -234,7 +236,7 @@ jlong Java_org_rocksdb_Logger_createNewLoggerOptions(JNIEnv* env, jobject jobj,
   auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::Options*>(joptions);
   sptr_logger->get()->SetInfoLogLevel(options->info_log_level);
 
-  return reinterpret_cast<jlong>(sptr_logger);
+  return GET_CPLUSPLUS_POINTER(sptr_logger);
 }
 
 /*
@@ -253,7 +255,7 @@ jlong Java_org_rocksdb_Logger_createNewLoggerDbOptions(JNIEnv* env,
       reinterpret_cast<ROCKSDB_NAMESPACE::DBOptions*>(jdb_options);
   sptr_logger->get()->SetInfoLogLevel(db_options->info_log_level);
 
-  return reinterpret_cast<jlong>(sptr_logger);
+  return GET_CPLUSPLUS_POINTER(sptr_logger);
 }
 
 /*