ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Ankit Gupta
2014-04-18 10:47:03 -07:00
parent dc291f5bf0
commit ebd85e8f3a
4 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/rocksjni/portal.h
View File

@@ -172,7 +172,6 @@ class WriteBatchJni {
}
};
<<<<<<< HEAD
class HistogramDataJni {
public:
static jmethodID getConstructorMethodId(JNIEnv* env, jclass jclazz) {
@@ -180,7 +179,8 @@ class HistogramDataJni {
jclazz, "<init>", "(DDDDD)V");
assert(mid != nullptr);
return mid;
=======
}
};
class BackupableDBOptionsJni {
public:
// Get the java class id of org.rocksdb.BackupableDBOptions.
@@ -211,7 +211,6 @@ class BackupableDBOptionsJni {
env->SetLongField(
jobj, getHandleFieldID(env),
reinterpret_cast<jlong>(op));
>>>>>>> 1a8abe72768b2b5cea800aa390c28e5ace6a552e
}
};
} // namespace rocksdb