Don't shadow in ColumnFamilyDescriptor

include/rocksdb/db.h

@@ -35,9 +35,9 @@ struct ColumnFamilyDescriptor {
   ColumnFamilyOptions options;
   ColumnFamilyDescriptor()
       : name(kDefaultColumnFamilyName), options(ColumnFamilyOptions()) {}
-  ColumnFamilyDescriptor(const std::string& name,
+  ColumnFamilyDescriptor(const std::string& _name,
-                         const ColumnFamilyOptions& options)
+                         const ColumnFamilyOptions& _options)
-      : name(name), options(options) {}
+      : name(_name), options(_options) {}
 };
 
 // Update Makefile if you change these