clears warnings about deprecated dynamic excpetion specifications (058db690) · Commits · IA2 / metadata_importer

src/Client.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -347,7 +347,7 @@ void Client::resetConnection()
		// Client::encodeHeader()
		//==============================================================================
		void Client::encodeHeader(std::vector<boost::uint8_t>& buf, boost::uint32_t size)
		throw(std::runtime_error)
		/throw(std::runtime_error)/
		{
		DEBUG_STREAM << "Client::encodeHeader()" << endl;

		@@ -364,7 +364,7 @@ void Client::encodeHeader(std::vector<boost::uint8_t>& buf, boost::uint32_t size
		// Client::decodeHeader()
		//==============================================================================
		boost::uint32_t Client::decodeHeader(std::vector<boost::uint8_t>& buf)
		throw(std::runtime_error)
		/throw(std::runtime_error)/
		{
		DEBUG_STREAM << "Client::decodeHeader()" << endl;

src/Client.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -115,10 +115,10 @@ protected:
		// [Protected] Header encoding decoding methods
		//------------------------------------------------------------------------------
		virtual void encodeHeader(std::vector<boost::uint8_t>&, boost::uint32_t)
		throw(std::runtime_error);
		/throw(std::runtime_error)/;

		virtual boost::uint32_t decodeHeader(std::vector<boost::uint8_t>&)
		throw(std::runtime_error);
		/throw(std::runtime_error)/;

		//------------------------------------------------------------------------------
		// [Protected] Class variables

src/DBManager.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ DBManager::SP DBManager::create(Tango::DeviceImpl* deviceImpl_p,
		//==============================================================================
		// DBManager::connect()
		//==============================================================================
		void DBManager::connect() throw(soci::soci_error)
		void DBManager::connect() /throw(soci::soci_error)/
		{
		DEBUG_STREAM << "DBManager::connect()" << endl;

		@@ -92,7 +92,7 @@ void DBManager::disconnect()
		// DBManager::retrieveInformation()
		//==============================================================================
		DBManager::InformationList DBManager::retrieveInformation(std::string schema,
		std::string table) throw(soci::soci_error)
		std::string table) /throw(soci::soci_error)/
		{
		DEBUG_STREAM << "DBManager::retrieveInformation()" << endl;

		@@ -124,7 +124,7 @@ DBManager::InformationList DBManager::retrieveInformation(std::string schema,
		// DBManager::retrieveLastTimestamp()
		//==============================================================================
		std::tm DBManager::retrieveLastTimestamp(std::string schema, std::string table)
		throw(soci::soci_error)
		/throw(soci::soci_error)/
		{
		DEBUG_STREAM << "DBManager::retrieveLastTimestamp()" << endl;

		@@ -145,7 +145,7 @@ std::tm DBManager::retrieveLastTimestamp(std::string schema, std::string table)
		// DBManager::persistMetadata()
		//==============================================================================
		void DBManager::persistMetadata(std::string schema, std::string table,
		const Response::Metadata& metadata) throw(soci::soci_error, std::out_of_range)
		const Response::Metadata& metadata) /throw(soci::soci_error, std::out_of_range)/
		{
		DEBUG_STREAM << "DBManager::persistMetadata()" << endl;

		@@ -166,7 +166,7 @@ void DBManager::persistMetadata(std::string schema, std::string table,
		// DBManager::composeInsertQuery()
		//==============================================================================
		std::string DBManager::composeInsertQuery(std::string schema, std::string table,
		const Response::Metadata::Row& row) throw(std::out_of_range)
		const Response::Metadata::Row& row) /throw(std::out_of_range)/
		{
		DEBUG_STREAM << "DBManager::composeInsertQuery()" << endl;

src/DBManager.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ public:
		//------------------------------------------------------------------------------
		// [Public] Connection handling methods
		//------------------------------------------------------------------------------
		virtual void connect() throw(soci::soci_error);
		virtual void connect() /throw(soci::soci_error)/;

		virtual void disconnect();

		@@ -77,20 +77,20 @@ public:
		typedef std::vector< InformationTuple > InformationList;

		virtual InformationList retrieveInformation(std::string,
		std::string) throw(soci::soci_error);
		std::string) /throw(soci::soci_error)/;

		virtual std::tm retrieveLastTimestamp(std::string, std::string)
		throw(soci::soci_error);
		/throw(soci::soci_error)/;

		virtual void persistMetadata(std::string, std::string, const Response::Metadata&)
		throw(soci::soci_error, std::out_of_range);
		/throw(soci::soci_error, std::out_of_range)/;

		protected:
		//------------------------------------------------------------------------------
		// [Protected] Utilities method
		//------------------------------------------------------------------------------
		virtual std::string composeInsertQuery(std::string, std::string,
		const Response::Metadata::Row&) throw(std::out_of_range);
		const Response::Metadata::Row&) /throw(std::out_of_range)/;

		//------------------------------------------------------------------------------
		// [Protected] Class variables

src/MetadataImporter.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -680,7 +680,7 @@ void MetadataImporter::incrementTupleCounter(long tupleIncrement)
		// MetadataImporter::checkIfFileExists()
		//==============================================================================
		void MetadataImporter::checkIfFileExists(std::string fileName)
		throw(std::invalid_argument)
		/throw(std::invalid_argument)/
		{
		DEBUG_STREAM << "MetadataImporter::checkIfFileExists() - " << device_name << endl;