Changed all variables named howmany into combien (French for how many)

because of a silly problem on Solaris (howmany seems to be some macro???)
This commit is contained in:
evomarc 2001-04-11 12:01:51 +00:00
commit 64990a1ac4
3 changed files with 22 additions and 23 deletions

View file

@ -40,7 +40,7 @@ class eoHowMany
{
public:
eoHowMany(double _rate, bool _interpret_as_rate = true):
rate(0), howmany(0)
rate(0), combien(0)
{
if (_interpret_as_rate)
{
@ -50,27 +50,27 @@ public:
{
if (_rate<0)
throw std::logic_error("Negative number in eoHowMany!");
howmany = (unsigned int)_rate;
if (howmany != _rate)
combien = (unsigned int)_rate;
if (combien != _rate)
cout << "Warning: Number was rounded in eoHowMany";
}
}
unsigned int operator()(unsigned int _size)
{
if (howmany == 0)
if (combien == 0)
{
if (rate == 0.0)
return 0;
else
return (unsigned int) (rate * _size);
}
return howmany;
return combien;
}
private :
double rate;
unsigned howmany;
unsigned combien;
};