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

Prefix guards with SMP_ to avoid conflicts

Browse source
This commit is contained in:
quemy 2012-12-09 20:48:49 +01:00
commit ea2b71e7de
19 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smp/src/MWModel.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef MWMODEL_H_ #ifndef SMP_MWMODEL_H_
#define MWMODEL_H_ #define SMP_MWMODEL_H_
#include <cassert> #include <cassert>
#include <thread> #include <thread>

4
smp/src/PPExpander.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef PPE_H_ #ifndef SMP_PPE_H_
#define PPE_H_ #define SMP_PPE_H_
/** Parameter Pack Expansion: Utility file to expand parameter pack /** Parameter Pack Expansion: Utility file to expand parameter pack

4
smp/src/abstractIsland.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef ABS_ISLAND_H_ #ifndef SMP_ABSTRACT_ISLAND_H_
#define ABS_ISLAND_H_ #define SMP_ABSTRACT_ISLAND_H_
#include <atomic> #include <atomic>

4
smp/src/algoDispatching.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef ALGO_D_H_ #ifndef SMP_ALGO_DISPATCHING_H_
#define ALGO_D_H_ #define SMP_ALGO_DISPATCHING_H_
#include <eo> #include <eo>

4
smp/src/bimap.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef BIMAP_MODEL_H_ #ifndef SMP_BIMAP_MODEL_H_
#define BIMAP_MODEL_H_ #define SMP_BIMAP_MODEL_H_
#include <set> #include <set>
#include <map> #include <map>

4
smp/src/contDispatching.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef CONT_D_H_ #ifndef SMP_CONT_DISPATCHING_H_
#define CONT_D_H_ #define SMP_CONT_DISPATCHING_H_
/** Continuator Dispatching /** Continuator Dispatching

4
smp/src/contWrapper.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef CONTWRAPPER_H_ #ifndef SMP_CONT_WRAPPER_H_
#define CONTWRAPPER_H_ #define SMP_CONT_WRAPPER_H_
#include <queue> #include <queue>
#include <vector> #include <vector>

2
smp/src/homogeneousModel.cpp
View file

@ -39,7 +39,7 @@ paradiseo::smp::HomogeneousIslandModel<EOAlgo, EOT>::HomogeneousIslandModel(unsi
pops[i] = eoPop<EOT>(_popSize, _chromInit); pops[i] = eoPop<EOT>(_popSize, _chromInit);
islands[i] = new Island<EOAlgo, EOT>(pops[i], args...); islands[i] = new Island<EOAlgo, EOT>(pops[i], args...);
model.add(*islands[i]); model.add(*islands[i]);
} }
model(); model();
} }

6
smp/src/homogeneousModel.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef HOMOGENEOUS_ISLAND_MODEL_H_ #ifndef SMP_HOMOGENEOUS_ISLAND_MODEL_H_
#define HOMOGENEOUS_ISLAND_MODEL_H_ #define SMP_HOMOGENEOUS_ISLAND_MODEL_H_
#include <queue> #include <queue>
#include <algorithm> #include <algorithm>
@ -54,6 +54,8 @@ public:
HomogeneousIslandModel(unsigned _islandNumber, AbstractTopology& _topo, unsigned _popSize, eoInit<EOT> &_chromInit, IslandInit... args); HomogeneousIslandModel(unsigned _islandNumber, AbstractTopology& _topo, unsigned _popSize, eoInit<EOT> &_chromInit, IslandInit... args);
~HomogeneousIslandModel(); ~HomogeneousIslandModel();
void operator()();
std::vector<eoPop<EOT>>& getPop(); std::vector<eoPop<EOT>>& getPop();

4
smp/src/intPolicy.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef INT_POLICY_H_ #ifndef SMP_INT_POLICY_H_
#define INT_POLICY_H_ #define SMP_INT_POLICY_H_
#include <eo> #include <eo>

4
smp/src/island.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef ISLAND_H_ #ifndef SMP_ISLAND_H_
#define ISLAND_H_ #define SMP_ISLAND_H_
#include <queue> #include <queue>
#include <vector> #include <vector>

4
smp/src/islandModel.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef ISLAND_MODEL_H_ #ifndef SMP_ISLAND_MODEL_H_
#define ISLAND_MODEL_H_ #define SMP_ISLAND_MODEL_H_
#include <queue> #include <queue>
#include <algorithm> #include <algorithm>

4
smp/src/islandNotifier.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef ISLAND_NOTIFIER_H_ #ifndef SMP_ISLAND_NOTIFIER_H_
#define ISLAND_NOTIFIER_H_ #define SMP_ISLAND_NOTIFIER_H_
#include <vector> #include <vector>
#include <utility> #include <utility>

4
smp/src/migPolicy.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef MIG_POLICY_H_ #ifndef SMP_MIG_POLICY_H_
#define MIG_POLICY_H_ #define SMP_MIG_POLICY_H_
#include <eo> #include <eo>
#include <policyElement.h> #include <policyElement.h>

4
smp/src/notifier.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef NOTIFIER_H_ #ifndef SMP_NOTIFIER_H_
#define NOTIFIER_H_ #define SMP_NOTIFIER_H_
#include <eo> #include <eo>
#include <functional> #include <functional>

4
smp/src/policiesDispatching.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef POLICIES_D_H_ #ifndef SMP_POLICIES_DISPATCHING_H_
#define POLICIES_D_H_ #define SMP_POLICIES_DISPATCHING_H_
#include <eo> #include <eo>

4
smp/src/policyElement.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef POLICY_ELEM_H_ #ifndef SMP_POLICY_ELEMENT_H_
#define POLICY_ELEM_H_ #define SMP_POLICY_ELEMENT_H_
#include <eo> #include <eo>

4
smp/src/scheduler.h
View file

@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef SCHEDULER_H_ #ifndef SMP_SCHEDULER_H_
#define SCHEDULER_H_ #define SMP_SCHEDULER_H_
#include <iostream> #include <iostream>
#include <vector> #include <vector>

4
smp/test/t-smpMI_Homogeneous.cpp
View file

@ -97,9 +97,7 @@ int main(void)
try try
{ {
model.add(test); model.add(test);
model.add(test2); model.add(test2);
model.add(test3); model.add(test3);