From ec34dab45f184bf8147b610e6e36e90b46dd8f14 Mon Sep 17 00:00:00 2001 From: Nicolas Chaves Date: Wed, 10 Feb 2016 16:20:08 -0500 Subject: [PATCH] MACOS simple bugs corrected. --- lib/cpExtensions/Algorithms/KalmanConstantFilter.cxx | 6 ++---- lib/cpExtensions/Algorithms/KalmanFilter.cxx | 6 ++---- lib/cpExtensions/Algorithms/KalmanVelocityFilter.cxx | 6 ++---- lib/cpExtensions/DataStructures/Graph.hxx | 6 ++---- lib/cpPlugins/Interface/ParametersListWidget.cxx | 10 +++++----- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/lib/cpExtensions/Algorithms/KalmanConstantFilter.cxx b/lib/cpExtensions/Algorithms/KalmanConstantFilter.cxx index df901f0..0fd5d6c 100644 --- a/lib/cpExtensions/Algorithms/KalmanConstantFilter.cxx +++ b/lib/cpExtensions/Algorithms/KalmanConstantFilter.cxx @@ -43,9 +43,7 @@ cpExtensions::Algorithms::KalmanConstantFilter< T >:: // ------------------------------------------------------------------------- // Explicit instantiations -using namespace cpExtensions::Algorithms; - -template class KalmanConstantFilter< float >; -template class KalmanConstantFilter< double >; +template class cpExtensions::Algorithms::KalmanConstantFilter< float >; +template class cpExtensions::Algorithms::KalmanConstantFilter< double >; // eof - $RCSfile$ diff --git a/lib/cpExtensions/Algorithms/KalmanFilter.cxx b/lib/cpExtensions/Algorithms/KalmanFilter.cxx index e8424fc..add2041 100644 --- a/lib/cpExtensions/Algorithms/KalmanFilter.cxx +++ b/lib/cpExtensions/Algorithms/KalmanFilter.cxx @@ -131,9 +131,7 @@ cpExtensions::Algorithms::KalmanFilter< T >:: // ------------------------------------------------------------------------- // Explicit instantiations -using namespace cpExtensions::Algorithms; - -template class KalmanFilter< float >; -template class KalmanFilter< double >; +template class cpExtensions::Algorithms::KalmanFilter< float >; +template class cpExtensions::Algorithms::KalmanFilter< double >; // eof - $RCSfile$ diff --git a/lib/cpExtensions/Algorithms/KalmanVelocityFilter.cxx b/lib/cpExtensions/Algorithms/KalmanVelocityFilter.cxx index 1333bf8..a725e16 100644 --- a/lib/cpExtensions/Algorithms/KalmanVelocityFilter.cxx +++ b/lib/cpExtensions/Algorithms/KalmanVelocityFilter.cxx @@ -84,9 +84,7 @@ cpExtensions::Algorithms::KalmanVelocityFilter< T >:: // ------------------------------------------------------------------------- // Explicit instantiations -using namespace cpExtensions::Algorithms; - -template class KalmanVelocityFilter< float >; -template class KalmanVelocityFilter< double >; +template class cpExtensions::Algorithms::KalmanVelocityFilter< float >; +template class cpExtensions::Algorithms::KalmanVelocityFilter< double >; // eof - $RCSfile$ diff --git a/lib/cpExtensions/DataStructures/Graph.hxx b/lib/cpExtensions/DataStructures/Graph.hxx index b7b045c..d2d2d23 100644 --- a/lib/cpExtensions/DataStructures/Graph.hxx +++ b/lib/cpExtensions/DataStructures/Graph.hxx @@ -104,10 +104,8 @@ RemoveVertex( const I& index ) } // elihw } // rof - return( true ); - } - else - return( false ); + + } // fi } // ------------------------------------------------------------------------- diff --git a/lib/cpPlugins/Interface/ParametersListWidget.cxx b/lib/cpPlugins/Interface/ParametersListWidget.cxx index 7ac8534..4214ecd 100644 --- a/lib/cpPlugins/Interface/ParametersListWidget.cxx +++ b/lib/cpPlugins/Interface/ParametersListWidget.cxx @@ -66,10 +66,10 @@ GetIntValues( ) const { const char* text = table->item( i, 0 )->text( ).toStdString( ).c_str( ); char* ptr = 0; - double v = std::strtod( text, &ptr ); + double v = strtod( text, &ptr ); if( *ptr == '\0' && ptr != text ) values.push_back( int( v ) ); - + } // rof return( values ); } @@ -85,7 +85,7 @@ GetUintValues( ) const { const char* text = table->item( i, 0 )->text( ).toStdString( ).c_str( ); char* ptr = 0; - double v = std::strtod( text, &ptr ); + double v = strtod( text, &ptr ); if( *ptr == '\0' && ptr != text && v >= double( 0 ) ) values.push_back( ( unsigned int )( v ) ); @@ -104,10 +104,10 @@ GetDoubleValues( ) const { const char* text = table->item( i, 0 )->text( ).toStdString( ).c_str( ); char* ptr = 0; - double v = std::strtod( text, &ptr ); + double v = strtod( text, &ptr ); if( *ptr == '\0' && ptr != text ) values.push_back( v ); - + } // rof return( values ); } -- 2.47.1