From 4c65ffdfbe49f28a4b7bc07356b375d6fea68348 Mon Sep 17 00:00:00 2001 From: Jin Tsai Date: Tue, 26 Sep 2017 11:19:41 +0800 Subject: [PATCH] lib/rocksdb/env_spdk: fix the shadow compiling error in rocksdb Change-Id: Ia07efcdec742d6ae5339e9f1c860ab58107d9f85 Signed-off-by: Jin Tsai Reviewed-on: https://review.gerrithub.io/379928 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- lib/rocksdb/env_spdk.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/rocksdb/env_spdk.cc b/lib/rocksdb/env_spdk.cc index 010aed012..47f602406 100644 --- a/lib/rocksdb/env_spdk.cc +++ b/lib/rocksdb/env_spdk.cc @@ -386,20 +386,20 @@ public: } return EnvWrapper::FileExists(fname); } - virtual Status RenameFile(const std::string &src, const std::string &target) override + virtual Status RenameFile(const std::string &src, const std::string &t) override { int rc; std::string src_name = sanitize_path(src, mDirectory); - std::string target_name = sanitize_path(target, mDirectory); + std::string target_name = sanitize_path(t, mDirectory); rc = spdk_fs_rename_file(g_fs, g_sync_args.channel, src_name.c_str(), target_name.c_str()); if (rc == -ENOENT) { - return EnvWrapper::RenameFile(src, target); + return EnvWrapper::RenameFile(src, t); } return Status::OK(); } - virtual Status LinkFile(const std::string &src, const std::string &target) override + virtual Status LinkFile(const std::string &src, const std::string &t) override { return Status::NotSupported("SpdkEnv does not support LinkFile"); }