From ea2b71e7de74ef94a830ce53a2f2094aac4c8f88 Mon Sep 17 00:00:00 2001 From: quemy Date: Sun, 9 Dec 2012 20:48:49 +0100 Subject: [PATCH] Prefix guards with SMP_ to avoid conflicts --- smp/src/MWModel.h | 4 ++-- smp/src/PPExpander.h | 4 ++-- smp/src/abstractIsland.h | 4 ++-- smp/src/algoDispatching.h | 4 ++-- smp/src/bimap.h | 4 ++-- smp/src/contDispatching.h | 4 ++-- smp/src/contWrapper.h | 4 ++-- smp/src/homogeneousModel.cpp | 2 +- smp/src/homogeneousModel.h | 6 ++++-- smp/src/intPolicy.h | 4 ++-- smp/src/island.h | 4 ++-- smp/src/islandModel.h | 4 ++-- smp/src/islandNotifier.h | 4 ++-- smp/src/migPolicy.h | 4 ++-- smp/src/notifier.h | 4 ++-- smp/src/policiesDispatching.h | 4 ++-- smp/src/policyElement.h | 4 ++-- smp/src/scheduler.h | 4 ++-- smp/test/t-smpMI_Homogeneous.cpp | 4 +--- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/smp/src/MWModel.h b/smp/src/MWModel.h index 2b5cb0721..15d2bd3ec 100644 --- a/smp/src/MWModel.h +++ b/smp/src/MWModel.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef MWMODEL_H_ -#define MWMODEL_H_ +#ifndef SMP_MWMODEL_H_ +#define SMP_MWMODEL_H_ #include #include diff --git a/smp/src/PPExpander.h b/smp/src/PPExpander.h index f4c740684..c44506b35 100644 --- a/smp/src/PPExpander.h +++ b/smp/src/PPExpander.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef PPE_H_ -#define PPE_H_ +#ifndef SMP_PPE_H_ +#define SMP_PPE_H_ /** Parameter Pack Expansion: Utility file to expand parameter pack diff --git a/smp/src/abstractIsland.h b/smp/src/abstractIsland.h index ef48bd0f5..61193f6bd 100644 --- a/smp/src/abstractIsland.h +++ b/smp/src/abstractIsland.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef ABS_ISLAND_H_ -#define ABS_ISLAND_H_ +#ifndef SMP_ABSTRACT_ISLAND_H_ +#define SMP_ABSTRACT_ISLAND_H_ #include diff --git a/smp/src/algoDispatching.h b/smp/src/algoDispatching.h index 286a877cf..5e60b895d 100644 --- a/smp/src/algoDispatching.h +++ b/smp/src/algoDispatching.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef ALGO_D_H_ -#define ALGO_D_H_ +#ifndef SMP_ALGO_DISPATCHING_H_ +#define SMP_ALGO_DISPATCHING_H_ #include diff --git a/smp/src/bimap.h b/smp/src/bimap.h index 6c29fefdb..82c26781b 100644 --- a/smp/src/bimap.h +++ b/smp/src/bimap.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef BIMAP_MODEL_H_ -#define BIMAP_MODEL_H_ +#ifndef SMP_BIMAP_MODEL_H_ +#define SMP_BIMAP_MODEL_H_ #include #include diff --git a/smp/src/contDispatching.h b/smp/src/contDispatching.h index 63d9c11bb..3870ce2d4 100644 --- a/smp/src/contDispatching.h +++ b/smp/src/contDispatching.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef CONT_D_H_ -#define CONT_D_H_ +#ifndef SMP_CONT_DISPATCHING_H_ +#define SMP_CONT_DISPATCHING_H_ /** Continuator Dispatching diff --git a/smp/src/contWrapper.h b/smp/src/contWrapper.h index 9d99495e5..ed9e640b0 100644 --- a/smp/src/contWrapper.h +++ b/smp/src/contWrapper.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef CONTWRAPPER_H_ -#define CONTWRAPPER_H_ +#ifndef SMP_CONT_WRAPPER_H_ +#define SMP_CONT_WRAPPER_H_ #include #include diff --git a/smp/src/homogeneousModel.cpp b/smp/src/homogeneousModel.cpp index a8ac08768..e30ea0079 100644 --- a/smp/src/homogeneousModel.cpp +++ b/smp/src/homogeneousModel.cpp @@ -39,7 +39,7 @@ paradiseo::smp::HomogeneousIslandModel::HomogeneousIslandModel(unsi pops[i] = eoPop(_popSize, _chromInit); islands[i] = new Island(pops[i], args...); model.add(*islands[i]); - } + } model(); } diff --git a/smp/src/homogeneousModel.h b/smp/src/homogeneousModel.h index 3a77b1db5..3b6ae651b 100644 --- a/smp/src/homogeneousModel.h +++ b/smp/src/homogeneousModel.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef HOMOGENEOUS_ISLAND_MODEL_H_ -#define HOMOGENEOUS_ISLAND_MODEL_H_ +#ifndef SMP_HOMOGENEOUS_ISLAND_MODEL_H_ +#define SMP_HOMOGENEOUS_ISLAND_MODEL_H_ #include #include @@ -54,6 +54,8 @@ public: HomogeneousIslandModel(unsigned _islandNumber, AbstractTopology& _topo, unsigned _popSize, eoInit &_chromInit, IslandInit... args); ~HomogeneousIslandModel(); + + void operator()(); std::vector>& getPop(); diff --git a/smp/src/intPolicy.h b/smp/src/intPolicy.h index 39b43e5f1..9d70677c4 100644 --- a/smp/src/intPolicy.h +++ b/smp/src/intPolicy.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef INT_POLICY_H_ -#define INT_POLICY_H_ +#ifndef SMP_INT_POLICY_H_ +#define SMP_INT_POLICY_H_ #include diff --git a/smp/src/island.h b/smp/src/island.h index 16b8651e0..1352df050 100644 --- a/smp/src/island.h +++ b/smp/src/island.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef ISLAND_H_ -#define ISLAND_H_ +#ifndef SMP_ISLAND_H_ +#define SMP_ISLAND_H_ #include #include diff --git a/smp/src/islandModel.h b/smp/src/islandModel.h index e3e828ac4..7e8427647 100644 --- a/smp/src/islandModel.h +++ b/smp/src/islandModel.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef ISLAND_MODEL_H_ -#define ISLAND_MODEL_H_ +#ifndef SMP_ISLAND_MODEL_H_ +#define SMP_ISLAND_MODEL_H_ #include #include diff --git a/smp/src/islandNotifier.h b/smp/src/islandNotifier.h index 09c837cb7..f900d6b9d 100644 --- a/smp/src/islandNotifier.h +++ b/smp/src/islandNotifier.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef ISLAND_NOTIFIER_H_ -#define ISLAND_NOTIFIER_H_ +#ifndef SMP_ISLAND_NOTIFIER_H_ +#define SMP_ISLAND_NOTIFIER_H_ #include #include diff --git a/smp/src/migPolicy.h b/smp/src/migPolicy.h index d93a1c3a9..aa90c9eaa 100644 --- a/smp/src/migPolicy.h +++ b/smp/src/migPolicy.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef MIG_POLICY_H_ -#define MIG_POLICY_H_ +#ifndef SMP_MIG_POLICY_H_ +#define SMP_MIG_POLICY_H_ #include #include diff --git a/smp/src/notifier.h b/smp/src/notifier.h index d40c675cb..68f2f234e 100644 --- a/smp/src/notifier.h +++ b/smp/src/notifier.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef NOTIFIER_H_ -#define NOTIFIER_H_ +#ifndef SMP_NOTIFIER_H_ +#define SMP_NOTIFIER_H_ #include #include diff --git a/smp/src/policiesDispatching.h b/smp/src/policiesDispatching.h index 13b143688..ba67238eb 100644 --- a/smp/src/policiesDispatching.h +++ b/smp/src/policiesDispatching.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef POLICIES_D_H_ -#define POLICIES_D_H_ +#ifndef SMP_POLICIES_DISPATCHING_H_ +#define SMP_POLICIES_DISPATCHING_H_ #include diff --git a/smp/src/policyElement.h b/smp/src/policyElement.h index af67fd2e1..43f67f5ab 100644 --- a/smp/src/policyElement.h +++ b/smp/src/policyElement.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef POLICY_ELEM_H_ -#define POLICY_ELEM_H_ +#ifndef SMP_POLICY_ELEMENT_H_ +#define SMP_POLICY_ELEMENT_H_ #include diff --git a/smp/src/scheduler.h b/smp/src/scheduler.h index e316d47ab..f5735e515 100644 --- a/smp/src/scheduler.h +++ b/smp/src/scheduler.h @@ -27,8 +27,8 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef SCHEDULER_H_ -#define SCHEDULER_H_ +#ifndef SMP_SCHEDULER_H_ +#define SMP_SCHEDULER_H_ #include #include diff --git a/smp/test/t-smpMI_Homogeneous.cpp b/smp/test/t-smpMI_Homogeneous.cpp index fb6d1131a..4c82ac504 100644 --- a/smp/test/t-smpMI_Homogeneous.cpp +++ b/smp/test/t-smpMI_Homogeneous.cpp @@ -97,9 +97,7 @@ int main(void) try { - - - + model.add(test); model.add(test2); model.add(test3);