From b3d7435b4eca0257a8b9f8833b36b6bdbab1f0d5 Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Thu, 10 Apr 2014 17:18:55 -0700 Subject: [PATCH] No shadow in public headers --- include/rocksdb/options.h | 4 ++-- include/rocksdb/slice.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h index 9cfefb8dd..d1c532167 100644 --- a/include/rocksdb/options.h +++ b/include/rocksdb/options.h @@ -62,8 +62,8 @@ struct CompressionOptions { int level; int strategy; CompressionOptions() : window_bits(-14), level(-1), strategy(0) {} - CompressionOptions(int wbits, int lev, int strategy) - : window_bits(wbits), level(lev), strategy(strategy) {} + CompressionOptions(int wbits, int _lev, int _strategy) + : window_bits(wbits), level(_lev), strategy(_strategy) {} }; enum UpdateStatus { // Return status For inplace update callback diff --git a/include/rocksdb/slice.h b/include/rocksdb/slice.h index e6cca2137..225371571 100644 --- a/include/rocksdb/slice.h +++ b/include/rocksdb/slice.h @@ -105,8 +105,8 @@ class Slice { // A set of Slices that are virtually concatenated together. 'parts' points // to an array of Slices. The number of elements in the array is 'num_parts'. struct SliceParts { - SliceParts(const Slice* parts, int num_parts) : - parts(parts), num_parts(num_parts) { } + SliceParts(const Slice* _parts, int _num_parts) : + parts(_parts), num_parts(_num_parts) { } const Slice* parts; int num_parts;