Skip to content

Commit

Permalink
Merge pull request #1127 from vmiklos/data-wshadow-fixes
Browse files Browse the repository at this point in the history 
GH #1050 Data: fix gcc -Wshadow warnings
  • Loading branch information
@obiltschnig
obiltschnig committed Feb 16, 2016
2 parents 94dbc1f + 6d1a4f2 commit 81e15f3
Show file tree
Hide file tree
Showing 27 changed files with 290 additions and 290 deletions.
80 changes: 40 additions & 40 deletions Data/include/Poco/Data/Binding.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ class Binding: public AbstractBinding
typedef SharedPtr<Type> Ptr;

explicit Binding(T& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_val(val),
_bound(false)
/// Creates the Binding using the passed reference as bound value.
Expand Down Expand Up @@ -129,9 +129,9 @@ class CopyBinding: public AbstractBinding
typedef SharedPtr<Type> Ptr;

explicit CopyBinding(T& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_pVal(new T(val)),
_bound(false)
/// Creates the Binding using the passed reference as bound value.
Expand Down Expand Up @@ -192,9 +192,9 @@ class Binding<const char*>: public AbstractBinding
typedef SharedPtr<Type> Ptr;

explicit Binding(const char* pVal,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_val(pVal ? pVal : throw NullPointerException() ),
_bound(false)
/// Creates the Binding by copying the passed string.
Expand Down Expand Up @@ -254,9 +254,9 @@ class CopyBinding<const char*>: public AbstractBinding
typedef SharedPtr<Type> Ptr;

explicit CopyBinding(const char* pVal,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_val(pVal ? pVal : throw NullPointerException() ),
_bound(false)
/// Creates the Binding by copying the passed string.
Expand Down Expand Up @@ -315,9 +315,9 @@ class Binding<std::vector<T> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit Binding(std::vector<T>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_val(val),
_begin(),
_end()
Expand Down Expand Up @@ -382,9 +382,9 @@ class CopyBinding<std::vector<T> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit CopyBinding(std::vector<T>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_pVal(new std::vector<T>(val)),
_begin(),
_end()
Expand Down Expand Up @@ -459,9 +459,9 @@ class Binding<std::vector<bool> >: public AbstractBinding
typedef ValType::const_iterator Iterator;

explicit Binding(const std::vector<bool>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_val(val),
_deq(_val.begin(), _val.end()),
_begin(),
Expand Down Expand Up @@ -541,9 +541,9 @@ class CopyBinding<std::vector<bool> >: public AbstractBinding
typedef ValType::const_iterator Iterator;

explicit CopyBinding(const std::vector<bool>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_deq(val.begin(), val.end()),
_begin(),
_end()
Expand Down Expand Up @@ -610,9 +610,9 @@ class Binding<std::list<T> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit Binding(std::list<T>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_val(val),
_begin(),
_end()
Expand Down Expand Up @@ -675,9 +675,9 @@ class CopyBinding<std::list<T> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit CopyBinding(ValType& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_pVal(new std::list<T>(val)),
_begin(),
_end()
Expand Down Expand Up @@ -740,9 +740,9 @@ class Binding<std::deque<T> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit Binding(std::deque<T>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_val(val),
_begin(),
_end()
Expand Down Expand Up @@ -805,9 +805,9 @@ class CopyBinding<std::deque<T> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit CopyBinding(std::deque<T>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_pVal(new std::deque<T>(val)),
_begin(),
_end()
Expand Down Expand Up @@ -870,9 +870,9 @@ class Binding<std::set<T> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit Binding(std::set<T>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_val(val),
_begin(),
_end()
Expand Down Expand Up @@ -935,9 +935,9 @@ class CopyBinding<std::set<T> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit CopyBinding(std::set<T>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_pVal(new std::set<T>(val)),
_begin(),
_end()
Expand Down Expand Up @@ -1000,9 +1000,9 @@ class Binding<std::multiset<T> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit Binding(std::multiset<T>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_val(val),
_begin(),
_end()
Expand Down Expand Up @@ -1065,9 +1065,9 @@ class CopyBinding<std::multiset<T> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit CopyBinding(std::multiset<T>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_pVal(new std::multiset<T>(val)),
_begin(),
_end()
Expand Down Expand Up @@ -1130,9 +1130,9 @@ class Binding<std::map<K, V> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit Binding(std::map<K, V>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_val(val),
_begin(),
_end()
Expand Down Expand Up @@ -1195,9 +1195,9 @@ class CopyBinding<std::map<K, V> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit CopyBinding(std::map<K, V>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_pVal(new std::map<K, V>(val)),
_begin(),
_end()
Expand Down Expand Up @@ -1260,9 +1260,9 @@ class Binding<std::multimap<K, V> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit Binding(std::multimap<K, V>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_val(val),
_begin(),
_end()
Expand Down Expand Up @@ -1325,9 +1325,9 @@ class CopyBinding<std::multimap<K, V> >: public AbstractBinding
typedef typename ValType::const_iterator Iterator;

explicit CopyBinding(std::multimap<K, V>& val,
const std::string& name = "",
const std::string& rName = "",
Direction direction = PD_IN):
AbstractBinding(name, direction),
AbstractBinding(rName, direction),
_pVal(new std::multimap<K, V>(val)),
_begin(),
_end()
Expand Down
20 changes: 10 additions & 10 deletions Data/include/Poco/Data/BulkExtraction.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@ class BulkExtraction: public AbstractExtraction
typedef BulkExtraction<ValType> Type;
typedef SharedPtr<Type> Ptr;

BulkExtraction(C& result, Poco::UInt32 limit, const Position& pos = Position(0)):
BulkExtraction(C& rResult, Poco::UInt32 limit, const Position& pos = Position(0)):
AbstractExtraction(limit, pos.value(), true),
_rResult(result),
_rResult(rResult),
_default()
{
if (static_cast<Poco::UInt32>(result.size()) != limit)
result.resize(limit);
if (static_cast<Poco::UInt32>(rResult.size()) != limit)
rResult.resize(limit);
}

BulkExtraction(C& result, const CValType& def, Poco::UInt32 limit, const Position& pos = Position(0)):
BulkExtraction(C& rResult, const CValType& def, Poco::UInt32 limit, const Position& pos = Position(0)):
AbstractExtraction(limit, pos.value(), true),
_rResult(result),
_rResult(rResult),
_default(def)
{
if (static_cast<Poco::UInt32>(result.size()) != limit)
result.resize(limit);
if (static_cast<Poco::UInt32>(rResult.size()) != limit)
rResult.resize(limit);
}

virtual ~BulkExtraction()
Expand Down Expand Up @@ -153,11 +153,11 @@ class InternalBulkExtraction: public BulkExtraction<C>
typedef InternalBulkExtraction<ValType> Type;
typedef SharedPtr<Type> Ptr;

InternalBulkExtraction(C& result,
InternalBulkExtraction(C& rResult,
Column<C>* pColumn,
Poco::UInt32 limit,
const Position& pos = Position(0)):
BulkExtraction<C>(result, CValType(), limit, pos),
BulkExtraction<C>(rResult, CValType(), limit, pos),
_pColumn(pColumn)
/// Creates InternalBulkExtraction.
{
Expand Down
8 changes: 4 additions & 4 deletions Data/include/Poco/Data/Column.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,16 +393,16 @@ class Column<std::list<T> >
if (row <= (std::size_t) (_pData->size() / 2))
{
Iterator it = _pData->begin();
Iterator end = _pData->end();
for (int i = 0; it != end; ++it, ++i)
Iterator itEnd = _pData->end();
for (int i = 0; it != itEnd; ++it, ++i)
if (i == row) return *it;
}
else
{
row = _pData->size() - row;
RIterator it = _pData->rbegin();
RIterator end = _pData->rend();
for (int i = 1; it != end; ++it, ++i)
RIterator itEnd = _pData->rend();
for (int i = 1; it != itEnd; ++it, ++i)
if (i == row) return *it;
}

Expand Down
Loading

2 comments on commit 81e15f3

@aleks-f
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm afraid this commit may create many conflicts in ODBCSybase branch. @kostya-lnk-ms could you check what does this do to the branch?

@kostya-lnk-ms
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Surprisingly enough, there are only 3 conflicts, which can be straightforward to fix:

    both modified:   Data/include/Poco/Data/RecordSet.h
    both modified:   Data/src/StatementImpl.cpp
    both modified:   buildwin.ps1

I didn't try build&test thought.

Please sign in to comment.