Merge pull request #329 from fyrz/master

resolution for java build problem introduced by 5ec53f3edf62bec1b690ce12...
10 years ago · 25888ae006
parent 89833e5a85 b3343fdeac
commit 25888ae006
1 changed files with 2 additions and 1 deletions
--- a/java/rocksjni/write_batch.cc
+++ b/java/rocksjni/write_batch.cc
@ -206,7 +206,8 @@ jbyteArray Java_org_rocksdb_WriteBatchTest_getContents(
  options.memtable_factory = factory;
  rocksdb::MemTable* mem = new rocksdb::MemTable(
      cmp, rocksdb::ImmutableCFOptions(options),
-      rocksdb::MemTableOptions(rocksdb::MutableCFOptions(options), options));
+      rocksdb::MemTableOptions(rocksdb::MutableCFOptions(options,
+          rocksdb::ImmutableCFOptions(options)), options));
  mem->Ref();
  std::string state;
  rocksdb::ColumnFamilyMemTablesDefault cf_mems_default(mem, &options);