From d600e5b0eb7cba5c5aad105145fd681d43a0e35e Mon Sep 17 00:00:00 2001
From: anand76 <anand76@devvm1373.frc2.facebook.com>
Date: Fri, 10 Apr 2020 11:45:47 -0700
Subject: [PATCH] Fix a Centos build failure reported in #6651 (#6656)

Summary:
Fixes issue https://github.com/facebook/rocksdb/issues/6651

Tests:
make check
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6656

Reviewed By: cheng-chang

Differential Revision: D20879084

Pulled By: anand1976

fbshipit-source-id: c2cc508ca2716fcf80dcf9d2ba31c32d211f941e
---
 table/block_based/block_based_table_builder.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/table/block_based/block_based_table_builder.cc b/table/block_based/block_based_table_builder.cc
index 65571ab95..cd156c10b 100644
--- a/table/block_based/block_based_table_builder.cc
+++ b/table/block_based/block_based_table_builder.cc
@@ -1184,21 +1184,21 @@ IOStatus BlockBasedTableBuilder::io_status() const {
   }
 }
 
-void BlockBasedTableBuilder::SetStatusAtom(Status status) {
+void BlockBasedTableBuilder::SetStatusAtom(Status s) {
   if (rep_->compression_opts.parallel_threads > 1) {
     std::lock_guard<std::mutex> lock(rep_->status_mutex);
-    rep_->status = status;
+    rep_->status = s;
   } else {
-    rep_->status = status;
+    rep_->status = s;
   }
 }
 
-void BlockBasedTableBuilder::SetIOStatusAtom(IOStatus io_status) {
+void BlockBasedTableBuilder::SetIOStatusAtom(IOStatus io_s) {
   if (rep_->compression_opts.parallel_threads > 1) {
     std::lock_guard<std::mutex> lock(rep_->io_status_mutex);
-    rep_->io_status = io_status;
+    rep_->io_status = io_s;
   } else {
-    rep_->io_status = io_status;
+    rep_->io_status = io_s;
   }
 }
 
-- 
GitLab