From 30aff72f7768df84091e797b5413eabf369a098d Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Fri, 11 Apr 2014 14:48:20 -0700 Subject: [PATCH] Don't shadow in ColumnFamilyDescriptor --- include/rocksdb/db.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/rocksdb/db.h b/include/rocksdb/db.h index 89366d24f4..acf1633ea8 100644 --- 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