add minor modification to ExpressionParser class

issue #27
mikrosimage · Sep 4, 2013 · 786aad5 · 786aad5
1 parent f6c2ff7
commit 786aad5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/libraries/basicElement/src/Tools/ExpressionParser.hpp b/libraries/basicElement/src/Tools/ExpressionParser.hpp
@@ -26,8 +26,8 @@ class ExpressionParser
 	template< typename NumberType >
 	void setVariables( const std::map < std::string, NumberType >& varMap );
 
-	template< typename Type >
-	Type getExpressionResult( const std::string& expression );
+	template< typename ResultType >
+	ResultType getExpressionResult( const std::string& expression );
 
 	void addPythonHeader( const std::string& pythonString );
 

diff --git a/libraries/basicElement/src/Tools/ExpressionParser.tcc b/libraries/basicElement/src/Tools/ExpressionParser.tcc
@@ -42,17 +42,17 @@ void ExpressionParser::setVariables( const std::map < std::string, NumberType >&
 	}
 }
 
-template< typename Type >
-Type ExpressionParser::getExpressionResult( const std::string& expression )
+template< typename ResultType >
+ResultType ExpressionParser::getExpressionResult( const std::string& expression )
 {
-	Type result = 0;
+	ResultType result = 0;
 	try
 	{
 		LOG_TRACE( _contextString.c_str() );
 		LOG_TRACE( expression );
 		bpy::exec( _contextString.c_str(), _mainNamespace );
 		bpy::object returnText = bpy::eval( expression.c_str(), _mainNamespace );
-		result = bpy::extract< Type >( returnText );
+		result = bpy::extract< ResultType >( returnText );
 	}
 	catch( const bpy::error_already_set& error )
 	{