[cig-commits] [commit] master: fully qualify interface names in plugin macros (9dd0862)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue May 20 11:16:10 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/e590073828b9ed0d6df1b83dd2afa4630a301ccb...19fcaae1dae23206c4e6f1f4e9965965f0128967
>---------------------------------------------------------------
commit 9dd0862c9ca4179c7cbf24d2539bb0ebf3ac1f26
Author: Timo Heister <timo.heister at gmail.com>
Date: Tue May 20 14:14:08 2014 -0400
fully qualify interface names in plugin macros
This allows the user to register plugins without having to put them into
the correct aspect::XXXPlugin namespace.
>---------------------------------------------------------------
9dd0862c9ca4179c7cbf24d2539bb0ebf3ac1f26
include/aspect/boundary_composition/interface.h | 4 ++--
include/aspect/boundary_temperature/interface.h | 4 ++--
include/aspect/compositional_initial_conditions/interface.h | 4 ++--
include/aspect/geometry_model/interface.h | 4 ++--
include/aspect/gravity_model/interface.h | 4 ++--
include/aspect/heating_model/interface.h | 4 ++--
include/aspect/initial_conditions/interface.h | 4 ++--
include/aspect/material_model/interface.h | 4 ++--
include/aspect/mesh_refinement/interface.h | 4 ++--
include/aspect/postprocess/interface.h | 4 ++--
include/aspect/postprocess/visualization.h | 4 ++--
include/aspect/termination_criteria/interface.h | 4 ++--
include/aspect/velocity_boundary_conditions/interface.h | 4 ++--
13 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/include/aspect/boundary_composition/interface.h b/include/aspect/boundary_composition/interface.h
index dcd30d8..82ce954 100644
--- a/include/aspect/boundary_composition/interface.h
+++ b/include/aspect/boundary_composition/interface.h
@@ -156,10 +156,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_BOUNDARY_COMPOSITION_MODEL_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::BoundaryComposition::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::BoundaryComposition::register_boundary_composition<2>, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::BoundaryComposition::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::BoundaryComposition::register_boundary_composition<3>, \
name, description); \
}
diff --git a/include/aspect/boundary_temperature/interface.h b/include/aspect/boundary_temperature/interface.h
index 877a739..c421d2d 100644
--- a/include/aspect/boundary_temperature/interface.h
+++ b/include/aspect/boundary_temperature/interface.h
@@ -175,10 +175,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_BOUNDARY_TEMPERATURE_MODEL_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::BoundaryTemperature::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::BoundaryTemperature::register_boundary_temperature<2>, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::BoundaryTemperature::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::BoundaryTemperature::register_boundary_temperature<3>, \
name, description); \
}
diff --git a/include/aspect/compositional_initial_conditions/interface.h b/include/aspect/compositional_initial_conditions/interface.h
index f4c27f2..b85d033 100644
--- a/include/aspect/compositional_initial_conditions/interface.h
+++ b/include/aspect/compositional_initial_conditions/interface.h
@@ -166,10 +166,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_COMPOSITIONAL_INITIAL_CONDITIONS_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::CompositionalInitialConditions::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::CompositionalInitialConditions::register_initial_conditions_model<2>, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::CompositionalInitialConditions::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::CompositionalInitialConditions::register_initial_conditions_model<3>, \
name, description); \
}
diff --git a/include/aspect/geometry_model/interface.h b/include/aspect/geometry_model/interface.h
index c2e3be5..6ac3707 100644
--- a/include/aspect/geometry_model/interface.h
+++ b/include/aspect/geometry_model/interface.h
@@ -216,10 +216,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_GEOMETRY_MODEL_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::GeometryModel::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::GeometryModel::register_geometry_model<2>, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::GeometryModel::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::GeometryModel::register_geometry_model<3>, \
name, description); \
}
diff --git a/include/aspect/gravity_model/interface.h b/include/aspect/gravity_model/interface.h
index 113a9da..d247c46 100644
--- a/include/aspect/gravity_model/interface.h
+++ b/include/aspect/gravity_model/interface.h
@@ -149,10 +149,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_GRAVITY_MODEL_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::GravityModel::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::GravityModel::register_gravity_model<2>, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::GravityModel::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::GravityModel::register_gravity_model<3>, \
name, description); \
}
diff --git a/include/aspect/heating_model/interface.h b/include/aspect/heating_model/interface.h
index 27375f0..7c2adbb 100644
--- a/include/aspect/heating_model/interface.h
+++ b/include/aspect/heating_model/interface.h
@@ -180,10 +180,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_HEATING_MODEL_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::HeatingModel::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::HeatingModel::register_heating_model<2>, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::HeatingModel::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::HeatingModel::register_heating_model<3>, \
name, description); \
}
diff --git a/include/aspect/initial_conditions/interface.h b/include/aspect/initial_conditions/interface.h
index a82a2f1..59dbdcb 100644
--- a/include/aspect/initial_conditions/interface.h
+++ b/include/aspect/initial_conditions/interface.h
@@ -182,10 +182,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_INITIAL_CONDITIONS_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::InitialConditions::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::InitialConditions::register_initial_conditions_model<2>, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::InitialConditions::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::InitialConditions::register_initial_conditions_model<3>, \
name, description); \
}
diff --git a/include/aspect/material_model/interface.h b/include/aspect/material_model/interface.h
index 98649f2..0459bd0 100644
--- a/include/aspect/material_model/interface.h
+++ b/include/aspect/material_model/interface.h
@@ -844,10 +844,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_MATERIAL_MODEL_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::MaterialModel::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::MaterialModel::register_material_model<2>, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::MaterialModel::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::MaterialModel::register_material_model<3>, \
name, description); \
}
diff --git a/include/aspect/mesh_refinement/interface.h b/include/aspect/mesh_refinement/interface.h
index c557d73..4dfb618 100644
--- a/include/aspect/mesh_refinement/interface.h
+++ b/include/aspect/mesh_refinement/interface.h
@@ -271,10 +271,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_MESH_REFINEMENT_CRITERION_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::MeshRefinement::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::MeshRefinement::Manager<2>::register_mesh_refinement_criterion, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::MeshRefinement::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::MeshRefinement::Manager<3>::register_mesh_refinement_criterion, \
name, description); \
}
diff --git a/include/aspect/postprocess/interface.h b/include/aspect/postprocess/interface.h
index e25de70..34199a8 100644
--- a/include/aspect/postprocess/interface.h
+++ b/include/aspect/postprocess/interface.h
@@ -326,10 +326,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_POSTPROCESSOR_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::Postprocess::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::Postprocess::Manager<2>::register_postprocessor, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::Postprocess::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::Postprocess::Manager<3>::register_postprocessor, \
name, description); \
}
diff --git a/include/aspect/postprocess/visualization.h b/include/aspect/postprocess/visualization.h
index 2b5e437..d9a1bf9 100644
--- a/include/aspect/postprocess/visualization.h
+++ b/include/aspect/postprocess/visualization.h
@@ -458,10 +458,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_VISUALIZATION_POSTPROCESSOR_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<VisualizationPostprocessors::Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::Postprocess::VisualizationPostprocessors::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::Postprocess::Visualization<2>::register_visualization_postprocessor, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<VisualizationPostprocessors::Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::Postprocess::VisualizationPostprocessors::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::Postprocess::Visualization<3>::register_visualization_postprocessor, \
name, description); \
}
diff --git a/include/aspect/termination_criteria/interface.h b/include/aspect/termination_criteria/interface.h
index c329f02..1962260 100644
--- a/include/aspect/termination_criteria/interface.h
+++ b/include/aspect/termination_criteria/interface.h
@@ -275,10 +275,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_TERMINATION_CRITERION_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::TerminationCriteria::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::TerminationCriteria::Manager<2>::register_termination_criterion, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::TerminationCriteria::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::TerminationCriteria::Manager<3>::register_termination_criterion, \
name, description); \
}
diff --git a/include/aspect/velocity_boundary_conditions/interface.h b/include/aspect/velocity_boundary_conditions/interface.h
index 67dc1f7..c4a5f46 100644
--- a/include/aspect/velocity_boundary_conditions/interface.h
+++ b/include/aspect/velocity_boundary_conditions/interface.h
@@ -188,10 +188,10 @@ namespace aspect
template class classname<3>; \
namespace ASPECT_REGISTER_VELOCITY_BOUNDARY_CONDITIONS_ ## classname \
{ \
- aspect::internal::Plugins::RegisterHelper<Interface<2>,classname<2> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::VelocityBoundaryConditions::Interface<2>,classname<2> > \
dummy_ ## classname ## _2d (&aspect::VelocityBoundaryConditions::register_velocity_boundary_conditions_model<2>, \
name, description); \
- aspect::internal::Plugins::RegisterHelper<Interface<3>,classname<3> > \
+ aspect::internal::Plugins::RegisterHelper<aspect::VelocityBoundaryConditions::Interface<3>,classname<3> > \
dummy_ ## classname ## _3d (&aspect::VelocityBoundaryConditions::register_velocity_boundary_conditions_model<3>, \
name, description); \
}
More information about the CIG-COMMITS
mailing list