From 8caa97401ace0159faac37b4340a828461402449 Mon Sep 17 00:00:00 2001 From: Alexander Wiebel Date: Tue, 22 Aug 2017 14:26:40 +0200 Subject: [PATCH] [FIX #412] removed deprecated dynamic exception specifications --- src/core/common/math/linearAlgebra/WMatrixFixed.h | 4 ++-- src/core/dataHandler/WEEGChannelInfo.cpp | 2 +- src/core/dataHandler/WEEGChannelInfo.h | 2 +- src/core/dataHandler/WEEGPositionsLibrary.cpp | 2 +- src/core/dataHandler/WEEGPositionsLibrary.h | 2 +- src/core/dataHandler/io/WReader.cpp | 6 +++--- src/core/dataHandler/io/WReader.h | 6 +++--- src/modules/data/io/WReaderEEG.cpp | 2 +- src/modules/data/io/WReaderEEG.h | 2 +- src/modules/eegView/WEEGEvent.cpp | 2 +- src/modules/eegView/WEEGEvent.h | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/core/common/math/linearAlgebra/WMatrixFixed.h b/src/core/common/math/linearAlgebra/WMatrixFixed.h index fc9266dda..0110db961 100644 --- a/src/core/common/math/linearAlgebra/WMatrixFixed.h +++ b/src/core/common/math/linearAlgebra/WMatrixFixed.h @@ -1000,7 +1000,7 @@ public: * * \throw WOutOfBounds if the specified index is invalid */ - ValueT& at( size_t row, size_t col ) throw( WOutOfBounds ) + ValueT& at( size_t row, size_t col ) { if( ( row >= Rows ) || ( col >= Cols ) ) { @@ -1023,7 +1023,7 @@ public: * * \throw WOutOfBounds if the specified index is invalid */ - const ValueT& at( size_t row, size_t col ) const throw( WOutOfBounds ) + const ValueT& at( size_t row, size_t col ) const { if( ( row >= Rows ) || ( col >= Cols ) ) { diff --git a/src/core/dataHandler/WEEGChannelInfo.cpp b/src/core/dataHandler/WEEGChannelInfo.cpp index aa173fea7..8883a590b 100644 --- a/src/core/dataHandler/WEEGChannelInfo.cpp +++ b/src/core/dataHandler/WEEGChannelInfo.cpp @@ -82,7 +82,7 @@ std::string WEEGChannelInfo::getLabel() const return m_label; } -WPosition WEEGChannelInfo::getPosition() const throw( WDHException ) +WPosition WEEGChannelInfo::getPosition() const { if( m_hasPosition ) { diff --git a/src/core/dataHandler/WEEGChannelInfo.h b/src/core/dataHandler/WEEGChannelInfo.h index 3bc7d3f6b..2b66d5716 100644 --- a/src/core/dataHandler/WEEGChannelInfo.h +++ b/src/core/dataHandler/WEEGChannelInfo.h @@ -78,7 +78,7 @@ public: * * \return position */ - WPosition getPosition() const throw( WDHException ); + WPosition getPosition() const; protected: private: diff --git a/src/core/dataHandler/WEEGPositionsLibrary.cpp b/src/core/dataHandler/WEEGPositionsLibrary.cpp index 981a5ccdd..7a707c0c2 100644 --- a/src/core/dataHandler/WEEGPositionsLibrary.cpp +++ b/src/core/dataHandler/WEEGPositionsLibrary.cpp @@ -40,7 +40,7 @@ WEEGPositionsLibrary::WEEGPositionsLibrary( const std::map< std::string, WPositi } } -WPosition WEEGPositionsLibrary::getPosition( std::string label ) const throw( WOutOfBounds ) +WPosition WEEGPositionsLibrary::getPosition( std::string label ) const { std::map< std::string, WPosition >::const_iterator iter = m_positions.find( string_utils::toUpper( label ) ); diff --git a/src/core/dataHandler/WEEGPositionsLibrary.h b/src/core/dataHandler/WEEGPositionsLibrary.h index 34ba5a03f..aca77eb44 100644 --- a/src/core/dataHandler/WEEGPositionsLibrary.h +++ b/src/core/dataHandler/WEEGPositionsLibrary.h @@ -53,7 +53,7 @@ public: * \param label label of the electrode * \return position of the electrode */ - WPosition getPosition( std::string label ) const throw( WOutOfBounds ); + WPosition getPosition( std::string label ) const; protected: private: diff --git a/src/core/dataHandler/io/WReader.cpp b/src/core/dataHandler/io/WReader.cpp index 6a36cef69..a2ee1f896 100644 --- a/src/core/dataHandler/io/WReader.cpp +++ b/src/core/dataHandler/io/WReader.cpp @@ -28,17 +28,17 @@ #include "../exceptions/WDHNoSuchFile.h" #include "WReader.h" -WReader::WReader( std::string fname ) throw( WDHNoSuchFile ) +WReader::WReader( std::string fname ) { setFilename( fname ); // not in constructor list since fileExcsits check } -void WReader::setFileName( std::string fname ) throw( WDHNoSuchFile ) +void WReader::setFileName( std::string fname ) { setFilename( fname ); } -void WReader::setFilename( std::string fname ) throw( WDHNoSuchFile ) +void WReader::setFilename( std::string fname ) { m_fname = fname; if( !fileExists( m_fname ) ) diff --git a/src/core/dataHandler/io/WReader.h b/src/core/dataHandler/io/WReader.h index dd62bafbc..0ea70681a 100644 --- a/src/core/dataHandler/io/WReader.h +++ b/src/core/dataHandler/io/WReader.h @@ -45,7 +45,7 @@ public: * \param fname path to file which should be loaded * \throws WDHNoSuchFile */ - explicit WReader( std::string fname ) throw( WDHNoSuchFile ); + explicit WReader( std::string fname ); /** * Reset the file name and checks if it exists. @@ -54,7 +54,7 @@ public: * \throws WDHNoSuchFile * \deprecated use setFilename instead. */ - OW_API_DEPRECATED void setFileName( std::string fname ) throw( WDHNoSuchFile ); + OW_API_DEPRECATED void setFileName( std::string fname ); /** * Reset the file name and checks if it exists. @@ -62,7 +62,7 @@ public: * \param fname file name * \throws WDHNoSuchFile */ - void setFilename( std::string fname ) throw( WDHNoSuchFile ); + void setFilename( std::string fname ); protected: std::string m_fname; //!< Absolute path of the file to read from diff --git a/src/modules/data/io/WReaderEEG.cpp b/src/modules/data/io/WReaderEEG.cpp index 3e11fa7d8..9ce4c86a2 100644 --- a/src/modules/data/io/WReaderEEG.cpp +++ b/src/modules/data/io/WReaderEEG.cpp @@ -32,7 +32,7 @@ #include "WReaderEEG.h" -WReaderEEG::WReaderEEG( std::string fileName ) throw( WDHIOFailure ) +WReaderEEG::WReaderEEG( std::string fileName ) : WReader( fileName ) { } diff --git a/src/modules/data/io/WReaderEEG.h b/src/modules/data/io/WReaderEEG.h index c6fc75bfd..c4b53ac5b 100644 --- a/src/modules/data/io/WReaderEEG.h +++ b/src/modules/data/io/WReaderEEG.h @@ -45,7 +45,7 @@ protected: * \param fileName Path to be loaded * \throw WDHIOFailure in case of an error */ - explicit WReaderEEG( std::string fileName ) throw( WDHIOFailure ); + explicit WReaderEEG( std::string fileName ); /** * Load electrode positions from ELC file with same name diff --git a/src/modules/eegView/WEEGEvent.cpp b/src/modules/eegView/WEEGEvent.cpp index f6aad46b9..3508d1f48 100644 --- a/src/modules/eegView/WEEGEvent.cpp +++ b/src/modules/eegView/WEEGEvent.cpp @@ -55,7 +55,7 @@ WEEGEvent::WEEGEvent( double time, osg::ref_ptr< WGEGroupNode > parentNode, bool snapToDipole, bool proofOfConcept, - boost::shared_ptr< WDataSetDipoles > dipoles ) throw( WOutOfBounds ) + boost::shared_ptr< WDataSetDipoles > dipoles ) : m_time( time ), m_parentNode( parentNode ) { diff --git a/src/modules/eegView/WEEGEvent.h b/src/modules/eegView/WEEGEvent.h index 77b021889..00fa54118 100644 --- a/src/modules/eegView/WEEGEvent.h +++ b/src/modules/eegView/WEEGEvent.h @@ -65,7 +65,7 @@ public: osg::ref_ptr< WGEGroupNode > parentNode, bool snapToDipole, bool proofOfConcept, - boost::shared_ptr< WDataSetDipoles > dipoles ) throw( WOutOfBounds ); + boost::shared_ptr< WDataSetDipoles > dipoles ); /** * Constructor for an empty event -- GitLab