From 29cdf0d367f9965210b09f674f99e4dd4b3a7356 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 4 Sep 2018 21:18:32 +0200
Subject: Remove dynamic exception specifications

---
 ingen/Configuration.hpp | 11 +++++++----
 ingen/Serialiser.hpp    | 16 ++++++++++------
 src/Configuration.cpp   |  4 +---
 src/Serialiser.cpp      |  7 ++-----
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/ingen/Configuration.hpp b/ingen/Configuration.hpp
index 67104422..6759b4b0 100644
--- a/ingen/Configuration.hpp
+++ b/ingen/Configuration.hpp
@@ -79,7 +79,11 @@ public:
 		explicit FileError(const std::string& m) : Exception(m) {}
 	};
 
-	void parse(int argc, char** argv) throw (OptionError);
+	/** Parse a command line.
+	 *
+	 * @throw OptionError
+	 */
+	void parse(int argc, char **argv);
 
 	/** Load a specific file. */
 	bool load(const FilePath& path);
@@ -102,7 +106,7 @@ public:
 	FilePath save(URIMap&            uri_map,
 	              const std::string& app,
 	              const FilePath&    filename,
-	              unsigned           scopes) throw (FileError);
+	              unsigned           scopes);
 
 	/** Load files from the standard configuration directories for the app.
 	 *
@@ -140,8 +144,7 @@ private:
 	std::string variable_string(LV2_URID type) const;
 
 	int set_value_from_string(Configuration::Option& option,
-	                          const std::string&     value)
-			throw (Configuration::OptionError);
+	                          const std::string&     value);
 
 	Forge&            _forge;
 	const std::string _shortdesc;
diff --git a/ingen/Serialiser.hpp b/ingen/Serialiser.hpp
index 50d4f693..fcfb40a7 100644
--- a/ingen/Serialiser.hpp
+++ b/ingen/Serialiser.hpp
@@ -71,14 +71,18 @@ public:
 	virtual void start_to_file(const Raul::Path&  root,
 	                           const std::string& filename);
 
-	/** Serialize an object (graph, block, or port). */
-	virtual void serialise(SPtr<const Node> object)
-			throw (std::logic_error);
+	/** Serialize an object (graph, block, or port).
+	 *
+	 * @throw std::logic_error
+	 */
+	virtual void serialise(SPtr<const Node> object);
 
-	/** Serialize an arc. */
+	/** Serialize an arc.
+	 *
+	 * @throw std::logic_error
+	 */
 	virtual void serialise_arc(const Sord::Node& parent,
-	                           SPtr<const Arc>   arc)
-			throw (std::logic_error);
+	                           SPtr<const Arc>   arc);
 
 	/** Finish serialization.
 	 *
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index ec9cbf0f..c797cf93 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -133,7 +133,6 @@ Configuration::print_usage(const std::string& program, std::ostream& os)
 int
 Configuration::set_value_from_string(Configuration::Option& option,
                                      const std::string&     value)
-		throw (Configuration::OptionError)
 {
 	if (option.type == _forge.Int) {
 		char* endptr = nullptr;
@@ -160,7 +159,7 @@ Configuration::set_value_from_string(Configuration::Option& option,
 
 /** Parse command line arguments. */
 void
-Configuration::parse(int argc, char** argv) throw (Configuration::OptionError)
+Configuration::parse(int argc, char** argv)
 {
 	for (int i = 1; i < argc; ++i) {
 		if (argv[i][0] != '-' || !strcmp(argv[i], "-")) {
@@ -265,7 +264,6 @@ Configuration::save(URIMap&            uri_map,
                     const std::string& app,
                     const FilePath&    filename,
                     unsigned           scopes)
-		throw (FileError)
 {
 	// Save to file if it is absolute, otherwise save to user config dir
 	FilePath path = filename;
diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp
index ffa4d7dc..034ff96b 100644
--- a/src/Serialiser.cpp
+++ b/src/Serialiser.cpp
@@ -87,8 +87,7 @@ struct Serialiser::Impl {
 	                   const std::set<const Resource*> plugins);
 
 	void serialise_arc(const Sord::Node& parent,
-	                   SPtr<const Arc>   arc)
-			throw (std::logic_error);
+	                   SPtr<const Arc>   arc);
 
 	std::string finish();
 
@@ -278,7 +277,7 @@ Serialiser::Impl::path_rdf_node(const Raul::Path& path)
 }
 
 void
-Serialiser::serialise(SPtr<const Node> object) throw (std::logic_error)
+Serialiser::serialise(SPtr<const Node> object)
 {
 	if (!me->_model) {
 		throw std::logic_error("serialise called without serialisation in progress");
@@ -493,7 +492,6 @@ Serialiser::Impl::serialise_port(const Node*       port,
 void
 Serialiser::serialise_arc(const Sord::Node& parent,
                           SPtr<const Arc>   arc)
-		throw (std::logic_error)
 {
 	return me->serialise_arc(parent, arc);
 }
@@ -501,7 +499,6 @@ Serialiser::serialise_arc(const Sord::Node& parent,
 void
 Serialiser::Impl::serialise_arc(const Sord::Node& parent,
                                 SPtr<const Arc>   arc)
-		throw (std::logic_error)
 {
 	if (!_model) {
 		throw std::logic_error(
-- 
cgit v1.2.1