RAMCloud bug fix
- multiRead was not returning version info.
- workaround for certain g++ version complaining about cast between same type.
- removing g++ option we don't need anymore now that -Werror is removed.
Change-Id: I9b060575acd76fdfe3e9d17b4df83efd59edf1cc
diff --git a/ramcloud-build-scripts/MakefragPrivateTop b/ramcloud-build-scripts/MakefragPrivateTop
index 726dbba..0369292 100644
--- a/ramcloud-build-scripts/MakefragPrivateTop
+++ b/ramcloud-build-scripts/MakefragPrivateTop
@@ -2,6 +2,3 @@
ZOOKEEPER_LIB := /usr/lib/x86_64-linux-gnu/libzookeeper_mt.a
ZOOKEEPER_DIR := ~/zookeeper-3.4.5
-# FIXME remove if RAMCloud source is fixed
-EXTRACXXFLAGS := -Wno-error=unused-result -Wno-error=maybe-uninitialized
-
diff --git a/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc b/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc
index a0dd0ce..830fd47 100644
--- a/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc
+++ b/src/main/cpp/edu_stanford_ramcloud_JRamCloud.cc
@@ -228,7 +228,7 @@
RamCloud* ramcloud = NULL;
try {
ramcloud = new RamCloud(locator.string);
- } EXCEPTION_CATCHER(reinterpret_cast<jlong>(NULL));
+ } EXCEPTION_CATCHER((jlong)(NULL));
return reinterpret_cast<jlong>(ramcloud);
}
@@ -474,7 +474,7 @@
check_null(jValue, "NewByteArray failed");
JByteArrayGetter value(env, jValue);
values[i].get()->copy(0, values[i].get()->getTotalLength(), value.pointer);
- jobject obj = env->NewObject(jc_RcObject, jm_init, jKey[i], jValue);
+ jobject obj = env->NewObject(jc_RcObject, jm_init, jKey[i], jValue, (jlong)objects[i].version);
check_null(obj, "NewObject failed");
env->SetObjectArrayElement(outJNIArray, i, obj);
}