Skip to content

Commit

Permalink
Merge #8467: [Trivial] Do not shadow members in dbwrapper
Browse files Browse the repository at this point in the history
4a35e0f Do not shadow members in dbwrapper (Pavel Janík)
  • Loading branch information
sipa committed Aug 10, 2016
2 parents 6e6ab2c + 4a35e0f commit 484312b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/dbwrapper.h
Expand Up @@ -52,9 +52,9 @@ class CDBBatch

public:
/**
* @param[in] parent CDBWrapper that this batch is to be submitted to
* @param[in] _parent CDBWrapper that this batch is to be submitted to
*/
CDBBatch(const CDBWrapper &parent) : parent(parent) { };
CDBBatch(const CDBWrapper &_parent) : parent(_parent) { };

template <typename K, typename V>
void Write(const K& key, const V& value)
Expand Down Expand Up @@ -94,11 +94,11 @@ class CDBIterator
public:

/**
* @param[in] parent Parent CDBWrapper instance.
* @param[in] piterIn The original leveldb iterator.
* @param[in] _parent Parent CDBWrapper instance.
* @param[in] _piter The original leveldb iterator.
*/
CDBIterator(const CDBWrapper &parent, leveldb::Iterator *piterIn) :
parent(parent), piter(piterIn) { };
CDBIterator(const CDBWrapper &_parent, leveldb::Iterator *_piter) :
parent(_parent), piter(_piter) { };
~CDBIterator();

bool Valid();
Expand Down

0 comments on commit 484312b

Please sign in to comment.