Rename func to funk in tests to avoid Go keyword problems
This commit is contained in:
parent
67190cbb2e
commit
95e8643d70
16 changed files with 25 additions and 29 deletions
|
|
@ -23,7 +23,7 @@ namespace simuPOP
|
|||
{
|
||||
}
|
||||
|
||||
virtual int func() const
|
||||
virtual int funk() const
|
||||
{ return m_pop.m_a; }
|
||||
};
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ namespace simuPOP
|
|||
struct DerivedOperator: public Operator<Pop>
|
||||
{
|
||||
DerivedOperator(int a):Operator<Pop>(a){}
|
||||
virtual int func() const
|
||||
virtual int funk() const
|
||||
{ return 2*this->m_pop.m_a; }
|
||||
};
|
||||
|
||||
|
|
@ -90,7 +90,7 @@ namespace simuPOP
|
|||
void test( const std::vector< Operator<pop>*>& para)
|
||||
{
|
||||
for( size_t i =0; i < para.size(); ++i)
|
||||
para[i]->func();
|
||||
para[i]->funk();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue