nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

alternate function prototypes without verbose parameter

Browse source
This commit is contained in:
Johann Dreo 2010-10-31 21:19:34 +01:00
commit 9c51b925b6
4 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
eo/src/eoCombinedInit.h
View file

@ -43,12 +43,16 @@ public:
rates.push_back(_rate); rates.push_back(_rate);
} }
/** The usual method to add objects to the combination
*/
void add(eoInit<EOT> & _init, double _rate, bool _verbose=false) void add(eoInit<EOT> & _init, double _rate, bool _verbose=false)
{ {
eo::log << eo::warnings << "WARNING: the use of the verbose parameter in eoCombinedInit::add is deprecated and will be removed in the next release." << std::endl; eo::log << eo::warnings << "WARNING: the use of the verbose parameter in eoCombinedInit::add is deprecated and will be removed in the next release." << std::endl;
add( _init, _rate );
}
/** The usual method to add objects to the combination
*/
void add(eoInit<EOT> & _init, double _rate)
{
initializers.push_back(&_init); initializers.push_back(&_init);
rates.push_back(_rate); rates.push_back(_rate);
// compute the relative rates in percent - to warn the user! // compute the relative rates in percent - to warn the user!

10
eo/src/eoProportionalCombinedOp.h
View file

@ -171,13 +171,17 @@ public:
rates.push_back(_rate); rates.push_back(_rate);
} }
virtual std::string className() const { return "eoPropCombinedQuadOp"; } virtual std::string className() const { return "eoPropCombinedQuadOp"; }
// addition of a true operator virtual void add(eoQuadOp<EOT> & _op, const double _rate, bool _verbose=false)
virtual void add(eoQuadOp<EOT> & _op, const double _rate, bool _verbose=false)
{ {
eo::log << eo::warnings << "WARNING: the use of the verbose parameter in eoPropCombinedQuadOp::add is deprecated and will be removed in the next release." << std::endl; eo::log << eo::warnings << "WARNING: the use of the verbose parameter in eoPropCombinedQuadOp::add is deprecated and will be removed in the next release." << std::endl;
add(_op,_rate);
}
// addition of a true operator
virtual void add(eoQuadOp<EOT> & _op, const double _rate)
{
ops.push_back(&_op); ops.push_back(&_op);
rates.push_back(_rate); rates.push_back(_rate);
// compute the relative rates in percent - to warn the user! // compute the relative rates in percent - to warn the user!

4
eo/src/utils/eoOStreamMonitor.h
View file

@ -48,6 +48,10 @@ public :
eo::log << eo::warnings << "WARNING: the use of the verbose parameter in eoOStreamMonitor constructor is deprecated and will be removed in the next release" << std::endl; eo::log << eo::warnings << "WARNING: the use of the verbose parameter in eoOStreamMonitor constructor is deprecated and will be removed in the next release" << std::endl;
} }
eoOStreamMonitor( std::ostream & _out, std::string _delim = "\t", unsigned int _width=20, char _fill=' ' ) :
out(_out), delim(_delim), width(_width), fill(_fill), firsttime(true)
{}
eoMonitor& operator()(void); eoMonitor& operator()(void);
virtual std::string className(void) const { return "eoOStreamMonitor"; } virtual std::string className(void) const { return "eoOStreamMonitor"; }

6
eo/src/utils/eoStdoutMonitor.h
View file

@ -44,11 +44,15 @@ public :
eoStdoutMonitor(bool _verbose=true, std::string _delim = "\t", unsigned int _width=20, char _fill=' ' ) : eoStdoutMonitor(bool _verbose=true, std::string _delim = "\t", unsigned int _width=20, char _fill=' ' ) :
eoOStreamMonitor( std::cout, _verbose, _delim, _width, _fill) eoOStreamMonitor( std::cout, _verbose, _delim, _width, _fill)
{ {
eo::log << eo::warnings << "WARNING: the use of the verbose parameter in eoStdutMonitor constructor is deprecated and will be removed in the next release" << std::endl; eo::log << eo::warnings << "WARNING: the use of the verbose parameter in eoStdutMonitor constructor is deprecated and will be removed in the next release" << std::endl;
} }
eoStdoutMonitor(std::string _delim = "\t", unsigned int _width=20, char _fill=' ' ) :
eoOStreamMonitor( std::cout, _delim, _width, _fill)
{}
virtual std::string className(void) const { return "eoStdoutMonitor"; } virtual std::string className(void) const { return "eoStdoutMonitor"; }
}; };
#endif #endif