From 52f7cf52887d0bbef02207d41e8ebd07695734fd Mon Sep 17 00:00:00 2001 From: Tomas Oberhuber <tomas.oberhuber@fjfi.cvut.cz> Date: Mon, 14 Jul 2014 13:53:23 +0200 Subject: [PATCH] Fixing the parameter container. --- install | 2 +- src/config/tnlParameterContainer.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install b/install index a5190b01d7..baaf73e4e4 100755 --- a/install +++ b/install @@ -2,7 +2,7 @@ TARGET=TNL INSTALL_PREFIX=${HOME}/local -WITH_CUDA=yes +WITH_CUDA=no TEMPLATE_EXPLICIT_INSTANTIATION=yes #VERBOSE="VERBOSE=1" diff --git a/src/config/tnlParameterContainer.h b/src/config/tnlParameterContainer.h index dfc1efe242..3b1067dfb1 100644 --- a/src/config/tnlParameterContainer.h +++ b/src/config/tnlParameterContainer.h @@ -130,7 +130,7 @@ template< class T > bool tnlParameterContainer :: SetParameter( const char* name { if( parameters[ i ] -> name == name ) { - if( parameters[ i ] -> type == GetParameterType( value ) ) + if( parameters[ i ] -> type == getParameterType< T >() ) { ( ( tnlParameter< T > * ) parameters[ i ] ) -> value = value; return true; @@ -139,7 +139,7 @@ template< class T > bool tnlParameterContainer :: SetParameter( const char* name { cerr << "Parameter " << name << " already exists with different type " << parameters[ i ] -> type << " not " - << GetParameterType( value ) << endl; + << getParameterType< T >() << endl; abort( ); return false; } -- GitLab