generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 18:42:41 +01:00
Code Issues Projects Releases Wiki Activity

GH #1050 Data: fix gcc -Wshadow warnings

Browse Source
This commit is contained in:
Miklos Vajna
2016-01-18 22:52:27 +01:00
parent 0b5c50941c
commit 6d1a4f20ba
27 changed files with 290 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Data/src/SessionPool.cpp
View File

@@ -52,12 +52,12 @@ SessionPool::~SessionPool()
}
Session SessionPool::get(const std::string& name, bool value)
Session SessionPool::get(const std::string& rName, bool value)
{
Session s = get();
_addFeatureMap.insert(AddFeatureMap::value_type(s.impl(),
std::make_pair(name, s.getFeature(name))));
s.setFeature(name, value);
std::make_pair(rName, s.getFeature(rName))));
s.setFeature(rName, value);
return s;
}
@@ -163,7 +163,7 @@ int SessionPool::available() const
}
void SessionPool::setFeature(const std::string& name, bool state)
void SessionPool::setFeature(const std::string& rName, bool state)
{
Poco::Mutex::ScopedLock lock(_mutex);
if (_shutdown) throw InvalidAccessException("Session pool has been shut down.");
@@ -171,23 +171,23 @@ void SessionPool::setFeature(const std::string& name, bool state)
if (_nSessions > 0)
throw InvalidAccessException("Features can not be set after the first session was created.");
_featureMap.insert(FeatureMap::ValueType(name, state));
_featureMap.insert(FeatureMap::ValueType(rName, state));
}
bool SessionPool::getFeature(const std::string& name)
bool SessionPool::getFeature(const std::string& rName)
{
FeatureMap::ConstIterator it = _featureMap.find(name);
FeatureMap::ConstIterator it = _featureMap.find(rName);
if (_shutdown) throw InvalidAccessException("Session pool has been shut down.");
if (_featureMap.end() == it)
throw NotFoundException("Feature not found:" + name);
throw NotFoundException("Feature not found:" + rName);
return it->second;
}
void SessionPool::setProperty(const std::string& name, const Poco::Any& value)
void SessionPool::setProperty(const std::string& rName, const Poco::Any& value)
{
Poco::Mutex::ScopedLock lock(_mutex);
if (_shutdown) throw InvalidAccessException("Session pool has been shut down.");
@@ -195,16 +195,16 @@ void SessionPool::setProperty(const std::string& name, const Poco::Any& value)
if (_nSessions > 0)
throw InvalidAccessException("Properties can not be set after first session was created.");
_propertyMap.insert(PropertyMap::ValueType(name, value));
_propertyMap.insert(PropertyMap::ValueType(rName, value));
}
Poco::Any SessionPool::getProperty(const std::string& name)
Poco::Any SessionPool::getProperty(const std::string& rName)
{
PropertyMap::ConstIterator it = _propertyMap.find(name);
PropertyMap::ConstIterator it = _propertyMap.find(rName);
if (_propertyMap.end() == it)
throw NotFoundException("Property not found:" + name);
throw NotFoundException("Property not found:" + rName);
return it->second;
}