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

Removed "using namespace std" statements from header files in EO -- "std::" identifier were added where necessary.

Browse source
This commit is contained in:
okoenig 2003-02-27 19:28:07 +00:00
commit 86fa476c67
263 changed files with 2009 additions and 1976 deletions
Download patch file Download diff file Expand all files Collapse all files

8
eo/src/other/eoExternalEO.h
View file

@ -46,12 +46,12 @@ public :
Init externalEo with the struct itself and set fitness to zero
*/
eoExternalEO(const External& ext) : EO<Fit>(), External(ext) {}
eoExternalEO(istream& is) : EO<Fit>(), External(ext) { readFrom(is); }
eoExternalEO(std::istream& is) : EO<Fit>(), External(ext) { readFrom(is); }
/**
* Read object, the external struct needs to have an operator>> defined
*/
virtual void readFrom(istream& _is)
virtual void readFrom(std::istream& _is)
{
EO<Fit>::readFrom(_is);
_is >> static_cast<External&>(*this);
@ -59,9 +59,9 @@ public :
/**
* Write object. Called printOn since it prints the object _on_ a stream.
* @param _os A ostream.
* @param _os A std::ostream.
*/
virtual void printOn(ostream& _os) const
virtual void printOn(std::ostream& _os) const
{
EO<Fit>::printOn(_os);
_os << static_cast<const External&>(*this);

12
eo/src/other/eoString.h
View file

@ -29,15 +29,13 @@
#include <string>
#include <stdexcept>
using namespace std;
//-----------------------------------------------------------------------------
// eoString
//-----------------------------------------------------------------------------
/** Adaptor that turns an STL string into an EO */
/** Adaptor that turns an STL std::string into an EO */
template <class fitnessT >
class eoString: public EO<fitnessT>, public string
class eoString: public EO<fitnessT>, public std::string
{
public:
@ -46,8 +44,8 @@ public:
/// Canonical part of the objects: several ctors, copy ctor, dtor and assignment operator
//@{
/// ctor
eoString( const string& _str ="" )
: string( _str ) {};
eoString( const std::string& _str ="" )
: std::string( _str ) {};
/** @name Methods from eoObject
readFrom and printOn are directly inherited from eo1d
@ -56,7 +54,7 @@ public:
/** Inherited from eoObject
@see eoObject
*/
virtual string className() const {return "eoString";};
virtual std::string className() const {return "eoString";};
//@}