From 436fa2efaecd2596d5ad8e29182bf71b3011b3ef Mon Sep 17 00:00:00 2001
From: Maciej Szwed <maciej.szwed@intel.com>
Date: Tue, 21 Jul 2020 13:05:14 +0200
Subject: [PATCH] rocksdb: Update rocksdb code to work with spdk/rocksdb branch
 spdk-v6.10.2

Signed-off-by: Maciej Szwed <maciej.szwed@intel.com>
Change-Id: Ib907762e9124737a9ea7d4786903446e4ed61abb
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3461
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
---
 lib/rocksdb/env_spdk.cc     | 10 +++++-----
 lib/rocksdb/spdk.rocksdb.mk |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/rocksdb/env_spdk.cc b/lib/rocksdb/env_spdk.cc
index 5bc18595a..ce8bed923 100644
--- a/lib/rocksdb/env_spdk.cc
+++ b/lib/rocksdb/env_spdk.cc
@@ -416,7 +416,7 @@ public:
 	virtual ~SpdkEnv();
 
 	virtual Status NewSequentialFile(const std::string &fname,
-					 unique_ptr<SequentialFile> *result,
+					 std::unique_ptr<SequentialFile> *result,
 					 const EnvOptions &options) override
 	{
 		if (fname.compare(0, mDirectory.length(), mDirectory) == 0) {
@@ -444,7 +444,7 @@ public:
 	}
 
 	virtual Status NewRandomAccessFile(const std::string &fname,
-					   unique_ptr<RandomAccessFile> *result,
+					   std::unique_ptr<RandomAccessFile> *result,
 					   const EnvOptions &options) override
 	{
 		if (fname.compare(0, mDirectory.length(), mDirectory) == 0) {
@@ -468,7 +468,7 @@ public:
 	}
 
 	virtual Status NewWritableFile(const std::string &fname,
-				       unique_ptr<WritableFile> *result,
+				       std::unique_ptr<WritableFile> *result,
 				       const EnvOptions &options) override
 	{
 		if (fname.compare(0, mDirectory.length(), mDirectory) == 0) {
@@ -493,14 +493,14 @@ public:
 
 	virtual Status ReuseWritableFile(const std::string &fname,
 					 const std::string &old_fname,
-					 unique_ptr<WritableFile> *result,
+					 std::unique_ptr<WritableFile> *result,
 					 const EnvOptions &options) override
 	{
 		return EnvWrapper::ReuseWritableFile(fname, old_fname, result, options);
 	}
 
 	virtual Status NewDirectory(__attribute__((unused)) const std::string &name,
-				    unique_ptr<Directory> *result) override
+				    std::unique_ptr<Directory> *result) override
 	{
 		result->reset(new SpdkDirectory());
 		return Status::OK();
diff --git a/lib/rocksdb/spdk.rocksdb.mk b/lib/rocksdb/spdk.rocksdb.mk
index fe498cc39..c55017303 100644
--- a/lib/rocksdb/spdk.rocksdb.mk
+++ b/lib/rocksdb/spdk.rocksdb.mk
@@ -41,7 +41,7 @@ CXXFLAGS +=  -I$(SPDK_DIR)/include -Iinclude/
 
 # The SPDK makefiles turn this on, but RocksDB won't compile with it.  So
 #  turn it off after including the SPDK makefiles.
-CXXFLAGS += -Wno-missing-declarations
+CXXFLAGS += -Wno-missing-declarations -Wno-maybe-uninitialized
 
 # The SPDK Makefiles may turn these options on but we do not want to enable
 #  them for the RocksDB source files.