...

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

diff --git a/lib/cpPlugins/BaseObjects/Parameters.cxx b/lib/cpPlugins/BaseObjects/Parameters.cxx
index 88a82af798f2952b74d52c78149d198cfa1d236e..d3adec4cf34c7904bf292d3df01219fdb590fffe 100644 (file)
--- a/lib/cpPlugins/BaseObjects/Parameters.cxx
+++ b/lib/cpPlugins/BaseObjects/Parameters.cxx
@@ -1,5 +1,5 @@
 #include <cpPlugins/BaseObjects/Parameters.h>
-#include <cpExtensions/Utility.h>
+#include <cpPlugins/Utility.h>
 #include <tinyxml2/tinyxml2.h>
 
 // -------------------------------------------------------------------------
@@ -209,12 +209,6 @@ ConfigureAsIntTypesChoices( const std::string& name )
   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 );
 }
 
@@ -239,6 +233,12 @@ ConfigureAsScalarTypesChoices( const std::string& name )
   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 );
 }
 
@@ -678,7 +678,7 @@ _GetList( const std::string& name ) const
     if( i->second.first == ( Self::Type )( _Enum ) )
     {
       std::vector< std::string > tokens;
-      cpExtensions::Tokenize( tokens, i->second.second, "#" );
+      cpPlugins::Tokenize( tokens, i->second.second, "#" );
       for( auto t = tokens.begin( ); t != tokens.end( ); ++t )
       {
         if( typeid( _Type ) != typeid( std::string ) )