OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed: don't use parameter names that conflicts with member function names

Browse Source 
quells warnings (with gcc 4.8)
This commit is contained in:
Arne Morten Kvarving
2014-05-08 16:25:34 +02:00
parent 8cb2646995
commit 670e8b692b
17 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/parser/eclipse/EclipseState/Schedule/Group.cpp
View File

@@ -83,13 +83,13 @@ namespace Opm {
/*****************************************************************/
Group::Group(const std::string& name , TimeMapConstPtr timeMap , size_t creationTimeStep) :
Group::Group(const std::string& name_, TimeMapConstPtr timeMap , size_t creationTimeStep) :
m_injection( new GroupInjection::InjectionData(timeMap) ),
m_production( new GroupProduction::ProductionData( timeMap )),
m_wells( new DynamicState<WellSetConstPtr>(timeMap , WellSetConstPtr(new WellSet() ))),
m_isProductionGroup( new DynamicState<bool>(timeMap, true))
{
m_name = name;
m_name = name_;
m_creationTimeStep = creationTimeStep;
}
@@ -114,8 +114,8 @@ namespace Opm {
return !m_isProductionGroup->get(timeStep);
}
void Group::setProductionGroup(size_t timeStep, bool isProductionGroup) {
m_isProductionGroup->add(timeStep, isProductionGroup);
void Group::setProductionGroup(size_t timeStep, bool isProductionGroup_) {
m_isProductionGroup->add(timeStep, isProductionGroup_);
}