Don't shadow in ColumnFamilyDescriptor

11 years ago · 30aff72f77
parent eba3fc644a
commit 30aff72f77
1 changed files with 3 additions and 3 deletions
--- a/include/rocksdb/db.h
+++ b/include/rocksdb/db.h
@ -35,9 +35,9 @@ struct ColumnFamilyDescriptor {
  ColumnFamilyOptions options;
  ColumnFamilyDescriptor()
      : name(kDefaultColumnFamilyName), options(ColumnFamilyOptions()) {}
-  ColumnFamilyDescriptor(const std::string& name,
-                         const ColumnFamilyOptions& options)
-      : name(name), options(options) {}
+  ColumnFamilyDescriptor(const std::string& _name,
+                         const ColumnFamilyOptions& _options)
+      : name(_name), options(_options) {}
 };

 // Update Makefile if you change these