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

10
eo/src/paradisEO/island/eoConnectivity.h
View file

@ -44,7 +44,7 @@ public :
*/
eoConnectivity (eoListener <EOT> & _listen,
vector <string> & _sel_neigh
std::vector <std::string> & _sel_neigh
) :
listen (_listen),
sel_neigh (_sel_neigh) {
@ -56,22 +56,22 @@ public :
immigrants from ...
*/
virtual vector <eoLocalListener <EOT> *> from () = 0 ;
virtual std::vector <eoLocalListener <EOT> *> from () = 0 ;
/**
Computes the subset of neighbours to send
emigrants to ...
*/
virtual vector <eoLocalListener <EOT> *> to () = 0 ;
virtual std::vector <eoLocalListener <EOT> *> to () = 0 ;
protected :
eoListener <EOT> & listen ;
vector <string> sel_neigh ;
std::vector <std::string> sel_neigh ;
bool selected (string & id) {
bool selected (std::string & id) {
for (int i = 0 ; i < sel_neigh.size () ; i ++)
if (sel_neigh [i] == id)

4
eo/src/paradisEO/island/eoIslandsEasyEA.h
View file

@ -50,7 +50,7 @@ public :
Constructor
*/
eoIslandsEasyEA (string _id,
eoIslandsEasyEA (std::string _id,
eoListener <EOT> & _listen,
eoConnectivity <EOT> & _conn,
eoEasyEA <EOT> & _ea,
@ -87,7 +87,7 @@ private :
// Internal components
string id ; // String identifiant of this algorithm
std::string id ; // String identifiant of this algorithm
eoListener <EOT> & listen ; // The neighbouring of concurrent algos
eoConnectivity <EOT> & conn ; // Communication topology
eoCheckPoint <EOT> chkp ;

4
eo/src/paradisEO/island/eoMigUpdater.h
View file

@ -85,14 +85,14 @@ public :
listen.update () ;
// listen.display () ;
vector <eoLocalListener <EOT> *> src = conn.from (), dest = conn.to () ;
std::vector <eoLocalListener <EOT> *> src = conn.from (), dest = conn.to () ;
// Any coming immigrants ?
for (int i = 0 ; i < src.size () ; i ++) {
src [i] -> update () ;
while (! src [i] -> empty ()) {
replace (* pop, src [i] -> front ()) ;
cout << "[" << listen.here ().host_name << "] Arrival of " << src [i] -> front ().size () << " individuals ..." << endl ;
std::cout << "[" << listen.here ().host_name << "] Arrival of " << src [i] -> front ().size () << " individuals ..." << std::endl ;
src [i] -> pop () ;
}
}

10
eo/src/paradisEO/island/topologies/eoFullConnectivity.h
View file

@ -39,15 +39,15 @@ public :
*/
eoFullConnectivity (eoListener <EOT> & _listen,
vector <string> & _sel_neigh
std::vector <std::string> & _sel_neigh
) : eoConnectivity <EOT> (_listen, _sel_neigh) {
}
virtual vector <eoLocalListener <EOT> *> from () {
virtual std::vector <eoLocalListener <EOT> *> from () {
listen.update () ;
vector <eoLocalListener <EOT> *> v ;
std::vector <eoLocalListener <EOT> *> v ;
for (int i = 0 ; i < listen.size () ; i ++)
if (i != listen.here ().number () && selected (listen [i].label ()))
@ -56,11 +56,11 @@ public :
return v ;
}
virtual vector <eoLocalListener <EOT> *> to () {
virtual std::vector <eoLocalListener <EOT> *> to () {
listen.update () ;
vector <eoLocalListener <EOT> *> v ;
std::vector <eoLocalListener <EOT> *> v ;
for (int i = 0 ; i < listen.size () ; i ++)
if (i != listen.here ().number () && selected (listen [i].label ()))

12
eo/src/paradisEO/island/topologies/eoRingConnectivity.h
View file

@ -27,7 +27,7 @@
#include <paradisEO/island/eoConnectivity.h>
/**
Each algorithm has a single pair of entering and outgoing
Each algorithm has a single std::pair of entering and outgoing
neighbours, so that the unit constitutes a circular topology.
*/
@ -40,15 +40,15 @@ public :
*/
eoRingConnectivity (eoListener <EOT> & _listen,
vector <string> & _sel_neigh
std::vector <std::string> & _sel_neigh
) : eoConnectivity <EOT> (_listen, _sel_neigh) {
}
virtual vector <eoLocalListener <EOT> *> from () {
virtual std::vector <eoLocalListener <EOT> *> from () {
listen.update () ;
vector <eoLocalListener <EOT> *> v ;
std::vector <eoLocalListener <EOT> *> v ;
int i, k = listen.size () ;
for (i = 0 ; i < k ; i ++) {
@ -69,11 +69,11 @@ public :
*/
virtual vector <eoLocalListener <EOT> *> to () {
virtual std::vector <eoLocalListener <EOT> *> to () {
listen.update () ;
vector <eoLocalListener <EOT> *> v ;
std::vector <eoLocalListener <EOT> *> v ;
int i, k = listen.size () ;
for (i = 0 ; i < k ; i ++)