..

[cpPlugins.git] / lib / cpPlugins / BaseObjects / Parameters.cxx

diff --git a/lib/cpPlugins/BaseObjects/Parameters.cxx b/lib/cpPlugins/BaseObjects/Parameters.cxx
index 227898cddc843e4dadfd8750b4a4caf3e8822e98..cfb5f83b220aaa3b0a8488887932aa2df34c8deb 100644 (file)
--- a/lib/cpPlugins/BaseObjects/Parameters.cxx
+++ b/lib/cpPlugins/BaseObjects/Parameters.cxx
@@ -197,12 +197,8 @@ void cpPlugins::BaseObjects::Parameters::
 ConfigureAsRealTypesChoices( const std::string& name )
 {
   std::vector< std::string > choices;
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
   choices.push_back( "float" );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
   choices.push_back( "double" );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
   this->ConfigureAsChoices( name, choices );
 }
 
@@ -211,22 +207,14 @@ void cpPlugins::BaseObjects::Parameters::
 ConfigureAsIntTypesChoices( const std::string& name )
 {
   std::vector< std::string > choices;
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
   choices.push_back( "char" );
   choices.push_back( "uchar" );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_char
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
   choices.push_back( "short" );
   choices.push_back( "ushort" );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_short
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
   choices.push_back( "int" );
   choices.push_back( "uint" );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_int
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
   choices.push_back( "long" );
   choices.push_back( "ulong" );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_long
   this->ConfigureAsChoices( name, choices );
 }
 
@@ -235,28 +223,16 @@ void cpPlugins::BaseObjects::Parameters::
 ConfigureAsScalarTypesChoices( const std::string& name )
 {
   std::vector< std::string > choices;
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_char
   choices.push_back( "char" );
   choices.push_back( "uchar" );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_char
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_short
   choices.push_back( "short" );
   choices.push_back( "ushort" );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_short
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_int
   choices.push_back( "int" );
   choices.push_back( "uint" );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_int
-#ifdef cpPlugins_CONFIG_INTEGER_TYPES_long
   choices.push_back( "long" );
   choices.push_back( "ulong" );
-#endif // cpPlugins_CONFIG_INTEGER_TYPES_long
-#ifdef cpPlugins_CONFIG_REAL_TYPES_float
   choices.push_back( "float" );
-#endif // cpPlugins_CONFIG_REAL_TYPES_float
-#ifdef cpPlugins_CONFIG_REAL_TYPES_double
   choices.push_back( "double" );
-#endif // cpPlugins_CONFIG_REAL_TYPES_double
   this->ConfigureAsChoices( name, choices );
 }