aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Wouter van Kesteren <woutershep@gmail.com> 2015-05-08 05:12:20 +0200
committerAvatar Bo ├śrsted Andresen <zlin@exherbo.org> 2015-08-21 17:19:40 +0200
commit82a9e92b64b79eb2db0047bead68f227c9c31e24 (patch)
tree4a924d622b732b2e5ad9c961b512934a83b8bd1f
parente6dfb43fcbb0a760777376611035485c352e85ae (diff)
downloadpaludis-82a9e92b64b79eb2db0047bead68f227c9c31e24.tar.gz
paludis-82a9e92b64b79eb2db0047bead68f227c9c31e24.tar.xz
throw() -> noexcept
Change-Id: I461abfda8b7297c1bd04f1090f8d58fa96364616 Reviewed-on: https://galileo.mailstation.de/gerrit/1892 Reviewed-by: Saleem Abdulrasool <compnerd@compnerd.org> Reviewed-by: Kylie McClain <somasis@exherbo.org>
-rw-r--r--paludis/action.cc4
-rw-r--r--paludis/action.hh4
-rw-r--r--paludis/args/args_error.cc6
-rw-r--r--paludis/args/args_error.hh6
-rw-r--r--paludis/args/bad_argument.cc2
-rw-r--r--paludis/args/bad_argument.hh2
-rw-r--r--paludis/choice.cc6
-rw-r--r--paludis/choice.hh6
-rw-r--r--paludis/command_output_manager.cc2
-rw-r--r--paludis/command_output_manager.hh2
-rw-r--r--paludis/dep_spec.cc2
-rw-r--r--paludis/dep_spec.hh2
-rw-r--r--paludis/distribution.cc2
-rw-r--r--paludis/distribution.hh2
-rw-r--r--paludis/elike_conditional_dep_spec.cc2
-rw-r--r--paludis/elike_conditional_dep_spec.hh2
-rw-r--r--paludis/elike_use_requirement.cc2
-rw-r--r--paludis/elike_use_requirement.hh2
-rw-r--r--paludis/environment.cc12
-rw-r--r--paludis/environment.hh14
-rw-r--r--paludis/environment_implementation.cc2
-rw-r--r--paludis/environment_implementation.hh2
-rw-r--r--paludis/environments/paludis/paludis_config.cc4
-rw-r--r--paludis/environments/paludis/paludis_config.hh4
-rw-r--r--paludis/environments/portage/portage_environment.cc2
-rw-r--r--paludis/environments/portage/portage_environment.hh2
-rw-r--r--paludis/fs_merger.cc2
-rw-r--r--paludis/fs_merger.hh2
-rw-r--r--paludis/merger.cc2
-rw-r--r--paludis/merger.hh2
-rw-r--r--paludis/name.cc14
-rw-r--r--paludis/name.hh14
-rw-r--r--paludis/ndbam_unmerger.cc2
-rw-r--r--paludis/ndbam_unmerger.hh2
-rw-r--r--paludis/repositories/accounts/accounts_exceptions.cc2
-rw-r--r--paludis/repositories/accounts/accounts_exceptions.hh2
-rw-r--r--paludis/repositories/e/dep_parser.cc2
-rw-r--r--paludis/repositories/e/dep_parser.hh2
-rw-r--r--paludis/repositories/e/e_repository_exceptions.cc4
-rw-r--r--paludis/repositories/e/e_repository_exceptions.hh4
-rw-r--r--paludis/repositories/e/e_repository_id.cc2
-rw-r--r--paludis/repositories/e/e_repository_id.hh2
-rw-r--r--paludis/repositories/e/e_repository_news.cc2
-rw-r--r--paludis/repositories/e/e_repository_news.hh2
-rw-r--r--paludis/repositories/e/eapi.cc2
-rw-r--r--paludis/repositories/e/eapi.hh2
-rw-r--r--paludis/repositories/e/exndbam_repository.cc2
-rw-r--r--paludis/repositories/e/exndbam_repository.hh2
-rw-r--r--paludis/repositories/e/glsa.cc2
-rw-r--r--paludis/repositories/e/glsa.hh2
-rw-r--r--paludis/repositories/e/manifest2_reader.cc2
-rw-r--r--paludis/repositories/e/manifest2_reader.hh2
-rw-r--r--paludis/repositories/e/myoption.cc2
-rw-r--r--paludis/repositories/e/myoption.hh2
-rw-r--r--paludis/repositories/e/vdb_repository.cc4
-rw-r--r--paludis/repositories/e/vdb_repository.hh4
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc2
-rw-r--r--paludis/repositories/e/vdb_unmerger.hh2
-rw-r--r--paludis/repositories/e/xml_things.cc2
-rw-r--r--paludis/repositories/fake/dep_parser.cc2
-rw-r--r--paludis/repositories/fake/dep_parser.hh2
-rw-r--r--paludis/repositories/gemcutter/gemcutter_dependencies_key.cc2
-rw-r--r--paludis/repositories/gemcutter/gemcutter_dependencies_key.hh2
-rw-r--r--paludis/repositories/gemcutter/gemcutter_repository.cc2
-rw-r--r--paludis/repositories/gemcutter/gemcutter_repository.hh2
-rw-r--r--paludis/repositories/gemcutter/json_common.cc2
-rw-r--r--paludis/repositories/gemcutter/json_common.hh2
-rw-r--r--paludis/repositories/repository/repository_repository.cc2
-rw-r--r--paludis/repositories/repository/repository_repository.hh2
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.cc2
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.hh2
-rw-r--r--paludis/repositories/unpackaged/exceptions.cc2
-rw-r--r--paludis/repositories/unpackaged/exceptions.hh2
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.cc2
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.hh2
-rw-r--r--paludis/repository.cc8
-rw-r--r--paludis/repository.hh8
-rw-r--r--paludis/resolver/suggest_restart.cc4
-rw-r--r--paludis/resolver/suggest_restart.hh4
-rw-r--r--paludis/selection.cc2
-rw-r--r--paludis/selection.hh2
-rw-r--r--paludis/set_file.cc2
-rw-r--r--paludis/set_file.hh2
-rw-r--r--paludis/stripper.cc2
-rw-r--r--paludis/stripper.hh2
-rw-r--r--paludis/syncer.cc6
-rw-r--r--paludis/syncer.hh6
-rw-r--r--paludis/unmerger.cc2
-rw-r--r--paludis/unmerger.hh2
-rw-r--r--paludis/user_dep_spec-fwd.hh2
-rw-r--r--paludis/user_dep_spec.cc2
-rw-r--r--paludis/util/config_file.cc4
-rw-r--r--paludis/util/config_file.hh4
-rw-r--r--paludis/util/destringify.cc2
-rw-r--r--paludis/util/destringify.hh2
-rw-r--r--paludis/util/elf.cc2
-rw-r--r--paludis/util/elf.hh2
-rw-r--r--paludis/util/exception.cc18
-rw-r--r--paludis/util/exception.hh18
-rw-r--r--paludis/util/fs_error.cc2
-rw-r--r--paludis/util/fs_error.hh2
-rw-r--r--paludis/util/graph.cc6
-rw-r--r--paludis/util/graph.hh12
-rw-r--r--paludis/util/process.cc2
-rw-r--r--paludis/util/process.hh2
-rw-r--r--paludis/util/pty.cc2
-rw-r--r--paludis/util/pty.hh2
-rw-r--r--paludis/util/safe_ifstream.cc2
-rw-r--r--paludis/util/safe_ifstream.hh2
-rw-r--r--paludis/util/safe_ofstream.cc2
-rw-r--r--paludis/util/safe_ofstream.hh2
-rw-r--r--paludis/util/singleton_TEST.cc2
-rw-r--r--paludis/util/system.cc2
-rw-r--r--paludis/util/system.hh2
-rw-r--r--paludis/util/thread_pool.cc2
-rw-r--r--paludis/util/thread_pool.hh2
-rw-r--r--paludis/util/thread_pool_TEST.cc2
-rw-r--r--paludis/util/tokeniser.cc2
-rw-r--r--paludis/util/tokeniser.hh2
-rw-r--r--paludis/util/wildcard_expander.cc2
-rw-r--r--paludis/util/wildcard_expander.hh2
-rw-r--r--paludis/version_operator.cc2
-rw-r--r--paludis/version_operator.hh2
-rw-r--r--paludis/version_spec.cc4
-rw-r--r--paludis/version_spec.hh4
-rw-r--r--python/dep_spec.cc2
-rw-r--r--python/exception.cc6
-rw-r--r--python/exception.hh6
-rw-r--r--src/clients/cave/command_factory.cc2
-rw-r--r--src/clients/cave/command_factory.hh2
-rw-r--r--src/clients/cave/exceptions.cc16
-rw-r--r--src/clients/cave/exceptions.hh16
-rw-r--r--src/clients/cave/format_string.cc2
-rw-r--r--src/clients/cave/format_string.hh2
134 files changed, 230 insertions, 230 deletions
diff --git a/paludis/action.cc b/paludis/action.cc
index 11e1c39..38f7d31 100644
--- a/paludis/action.cc
+++ b/paludis/action.cc
@@ -222,12 +222,12 @@ SupportsActionTestBase::~SupportsActionTestBase()
{
}
-ActionFailedError::ActionFailedError(const std::string & msg) throw () :
+ActionFailedError::ActionFailedError(const std::string & msg) noexcept :
Exception(msg)
{
}
-ActionAbortedError::ActionAbortedError(const std::string & msg) throw () :
+ActionAbortedError::ActionAbortedError(const std::string & msg) noexcept :
Exception(msg)
{
}
diff --git a/paludis/action.hh b/paludis/action.hh
index 039ba6d..d89d3e9 100644
--- a/paludis/action.hh
+++ b/paludis/action.hh
@@ -661,7 +661,7 @@ namespace paludis
///\name Basic operations
///\{
- ActionFailedError(const std::string & msg) throw ();
+ ActionFailedError(const std::string & msg) noexcept;
///\}
};
@@ -680,7 +680,7 @@ namespace paludis
///\name Basic operations
///\{
- ActionAbortedError(const std::string &) throw ();
+ ActionAbortedError(const std::string &) noexcept;
///\}
};
diff --git a/paludis/args/args_error.cc b/paludis/args/args_error.cc
index fb64b8c..6b21210 100644
--- a/paludis/args/args_error.cc
+++ b/paludis/args/args_error.cc
@@ -21,17 +21,17 @@
using namespace paludis::args;
-ArgsError::ArgsError(const std::string & our_message) throw () :
+ArgsError::ArgsError(const std::string & our_message) noexcept :
paludis::Exception("Error handling command line: " + our_message)
{
}
-BadValue::BadValue(const std::string& option, const std::string& value) throw () :
+BadValue::BadValue(const std::string& option, const std::string& value) noexcept :
ArgsError("Invalid parameter '" + value + "' for argument '" + option + "'")
{
}
-MissingValue::MissingValue(const std::string & arg) throw() :
+MissingValue::MissingValue(const std::string & arg) noexcept :
ArgsError("No parameter given for '" + arg + "'")
{
}
diff --git a/paludis/args/args_error.hh b/paludis/args/args_error.hh
index 762fb34..3e4005e 100644
--- a/paludis/args/args_error.hh
+++ b/paludis/args/args_error.hh
@@ -50,7 +50,7 @@ namespace paludis
/**
* Constructor.
*/
- ArgsError(const std::string & message) throw ();
+ ArgsError(const std::string & message) noexcept;
};
/**
@@ -66,7 +66,7 @@ namespace paludis
/**
* Constructor
*/
- BadValue(const std::string& option, const std::string& value) throw();
+ BadValue(const std::string& option, const std::string& value) noexcept;
};
/**
@@ -83,7 +83,7 @@ namespace paludis
/**
* Constructor.
*/
- MissingValue(const std::string & arg) throw ();
+ MissingValue(const std::string & arg) noexcept;
};
}
}
diff --git a/paludis/args/bad_argument.cc b/paludis/args/bad_argument.cc
index c1a6c9e..64495c4 100644
--- a/paludis/args/bad_argument.cc
+++ b/paludis/args/bad_argument.cc
@@ -21,7 +21,7 @@
using namespace paludis::args;
-BadArgument::BadArgument(const std::string & option) throw () :
+BadArgument::BadArgument(const std::string & option) noexcept :
ArgsError("Bad argument '" + option + "'")
{
}
diff --git a/paludis/args/bad_argument.hh b/paludis/args/bad_argument.hh
index adf35f3..78de5d3 100644
--- a/paludis/args/bad_argument.hh
+++ b/paludis/args/bad_argument.hh
@@ -49,7 +49,7 @@ namespace paludis
/**
* Constructor.
*/
- BadArgument(const std::string & option) throw ();
+ BadArgument(const std::string & option) noexcept;
};
}
}
diff --git a/paludis/choice.cc b/paludis/choice.cc
index 94d881e..d434379 100644
--- a/paludis/choice.cc
+++ b/paludis/choice.cc
@@ -49,7 +49,7 @@ namespace paludis
};
}
-ChoicePrefixNameError::ChoicePrefixNameError(const std::string & n) throw () :
+ChoicePrefixNameError::ChoicePrefixNameError(const std::string & n) noexcept :
NameError(n, "choice prefix name")
{
}
@@ -85,7 +85,7 @@ WrappedValueTraits<ChoicePrefixNameTag>::validate(const std::string & s)
return true;
}
-ChoiceNameWithPrefixError::ChoiceNameWithPrefixError(const std::string & n) throw () :
+ChoiceNameWithPrefixError::ChoiceNameWithPrefixError(const std::string & n) noexcept :
NameError(n, "choice name with prefix")
{
}
@@ -122,7 +122,7 @@ WrappedValueTraits<ChoiceNameWithPrefixTag>::validate(const std::string & s)
return true;
}
-UnprefixedChoiceNameError::UnprefixedChoiceNameError(const std::string & n) throw () :
+UnprefixedChoiceNameError::UnprefixedChoiceNameError(const std::string & n) noexcept :
NameError(n, "unprefixed choice name")
{
}
diff --git a/paludis/choice.hh b/paludis/choice.hh
index 16fd1c7..c5347ca 100644
--- a/paludis/choice.hh
+++ b/paludis/choice.hh
@@ -69,7 +69,7 @@ namespace paludis
public NameError
{
public:
- ChoicePrefixNameError(const std::string &) throw ();
+ ChoicePrefixNameError(const std::string &) noexcept;
};
/**
@@ -83,7 +83,7 @@ namespace paludis
public NameError
{
public:
- ChoiceNameWithPrefixError(const std::string &) throw ();
+ ChoiceNameWithPrefixError(const std::string &) noexcept;
};
/**
@@ -97,7 +97,7 @@ namespace paludis
public NameError
{
public:
- UnprefixedChoiceNameError(const std::string &) throw ();
+ UnprefixedChoiceNameError(const std::string &) noexcept;
};
template <>
diff --git a/paludis/command_output_manager.cc b/paludis/command_output_manager.cc
index 8c7066d..9fcf040 100644
--- a/paludis/command_output_manager.cc
+++ b/paludis/command_output_manager.cc
@@ -31,7 +31,7 @@
using namespace paludis;
-CommandOutputManagerError::CommandOutputManagerError(const std::string & s) throw () :
+CommandOutputManagerError::CommandOutputManagerError(const std::string & s) noexcept :
Exception(s)
{
}
diff --git a/paludis/command_output_manager.hh b/paludis/command_output_manager.hh
index f953b2e..3e2c9a9 100644
--- a/paludis/command_output_manager.hh
+++ b/paludis/command_output_manager.hh
@@ -35,7 +35,7 @@ namespace paludis
public Exception
{
public:
- CommandOutputManagerError(const std::string &) throw ();
+ CommandOutputManagerError(const std::string &) noexcept;
};
class PALUDIS_VISIBLE CommandOutputManager :
diff --git a/paludis/dep_spec.cc b/paludis/dep_spec.cc
index df4f1ba..239e684 100644
--- a/paludis/dep_spec.cc
+++ b/paludis/dep_spec.cc
@@ -328,7 +328,7 @@ paludis::operator<< (std::ostream & s, const PlainTextLabelDepSpec & l)
return s;
}
-PackageDepSpecError::PackageDepSpecError(const std::string & msg) throw () :
+PackageDepSpecError::PackageDepSpecError(const std::string & msg) noexcept :
Exception(msg)
{
}
diff --git a/paludis/dep_spec.hh b/paludis/dep_spec.hh
index 3fc076a..8b0b441 100644
--- a/paludis/dep_spec.hh
+++ b/paludis/dep_spec.hh
@@ -595,7 +595,7 @@ namespace paludis
///\name Basic operations
///\{
- PackageDepSpecError(const std::string & msg) throw ();
+ PackageDepSpecError(const std::string & msg) noexcept;
///\}
};
diff --git a/paludis/distribution.cc b/paludis/distribution.cc
index d29fd33..726cf45 100644
--- a/paludis/distribution.cc
+++ b/paludis/distribution.cc
@@ -36,7 +36,7 @@
using namespace paludis;
-DistributionConfigurationError::DistributionConfigurationError(const std::string & s) throw () :
+DistributionConfigurationError::DistributionConfigurationError(const std::string & s) noexcept :
ConfigurationError("Distribution configuration error: " + s)
{
}
diff --git a/paludis/distribution.hh b/paludis/distribution.hh
index a8327a7..43dd664 100644
--- a/paludis/distribution.hh
+++ b/paludis/distribution.hh
@@ -94,7 +94,7 @@ namespace paludis
///\name Basic operations
///\{
- DistributionConfigurationError(const std::string &) throw ();
+ DistributionConfigurationError(const std::string &) noexcept;
///\}
};
diff --git a/paludis/elike_conditional_dep_spec.cc b/paludis/elike_conditional_dep_spec.cc
index 4b9fe30..9fa9799 100644
--- a/paludis/elike_conditional_dep_spec.cc
+++ b/paludis/elike_conditional_dep_spec.cc
@@ -39,7 +39,7 @@
using namespace paludis;
-ELikeConditionalDepSpecParseError::ELikeConditionalDepSpecParseError(const std::string & s, const std::string & m) throw () :
+ELikeConditionalDepSpecParseError::ELikeConditionalDepSpecParseError(const std::string & s, const std::string & m) noexcept :
Exception("Error parsing conditional dep spec '" + s + "': " + m)
{
}
diff --git a/paludis/elike_conditional_dep_spec.hh b/paludis/elike_conditional_dep_spec.hh
index 37ea34c..9dbe00b 100644
--- a/paludis/elike_conditional_dep_spec.hh
+++ b/paludis/elike_conditional_dep_spec.hh
@@ -29,7 +29,7 @@ namespace paludis
public Exception
{
public:
- ELikeConditionalDepSpecParseError(const std::string &, const std::string &) throw ();
+ ELikeConditionalDepSpecParseError(const std::string &, const std::string &) noexcept;
};
}
diff --git a/paludis/elike_use_requirement.cc b/paludis/elike_use_requirement.cc
index 996c09b..3699f7a 100644
--- a/paludis/elike_use_requirement.cc
+++ b/paludis/elike_use_requirement.cc
@@ -857,7 +857,7 @@ namespace
}
}
-ELikeUseRequirementError::ELikeUseRequirementError(const std::string & s, const std::string & m) throw () :
+ELikeUseRequirementError::ELikeUseRequirementError(const std::string & s, const std::string & m) noexcept :
Exception("Error parsing use requirement '" + s + "': " + m)
{
}
diff --git a/paludis/elike_use_requirement.hh b/paludis/elike_use_requirement.hh
index 1c81f72..2707340 100644
--- a/paludis/elike_use_requirement.hh
+++ b/paludis/elike_use_requirement.hh
@@ -29,7 +29,7 @@ namespace paludis
public Exception
{
public:
- ELikeUseRequirementError(const std::string &, const std::string &) throw ();
+ ELikeUseRequirementError(const std::string &, const std::string &) noexcept;
};
}
diff --git a/paludis/environment.cc b/paludis/environment.cc
index 978901d..6202713 100644
--- a/paludis/environment.cc
+++ b/paludis/environment.cc
@@ -50,24 +50,24 @@ namespace paludis
};
}
-DuplicateRepositoryError::DuplicateRepositoryError(const std::string & name) throw () :
+DuplicateRepositoryError::DuplicateRepositoryError(const std::string & name) noexcept :
Exception("A repository named '" + name + "' already exists")
{
}
-NoSuchPackageError::NoSuchPackageError(const std::string & our_name) throw () :
+NoSuchPackageError::NoSuchPackageError(const std::string & our_name) noexcept :
Exception("Could not find '" + our_name + "'"),
_name(our_name)
{
}
-NoSuchRepositoryError::NoSuchRepositoryError(const RepositoryName & n) throw () :
+NoSuchRepositoryError::NoSuchRepositoryError(const RepositoryName & n) noexcept :
Exception("Could not find repository '" + stringify(n) + "'"),
_name(n)
{
}
-NoSuchRepositoryError::~NoSuchRepositoryError() throw ()
+NoSuchRepositoryError::~NoSuchRepositoryError() noexcept
{
}
@@ -84,7 +84,7 @@ struct AmbiguousPackageNameError::NameData
};
AmbiguousPackageNameError::AmbiguousPackageNameError(const std::string & our_name,
- const std::shared_ptr<const Sequence<std::string> > & names) throw () :
+ const std::shared_ptr<const Sequence<std::string> > & names) noexcept :
Exception("Ambiguous package name '" + our_name + "' (candidates are " + join(names->begin(), names->end(), ", ") + ")"),
_name_data(new NameData)
{
@@ -100,7 +100,7 @@ AmbiguousPackageNameError::AmbiguousPackageNameError(const AmbiguousPackageNameE
_name_data->names = other._name_data->names;
}
-AmbiguousPackageNameError::~AmbiguousPackageNameError() throw ()
+AmbiguousPackageNameError::~AmbiguousPackageNameError() noexcept
{
delete _name_data;
}
diff --git a/paludis/environment.hh b/paludis/environment.hh
index 33fa528..00f6c9a 100644
--- a/paludis/environment.hh
+++ b/paludis/environment.hh
@@ -74,11 +74,11 @@ namespace paludis
///\name Basic operations
///\{
- AmbiguousPackageNameError(const std::string & name, const std::shared_ptr<const Sequence<std::string> > &) throw ();
+ AmbiguousPackageNameError(const std::string & name, const std::shared_ptr<const Sequence<std::string> > &) noexcept;
AmbiguousPackageNameError(const AmbiguousPackageNameError &);
- virtual ~AmbiguousPackageNameError() throw ();
+ virtual ~AmbiguousPackageNameError() noexcept;
///\}
@@ -113,7 +113,7 @@ namespace paludis
/**
* Constructor.
*/
- DuplicateRepositoryError(const std::string & name) throw ();
+ DuplicateRepositoryError(const std::string & name) noexcept;
};
/**
@@ -132,9 +132,9 @@ namespace paludis
///\name Basic operations
///\{
- NoSuchPackageError(const std::string & name) throw ();
+ NoSuchPackageError(const std::string & name) noexcept;
- virtual ~NoSuchPackageError() throw ()
+ virtual ~NoSuchPackageError() noexcept
{
}
@@ -166,9 +166,9 @@ namespace paludis
///\name Basic operations
///\{
- NoSuchRepositoryError(const RepositoryName &) throw ();
+ NoSuchRepositoryError(const RepositoryName &) noexcept;
- ~NoSuchRepositoryError() throw ();
+ ~NoSuchRepositoryError() noexcept;
///\}
diff --git a/paludis/environment_implementation.cc b/paludis/environment_implementation.cc
index c035867..fceaa93 100644
--- a/paludis/environment_implementation.cc
+++ b/paludis/environment_implementation.cc
@@ -653,7 +653,7 @@ EnvironmentImplementation::expand_licence(
return result;
}
-DuplicateSetError::DuplicateSetError(const SetName & s) throw () :
+DuplicateSetError::DuplicateSetError(const SetName & s) noexcept :
Exception("A set named '" + stringify(s) + "' already exists")
{
}
diff --git a/paludis/environment_implementation.hh b/paludis/environment_implementation.hh
index d32fbad..7cb4b90 100644
--- a/paludis/environment_implementation.hh
+++ b/paludis/environment_implementation.hh
@@ -137,7 +137,7 @@ namespace paludis
public Exception
{
public:
- DuplicateSetError(const SetName & s) throw ();
+ DuplicateSetError(const SetName & s) noexcept;
};
}
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 0af9c81..bf54200 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -361,12 +361,12 @@ namespace paludis
};
}
-PaludisConfigError::PaludisConfigError(const std::string & msg) throw () :
+PaludisConfigError::PaludisConfigError(const std::string & msg) noexcept :
ConfigurationError("Paludis configuration error: " + msg)
{
}
-PaludisConfigNoDirectoryError::PaludisConfigNoDirectoryError(const std::string & msg) throw () :
+PaludisConfigNoDirectoryError::PaludisConfigNoDirectoryError(const std::string & msg) noexcept :
PaludisConfigError("Paludis configuration error: " + msg)
{
}
diff --git a/paludis/environments/paludis/paludis_config.hh b/paludis/environments/paludis/paludis_config.hh
index 539ab88..03fcd81 100644
--- a/paludis/environments/paludis/paludis_config.hh
+++ b/paludis/environments/paludis/paludis_config.hh
@@ -66,7 +66,7 @@ namespace paludis
/**
* Constructor.
*/
- PaludisConfigError(const std::string & msg) throw ();
+ PaludisConfigError(const std::string & msg) noexcept;
};
/**
@@ -84,7 +84,7 @@ namespace paludis
///\name Basic operations
///\{
- PaludisConfigNoDirectoryError(const std::string & msg) throw ();
+ PaludisConfigNoDirectoryError(const std::string & msg) noexcept;
///\}
};
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 6239dd0..4563d39 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -80,7 +80,7 @@ typedef std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::string>
typedef std::list<std::shared_ptr<const PackageDepSpec> > PackageMask;
typedef std::list<std::shared_ptr<const PackageDepSpec> > PackageUnmask;
-PortageEnvironmentConfigurationError::PortageEnvironmentConfigurationError(const std::string & s) throw () :
+PortageEnvironmentConfigurationError::PortageEnvironmentConfigurationError(const std::string & s) noexcept :
ConfigurationError(s)
{
}
diff --git a/paludis/environments/portage/portage_environment.hh b/paludis/environments/portage/portage_environment.hh
index 7030dab..4794ba6 100644
--- a/paludis/environments/portage/portage_environment.hh
+++ b/paludis/environments/portage/portage_environment.hh
@@ -42,7 +42,7 @@ namespace paludis
///\name Basic operations
///\{
- PortageEnvironmentConfigurationError(const std::string &) throw ();
+ PortageEnvironmentConfigurationError(const std::string &) noexcept;
///\}
};
diff --git a/paludis/fs_merger.cc b/paludis/fs_merger.cc
index 7b6d074..0fa0321 100644
--- a/paludis/fs_merger.cc
+++ b/paludis/fs_merger.cc
@@ -98,7 +98,7 @@ namespace paludis
};
}
-FSMergerError::FSMergerError(const std::string & s) throw () :
+FSMergerError::FSMergerError(const std::string & s) noexcept :
MergerError(s)
{
}
diff --git a/paludis/fs_merger.hh b/paludis/fs_merger.hh
index c0f67a8..a27f339 100644
--- a/paludis/fs_merger.hh
+++ b/paludis/fs_merger.hh
@@ -135,7 +135,7 @@ namespace paludis
///\name Basic operations
///\{
- FSMergerError(const std::string & msg) throw ();
+ FSMergerError(const std::string & msg) noexcept;
///\}
};
diff --git a/paludis/merger.cc b/paludis/merger.cc
index 3a404aa..333c64e 100644
--- a/paludis/merger.cc
+++ b/paludis/merger.cc
@@ -34,7 +34,7 @@
using namespace paludis;
-MergerError::MergerError(const std::string & m) throw () :
+MergerError::MergerError(const std::string & m) noexcept :
Exception(m)
{
}
diff --git a/paludis/merger.hh b/paludis/merger.hh
index 72520f0..cb2aa5f 100644
--- a/paludis/merger.hh
+++ b/paludis/merger.hh
@@ -77,7 +77,7 @@ namespace paludis
public Exception
{
public:
- MergerError(const std::string &) throw ();
+ MergerError(const std::string &) noexcept;
};
class PALUDIS_VISIBLE Merger
diff --git a/paludis/name.cc b/paludis/name.cc
index 5891834..91c3041 100644
--- a/paludis/name.cc
+++ b/paludis/name.cc
@@ -89,7 +89,7 @@ paludis::operator<< (std::ostream & s, const QualifiedPackageName & q)
return s;
}
-SlotNameError::SlotNameError(const std::string & name) throw () :
+SlotNameError::SlotNameError(const std::string & name) noexcept :
NameError(name, "slot name")
{
}
@@ -114,7 +114,7 @@ WrappedValueTraits<SlotNameTag>::validate(const std::string & s)
return true;
}
-PackageNamePartError::PackageNamePartError(const std::string & name) throw () :
+PackageNamePartError::PackageNamePartError(const std::string & name) noexcept :
NameError(name, "package name part")
{
}
@@ -169,7 +169,7 @@ WrappedValueTraits<CategoryNamePartTag>::validate(const std::string & s)
return true;
}
-CategoryNamePartError::CategoryNamePartError(const std::string & name) throw () :
+CategoryNamePartError::CategoryNamePartError(const std::string & name) noexcept :
NameError(name, "category name part")
{
}
@@ -194,12 +194,12 @@ WrappedValueTraits<RepositoryNameTag>::validate(const std::string & s)
return true;
}
-RepositoryNameError::RepositoryNameError(const std::string & name) throw () :
+RepositoryNameError::RepositoryNameError(const std::string & name) noexcept :
NameError(name, "repository")
{
}
-KeywordNameError::KeywordNameError(const std::string & name) throw () :
+KeywordNameError::KeywordNameError(const std::string & name) noexcept :
NameError(name, "keyword name")
{
}
@@ -334,12 +334,12 @@ WrappedValueTraits<SetNameTag>::validate(const std::string & s)
return true;
}
-SetNameError::SetNameError(const std::string & name) throw () :
+SetNameError::SetNameError(const std::string & name) noexcept :
NameError(name, "set")
{
}
-PartNameError::PartNameError(const std::string & name) throw () :
+PartNameError::PartNameError(const std::string & name) noexcept :
NameError(name, "part")
{
}
diff --git a/paludis/name.hh b/paludis/name.hh
index ba6147c..5eda812 100644
--- a/paludis/name.hh
+++ b/paludis/name.hh
@@ -57,7 +57,7 @@ namespace paludis
/**
* Constructor.
*/
- PackageNamePartError(const std::string & name) throw ();
+ PackageNamePartError(const std::string & name) noexcept;
};
template <>
@@ -86,7 +86,7 @@ namespace paludis
/**
* Constructor.
*/
- CategoryNamePartError(const std::string & name) throw ();
+ CategoryNamePartError(const std::string & name) noexcept;
};
template <>
@@ -153,7 +153,7 @@ namespace paludis
/**
* Constructor.
*/
- SlotNameError(const std::string & name) throw ();
+ SlotNameError(const std::string & name) noexcept;
};
template <>
@@ -179,7 +179,7 @@ namespace paludis
/**
* Constructor.
*/
- RepositoryNameError(const std::string & name) throw ();
+ RepositoryNameError(const std::string & name) noexcept;
};
template <>
@@ -205,7 +205,7 @@ namespace paludis
/**
* Constructor.
*/
- KeywordNameError(const std::string & name) throw ();
+ KeywordNameError(const std::string & name) noexcept;
};
template <>
@@ -231,7 +231,7 @@ namespace paludis
/**
* Constructor.
*/
- SetNameError(const std::string & name) throw ();
+ SetNameError(const std::string & name) noexcept;
};
template <>
@@ -256,7 +256,7 @@ namespace paludis
/**
* Constructor
*/
- PartNameError(const std::string & name) throw ();
+ PartNameError(const std::string & name) noexcept;
};
template <>
diff --git a/paludis/ndbam_unmerger.cc b/paludis/ndbam_unmerger.cc
index 454974d..165735e 100644
--- a/paludis/ndbam_unmerger.cc
+++ b/paludis/ndbam_unmerger.cc
@@ -305,7 +305,7 @@ NDBAMUnmerger::display(const std::string & message) const
_imp->options.output_manager()->stdout_stream() << message << std::endl;
}
-NDBAMUnmergerError::NDBAMUnmergerError(const std::string & s) throw () :
+NDBAMUnmergerError::NDBAMUnmergerError(const std::string & s) noexcept :
UnmergerError(s)
{
}
diff --git a/paludis/ndbam_unmerger.hh b/paludis/ndbam_unmerger.hh
index ba15e7e..77ca0d2 100644
--- a/paludis/ndbam_unmerger.hh
+++ b/paludis/ndbam_unmerger.hh
@@ -62,7 +62,7 @@ namespace paludis
public UnmergerError
{
public:
- NDBAMUnmergerError(const std::string &) throw ();
+ NDBAMUnmergerError(const std::string &) noexcept;
};
/**
diff --git a/paludis/repositories/accounts/accounts_exceptions.cc b/paludis/repositories/accounts/accounts_exceptions.cc
index 39f4ba3..6cac81e 100644
--- a/paludis/repositories/accounts/accounts_exceptions.cc
+++ b/paludis/repositories/accounts/accounts_exceptions.cc
@@ -22,7 +22,7 @@
using namespace paludis;
using namespace paludis::accounts_repository;
-AccountsRepositoryConfigurationError::AccountsRepositoryConfigurationError(const std::string & s) throw () :
+AccountsRepositoryConfigurationError::AccountsRepositoryConfigurationError(const std::string & s) noexcept :
ConfigurationError("AccountsRepository configuration error: " + s)
{
}
diff --git a/paludis/repositories/accounts/accounts_exceptions.hh b/paludis/repositories/accounts/accounts_exceptions.hh
index 68dca53..a7a8006 100644
--- a/paludis/repositories/accounts/accounts_exceptions.hh
+++ b/paludis/repositories/accounts/accounts_exceptions.hh
@@ -31,7 +31,7 @@ namespace paludis
public ConfigurationError
{
public:
- AccountsRepositoryConfigurationError(const std::string &) throw ();
+ AccountsRepositoryConfigurationError(const std::string &) noexcept;
};
}
}
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index 140f4df..ad49f48 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -60,7 +60,7 @@ using namespace paludis::erepository;
#include <paludis/repositories/e/dep_parser-se.cc>
-EDepParseError::EDepParseError(const std::string & s, const std::string & t) throw () :
+EDepParseError::EDepParseError(const std::string & s, const std::string & t) noexcept :
Exception("Error parsing '" + s + "': " + t)
{
}
diff --git a/paludis/repositories/e/dep_parser.hh b/paludis/repositories/e/dep_parser.hh
index 60ce937..eca7321 100644
--- a/paludis/repositories/e/dep_parser.hh
+++ b/paludis/repositories/e/dep_parser.hh
@@ -46,7 +46,7 @@ namespace paludis
* Constructor.
*/
EDepParseError(const std::string & dep_string,
- const std::string & message) throw ();
+ const std::string & message) noexcept;
};
/**
diff --git a/paludis/repositories/e/e_repository_exceptions.cc b/paludis/repositories/e/e_repository_exceptions.cc
index 351f735..eadfb81 100644
--- a/paludis/repositories/e/e_repository_exceptions.cc
+++ b/paludis/repositories/e/e_repository_exceptions.cc
@@ -22,12 +22,12 @@
using namespace paludis;
ERepositoryConfigurationError::ERepositoryConfigurationError(
- const std::string & msg) throw () :
+ const std::string & msg) noexcept :
ConfigurationError("E Repository configuration error: " + msg)
{
}
-MissingDistfileError::MissingDistfileError(const std::string & s) throw () :
+MissingDistfileError::MissingDistfileError(const std::string & s) noexcept :
Exception(s)
{
}
diff --git a/paludis/repositories/e/e_repository_exceptions.hh b/paludis/repositories/e/e_repository_exceptions.hh
index 98d7c96..bb0d525 100644
--- a/paludis/repositories/e/e_repository_exceptions.hh
+++ b/paludis/repositories/e/e_repository_exceptions.hh
@@ -44,7 +44,7 @@ namespace paludis
/**
* Constructor.
*/
- ERepositoryConfigurationError(const std::string & msg) throw ();
+ ERepositoryConfigurationError(const std::string & msg) noexcept;
};
/**
@@ -59,7 +59,7 @@ namespace paludis
public Exception
{
public:
- MissingDistfileError(const std::string &) throw ();
+ MissingDistfileError(const std::string &) noexcept;
};
}
diff --git a/paludis/repositories/e/e_repository_id.cc b/paludis/repositories/e/e_repository_id.cc
index f8be488..aed198b 100644
--- a/paludis/repositories/e/e_repository_id.cc
+++ b/paludis/repositories/e/e_repository_id.cc
@@ -25,7 +25,7 @@
using namespace paludis;
using namespace paludis::erepository;
-CannotChangeSCMRevision::CannotChangeSCMRevision(const std::string & id_s, const std::string & revision) throw () :
+CannotChangeSCMRevision::CannotChangeSCMRevision(const std::string & id_s, const std::string & revision) noexcept :
Exception("Cannot change SCM revision for '" + id_s + "' to '" + revision + "'")
{
}
diff --git a/paludis/repositories/e/e_repository_id.hh b/paludis/repositories/e/e_repository_id.hh
index f5cfc22..8ef6725 100644
--- a/paludis/repositories/e/e_repository_id.hh
+++ b/paludis/repositories/e/e_repository_id.hh
@@ -33,7 +33,7 @@ namespace paludis
public Exception
{
public:
- CannotChangeSCMRevision(const std::string & id_s, const std::string & revision) throw ();
+ CannotChangeSCMRevision(const std::string & id_s, const std::string & revision) noexcept;
};
class ERepositoryID :
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index 5e0653c..a90e65e 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -390,7 +390,7 @@ NewsFile::end_display_if_profile() const
return DisplayIfProfileConstIterator(_imp->display_if_profile.end());
}
-NewsError::NewsError(const FSPath & f, const std::string & m) throw () :
+NewsError::NewsError(const FSPath & f, const std::string & m) noexcept :
Exception("Error in news file '" + stringify(f) + "': " + m)
{
}
diff --git a/paludis/repositories/e/e_repository_news.hh b/paludis/repositories/e/e_repository_news.hh
index 2e29918..55beb3f 100644
--- a/paludis/repositories/e/e_repository_news.hh
+++ b/paludis/repositories/e/e_repository_news.hh
@@ -66,7 +66,7 @@ namespace paludis
public Exception
{
public:
- NewsError(const FSPath &, const std::string &) throw ();
+ NewsError(const FSPath &, const std::string &) noexcept;
};
/**
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index 8740b3e..51e2363 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -430,7 +430,7 @@ namespace paludis
};
}
-EAPIConfigurationError::EAPIConfigurationError(const std::string & s) throw () :
+EAPIConfigurationError::EAPIConfigurationError(const std::string & s) noexcept :
ConfigurationError("EAPI configuration error: " + s)
{
}
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index d518063..73aefe7 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -256,7 +256,7 @@ namespace paludis
public ConfigurationError
{
public:
- EAPIConfigurationError(const std::string &) throw ();
+ EAPIConfigurationError(const std::string &) noexcept;
};
/**
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index d6ec628..54e5bee 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -267,7 +267,7 @@ ExndbamRepository::is_unimportant() const
}
ExndbamRepositoryConfigurationError::ExndbamRepositoryConfigurationError(
- const std::string & msg) throw () :
+ const std::string & msg) noexcept :
ConfigurationError("Exndbam repository configuration error: " + msg)
{
}
diff --git a/paludis/repositories/e/exndbam_repository.hh b/paludis/repositories/e/exndbam_repository.hh
index deb0325..ea88978 100644
--- a/paludis/repositories/e/exndbam_repository.hh
+++ b/paludis/repositories/e/exndbam_repository.hh
@@ -156,7 +156,7 @@ namespace paludis
/**
* Constructor.
*/
- ExndbamRepositoryConfigurationError(const std::string & msg) throw ();
+ ExndbamRepositoryConfigurationError(const std::string & msg) noexcept;
};
}
diff --git a/paludis/repositories/e/glsa.cc b/paludis/repositories/e/glsa.cc
index ce904ed..62ad2a2 100644
--- a/paludis/repositories/e/glsa.cc
+++ b/paludis/repositories/e/glsa.cc
@@ -213,7 +213,7 @@ GLSA::create_from_xml_file(const std::string & filename)
return erepository::XMLThingsHandle::get_instance()->create_glsa_from_xml_file()(filename);
}
-GLSAError::GLSAError(const std::string & msg, const std::string & filename) throw () :
+GLSAError::GLSAError(const std::string & msg, const std::string & filename) noexcept :
ConfigurationError("GLSA error: " + msg + (filename.empty() ? "" : " in file " + filename))
{
}
diff --git a/paludis/repositories/e/glsa.hh b/paludis/repositories/e/glsa.hh
index 726b8c4..aa4dc38 100644
--- a/paludis/repositories/e/glsa.hh
+++ b/paludis/repositories/e/glsa.hh
@@ -61,7 +61,7 @@ namespace paludis
///\{
GLSAError(const std::string & message,
- const std::string & filename = "") throw ();
+ const std::string & filename = "") noexcept;
///\}
};
diff --git a/paludis/repositories/e/manifest2_reader.cc b/paludis/repositories/e/manifest2_reader.cc
index fb883c9..96a3383 100644
--- a/paludis/repositories/e/manifest2_reader.cc
+++ b/paludis/repositories/e/manifest2_reader.cc
@@ -61,7 +61,7 @@ namespace paludis
};
}
-Manifest2Error::Manifest2Error(const std::string & msg) throw () :
+Manifest2Error::Manifest2Error(const std::string & msg) noexcept :
Exception("Manifest2 Error: " + msg)
{
}
diff --git a/paludis/repositories/e/manifest2_reader.hh b/paludis/repositories/e/manifest2_reader.hh
index e1c8101..9021bff 100644
--- a/paludis/repositories/e/manifest2_reader.hh
+++ b/paludis/repositories/e/manifest2_reader.hh
@@ -63,7 +63,7 @@ namespace paludis
public Exception
{
public:
- Manifest2Error(const std::string & msg) throw ();
+ Manifest2Error(const std::string & msg) noexcept;
};
/**
diff --git a/paludis/repositories/e/myoption.cc b/paludis/repositories/e/myoption.cc
index 2fe8e0f..f7f0b40 100644
--- a/paludis/repositories/e/myoption.cc
+++ b/paludis/repositories/e/myoption.cc
@@ -23,7 +23,7 @@
using namespace paludis;
using namespace paludis::erepository;
-MyOptionsError::MyOptionsError(const std::string & m) throw () :
+MyOptionsError::MyOptionsError(const std::string & m) noexcept :
Exception(m)
{
}
diff --git a/paludis/repositories/e/myoption.hh b/paludis/repositories/e/myoption.hh
index f8f3e8e..43def99 100644
--- a/paludis/repositories/e/myoption.hh
+++ b/paludis/repositories/e/myoption.hh
@@ -34,7 +34,7 @@ namespace paludis
public Exception
{
public:
- MyOptionsError(const std::string & message) throw ();
+ MyOptionsError(const std::string & message) noexcept;
};
std::pair<UnprefixedChoiceName, bool> parse_myoption(const std::string &) PALUDIS_VISIBLE PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index b84ed1d..7aab15e 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -356,13 +356,13 @@ VDBRepository::repository_factory_dependencies(
}
VDBRepositoryConfigurationError::VDBRepositoryConfigurationError(
- const std::string & msg) throw () :
+ const std::string & msg) noexcept :
ConfigurationError("VDB repository configuration error: " + msg)
{
}
VDBRepositoryKeyReadError::VDBRepositoryKeyReadError(
- const std::string & msg) throw () :
+ const std::string & msg) noexcept :
ConfigurationError("VDB repository key read error: " + msg)
{
}
diff --git a/paludis/repositories/e/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh
index 24bde96..0164ca2 100644
--- a/paludis/repositories/e/vdb_repository.hh
+++ b/paludis/repositories/e/vdb_repository.hh
@@ -181,7 +181,7 @@ namespace paludis
/**
* Constructor.
*/
- VDBRepositoryConfigurationError(const std::string & msg) throw ();
+ VDBRepositoryConfigurationError(const std::string & msg) noexcept;
};
/**
@@ -196,7 +196,7 @@ namespace paludis
/**
* Constructor.
*/
- VDBRepositoryKeyReadError(const std::string & msg) throw ();
+ VDBRepositoryKeyReadError(const std::string & msg) noexcept;
};
}
diff --git a/paludis/repositories/e/vdb_unmerger.cc b/paludis/repositories/e/vdb_unmerger.cc
index 988b16e..5061682 100644
--- a/paludis/repositories/e/vdb_unmerger.cc
+++ b/paludis/repositories/e/vdb_unmerger.cc
@@ -288,7 +288,7 @@ VDBUnmerger::display(const std::string & message) const
_imp->options.output_manager()->stdout_stream() << message << std::endl;
}
-VDBUnmergerError::VDBUnmergerError(const std::string & s) throw () :
+VDBUnmergerError::VDBUnmergerError(const std::string & s) noexcept :
UnmergerError(s)
{
}
diff --git a/paludis/repositories/e/vdb_unmerger.hh b/paludis/repositories/e/vdb_unmerger.hh
index c3f49f9..f4c2e5d 100644
--- a/paludis/repositories/e/vdb_unmerger.hh
+++ b/paludis/repositories/e/vdb_unmerger.hh
@@ -74,7 +74,7 @@ namespace paludis
///\name Basic operations
///\{
- VDBUnmergerError(const std::string &) throw ();
+ VDBUnmergerError(const std::string &) noexcept;
///\}
};
diff --git a/paludis/repositories/e/xml_things.cc b/paludis/repositories/e/xml_things.cc
index 6d75383..debd4c1 100644
--- a/paludis/repositories/e/xml_things.cc
+++ b/paludis/repositories/e/xml_things.cc
@@ -40,7 +40,7 @@ namespace
public Exception
{
public:
- XMLError(const std::string & w) throw () :
+ XMLError(const std::string & w) noexcept :
Exception("XML error: " + w)
{
}
diff --git a/paludis/repositories/fake/dep_parser.cc b/paludis/repositories/fake/dep_parser.cc
index 613f03e..e5ea798 100644
--- a/paludis/repositories/fake/dep_parser.cc
+++ b/paludis/repositories/fake/dep_parser.cc
@@ -34,7 +34,7 @@
using namespace paludis;
using namespace paludis::fakerepository;
-FakeDepParseError::FakeDepParseError(const std::string & s, const std::string & t) throw () :
+FakeDepParseError::FakeDepParseError(const std::string & s, const std::string & t) noexcept :
Exception("Error parsing '" + s + "': " + t)
{
}
diff --git a/paludis/repositories/fake/dep_parser.hh b/paludis/repositories/fake/dep_parser.hh
index 360a64f..d09b5cc 100644
--- a/paludis/repositories/fake/dep_parser.hh
+++ b/paludis/repositories/fake/dep_parser.hh
@@ -39,7 +39,7 @@ namespace paludis
* Constructor.
*/
FakeDepParseError(const std::string & dep_string,
- const std::string & message) throw ();
+ const std::string & message) noexcept;
};
/**
diff --git a/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc b/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc
index aaf7478..10e05c4 100644
--- a/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc
+++ b/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc
@@ -46,7 +46,7 @@
using namespace paludis;
using namespace paludis::gemcutter_repository;
-GemcutterDependenciesError::GemcutterDependenciesError(const std::string & s) throw () :
+GemcutterDependenciesError::GemcutterDependenciesError(const std::string & s) noexcept :
Exception(s)
{
}
diff --git a/paludis/repositories/gemcutter/gemcutter_dependencies_key.hh b/paludis/repositories/gemcutter/gemcutter_dependencies_key.hh
index 39097c6..a7afbe6 100644
--- a/paludis/repositories/gemcutter/gemcutter_dependencies_key.hh
+++ b/paludis/repositories/gemcutter/gemcutter_dependencies_key.hh
@@ -33,7 +33,7 @@ namespace paludis
public Exception
{
public:
- GemcutterDependenciesError(const std::string &) throw ();
+ GemcutterDependenciesError(const std::string &) noexcept;
};
class GemcutterDependenciesKey :
diff --git a/paludis/repositories/gemcutter/gemcutter_repository.cc b/paludis/repositories/gemcutter/gemcutter_repository.cc
index 9585b83..eca8986 100644
--- a/paludis/repositories/gemcutter/gemcutter_repository.cc
+++ b/paludis/repositories/gemcutter/gemcutter_repository.cc
@@ -73,7 +73,7 @@ namespace paludis
};
}
-GemcutterRepositoryConfigurationError::GemcutterRepositoryConfigurationError(const std::string & s) throw () :
+GemcutterRepositoryConfigurationError::GemcutterRepositoryConfigurationError(const std::string & s) noexcept :
ConfigurationError("GemcutterRepository configuration error: " + s)
{
}
diff --git a/paludis/repositories/gemcutter/gemcutter_repository.hh b/paludis/repositories/gemcutter/gemcutter_repository.hh
index 4fc5658..778348d 100644
--- a/paludis/repositories/gemcutter/gemcutter_repository.hh
+++ b/paludis/repositories/gemcutter/gemcutter_repository.hh
@@ -41,7 +41,7 @@ namespace paludis
public ConfigurationError
{
public:
- GemcutterRepositoryConfigurationError(const std::string &) throw ();
+ GemcutterRepositoryConfigurationError(const std::string &) noexcept;
};
struct GemcutterRepositoryParams
diff --git a/paludis/repositories/gemcutter/json_common.cc b/paludis/repositories/gemcutter/json_common.cc
index 35b4d1e..d0ac11d 100644
--- a/paludis/repositories/gemcutter/json_common.cc
+++ b/paludis/repositories/gemcutter/json_common.cc
@@ -22,7 +22,7 @@
using namespace paludis;
using namespace paludis::gemcutter_repository;
-JSONError::JSONError(const std::string & s) throw () :
+JSONError::JSONError(const std::string & s) noexcept :
Exception(s)
{
}
diff --git a/paludis/repositories/gemcutter/json_common.hh b/paludis/repositories/gemcutter/json_common.hh
index 5b3eaa7..4331110 100644
--- a/paludis/repositories/gemcutter/json_common.hh
+++ b/paludis/repositories/gemcutter/json_common.hh
@@ -83,7 +83,7 @@ namespace paludis
public Exception
{
public:
- JSONError(const std::string &) throw ();
+ JSONError(const std::string &) noexcept;
};
}
}
diff --git a/paludis/repositories/repository/repository_repository.cc b/paludis/repositories/repository/repository_repository.cc
index d510b59..1472a3e 100644
--- a/paludis/repositories/repository/repository_repository.cc
+++ b/paludis/repositories/repository/repository_repository.cc
@@ -82,7 +82,7 @@ namespace paludis
};
}
-RepositoryRepositoryConfigurationError::RepositoryRepositoryConfigurationError(const std::string & s) throw () :
+RepositoryRepositoryConfigurationError::RepositoryRepositoryConfigurationError(const std::string & s) noexcept :
ConfigurationError("RepositoryRepository configuration error: " + s)
{
}
diff --git a/paludis/repositories/repository/repository_repository.hh b/paludis/repositories/repository/repository_repository.hh
index 1cbfb2e..020d13e 100644
--- a/paludis/repositories/repository/repository_repository.hh
+++ b/paludis/repositories/repository/repository_repository.hh
@@ -42,7 +42,7 @@ namespace paludis
public ConfigurationError
{
public:
- RepositoryRepositoryConfigurationError(const std::string &) throw ();
+ RepositoryRepositoryConfigurationError(const std::string &) noexcept;
};
struct RepositoryRepositoryParams
diff --git a/paludis/repositories/unavailable/unavailable_repository.cc b/paludis/repositories/unavailable/unavailable_repository.cc
index e729ad3..a0da0be 100644
--- a/paludis/repositories/unavailable/unavailable_repository.cc
+++ b/paludis/repositories/unavailable/unavailable_repository.cc
@@ -91,7 +91,7 @@ namespace paludis
};
}
-UnavailableRepositoryConfigurationError::UnavailableRepositoryConfigurationError(const std::string & s) throw () :
+UnavailableRepositoryConfigurationError::UnavailableRepositoryConfigurationError(const std::string & s) noexcept :
ConfigurationError("UnavailableRepository configuration error: " + s)
{
}
diff --git a/paludis/repositories/unavailable/unavailable_repository.hh b/paludis/repositories/unavailable/unavailable_repository.hh
index 6403f7c..bc796e4 100644
--- a/paludis/repositories/unavailable/unavailable_repository.hh
+++ b/paludis/repositories/unavailable/unavailable_repository.hh
@@ -42,7 +42,7 @@ namespace paludis
public ConfigurationError
{
public:
- UnavailableRepositoryConfigurationError(const std::string &) throw ();
+ UnavailableRepositoryConfigurationError(const std::string &) noexcept;
};
struct UnavailableRepositoryParams
diff --git a/paludis/repositories/unpackaged/exceptions.cc b/paludis/repositories/unpackaged/exceptions.cc
index fb3fdb7..3dc3e79 100644
--- a/paludis/repositories/unpackaged/exceptions.cc
+++ b/paludis/repositories/unpackaged/exceptions.cc
@@ -22,7 +22,7 @@
using namespace paludis;
using namespace paludis::unpackaged_repositories;
-RepositoryConfigurationError::RepositoryConfigurationError(const std::string & s) throw () :
+RepositoryConfigurationError::RepositoryConfigurationError(const std::string & s) noexcept :
ConfigurationError(s)
{
}
diff --git a/paludis/repositories/unpackaged/exceptions.hh b/paludis/repositories/unpackaged/exceptions.hh
index 4c44901..1bedc1f 100644
--- a/paludis/repositories/unpackaged/exceptions.hh
+++ b/paludis/repositories/unpackaged/exceptions.hh
@@ -30,7 +30,7 @@ namespace paludis
public ConfigurationError
{
public:
- RepositoryConfigurationError(const std::string & msg) throw ();
+ RepositoryConfigurationError(const std::string & msg) noexcept;
};
}
}
diff --git a/paludis/repositories/unwritten/unwritten_repository.cc b/paludis/repositories/unwritten/unwritten_repository.cc
index c3ad678..c0b21de 100644
--- a/paludis/repositories/unwritten/unwritten_repository.cc
+++ b/paludis/repositories/unwritten/unwritten_repository.cc
@@ -85,7 +85,7 @@ namespace paludis
};
}
-UnwrittenRepositoryConfigurationError::UnwrittenRepositoryConfigurationError(const std::string & s) throw () :
+UnwrittenRepositoryConfigurationError::UnwrittenRepositoryConfigurationError(const std::string & s) noexcept :
ConfigurationError("UnwrittenRepository configuration error: " + s)
{
}
diff --git a/paludis/repositories/unwritten/unwritten_repository.hh b/paludis/repositories/unwritten/unwritten_repository.hh
index 6b67665..38ddb5f 100644
--- a/paludis/repositories/unwritten/unwritten_repository.hh
+++ b/paludis/repositories/unwritten/unwritten_repository.hh
@@ -41,7 +41,7 @@ namespace paludis
public ConfigurationError
{
public:
- UnwrittenRepositoryConfigurationError(const std::string &) throw ();
+ UnwrittenRepositoryConfigurationError(const std::string &) noexcept;
};
struct UnwrittenRepositoryParams
diff --git a/paludis/repository.cc b/paludis/repository.cc
index 4ffaeae..a229214 100644
--- a/paludis/repository.cc
+++ b/paludis/repository.cc
@@ -45,23 +45,23 @@ using namespace paludis;
#include <paludis/repository-se.cc>
-NoSuchSetError::NoSuchSetError(const std::string & our_name) throw () :
+NoSuchSetError::NoSuchSetError(const std::string & our_name) noexcept :
Exception("Could not find '" + our_name + "'"),
_name(our_name)
{
}
-NoSuchSetError::~NoSuchSetError() throw ()
+NoSuchSetError::~NoSuchSetError() noexcept
{
}
-RecursivelyDefinedSetError::RecursivelyDefinedSetError(const std::string & our_name) throw () :
+RecursivelyDefinedSetError::RecursivelyDefinedSetError(const std::string & our_name) noexcept :
Exception("Set '" + our_name + "' is recursively defined"),
_name(our_name)
{
}
-RecursivelyDefinedSetError::~RecursivelyDefinedSetError() throw ()
+RecursivelyDefinedSetError::~RecursivelyDefinedSetError() noexcept
{
}
diff --git a/paludis/repository.hh b/paludis/repository.hh
index 3eac289..d208a20 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -195,9 +195,9 @@ namespace paludis
///\name Basic operations
///\{
- NoSuchSetError(const std::string & name) throw ();
+ NoSuchSetError(const std::string & name) noexcept;
- virtual ~NoSuchSetError() throw ();
+ virtual ~NoSuchSetError() noexcept;
///\}
@@ -224,9 +224,9 @@ namespace paludis
///\name Basic operations
///\{
- RecursivelyDefinedSetError(const std::string & name) throw ();
+ RecursivelyDefinedSetError(const std::string & name) noexcept;
- virtual ~RecursivelyDefinedSetError() throw ();
+ virtual ~RecursivelyDefinedSetError() noexcept;
///\}
diff --git a/paludis/resolver/suggest_restart.cc b/paludis/resolver/suggest_restart.cc
index f2b9f74..c838c54 100644
--- a/paludis/resolver/suggest_restart.cc
+++ b/paludis/resolver/suggest_restart.cc
@@ -58,7 +58,7 @@ SuggestRestart::SuggestRestart(const Resolvent & q,
const std::shared_ptr<const Constraint> & pc,
const std::shared_ptr<const Decision> & nd,
const std::shared_ptr<const Constraint> & nc
- ) throw () :
+ ) noexcept :
Exception("Suggesting restart with " + stringify(nc->spec()) + " for " + stringify(q)),
_imp(q, pd, pc, nd, nc)
{
@@ -70,7 +70,7 @@ SuggestRestart::SuggestRestart(const SuggestRestart & o) :
{
}
-SuggestRestart::~SuggestRestart() throw ()
+SuggestRestart::~SuggestRestart() noexcept
{
}
diff --git a/paludis/resolver/suggest_restart.hh b/paludis/resolver/suggest_restart.hh
index d5b9236..c1eb5d0 100644
--- a/paludis/resolver/suggest_restart.hh
+++ b/paludis/resolver/suggest_restart.hh
@@ -44,9 +44,9 @@ namespace paludis
const std::shared_ptr<const Decision> & previous_decision,
const std::shared_ptr<const Constraint> & problematic_constraint,
const std::shared_ptr<const Decision> & new_decision,
- const std::shared_ptr<const Constraint> & suggested_preset) throw ();
+ const std::shared_ptr<const Constraint> & suggested_preset) noexcept;
SuggestRestart(const SuggestRestart &);
- ~SuggestRestart() throw ();
+ ~SuggestRestart() noexcept;
const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result));
const std::shared_ptr<const Decision> previous_decision() const PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/selection.cc b/paludis/selection.cc
index cad23be..9a6e632 100644
--- a/paludis/selection.cc
+++ b/paludis/selection.cc
@@ -44,7 +44,7 @@
using namespace paludis;
-DidNotGetExactlyOneError::DidNotGetExactlyOneError(const std::string & s, const std::shared_ptr<const PackageIDSet> & r) throw () :
+DidNotGetExactlyOneError::DidNotGetExactlyOneError(const std::string & s, const std::shared_ptr<const PackageIDSet> & r) noexcept :
Exception("Did not get unique result for '" + stringify(s) + "' (got { " + join(indirect_iterator(r->begin()),
indirect_iterator(r->end()), ", ") + "})")
{
diff --git a/paludis/selection.hh b/paludis/selection.hh
index 10ac417..79d163b 100644
--- a/paludis/selection.hh
+++ b/paludis/selection.hh
@@ -54,7 +54,7 @@ namespace paludis
{
public:
DidNotGetExactlyOneError(const std::string &,
- const std::shared_ptr<const PackageIDSet> &) throw ();
+ const std::shared_ptr<const PackageIDSet> &) noexcept;
};
/**
diff --git a/paludis/set_file.cc b/paludis/set_file.cc
index 7210802..313a22a 100644
--- a/paludis/set_file.cc
+++ b/paludis/set_file.cc
@@ -47,7 +47,7 @@ using namespace paludis;
#include <paludis/set_file-se.cc>
-SetFileError::SetFileError(const FSPath & f, const std::string & m) throw () :
+SetFileError::SetFileError(const FSPath & f, const std::string & m) noexcept :
ConfigurationError("In set file '" + stringify(f) + "': " + m)
{
}
diff --git a/paludis/set_file.hh b/paludis/set_file.hh
index e3a853c..722d874 100644
--- a/paludis/set_file.hh
+++ b/paludis/set_file.hh
@@ -89,7 +89,7 @@ namespace paludis
///\name Basic operations
///\{
- SetFileError(const FSPath &, const std::string &) throw ();
+ SetFileError(const FSPath &, const std::string &) noexcept;
///\}
};
diff --git a/paludis/stripper.cc b/paludis/stripper.cc
index 4038c0a..b2a5999 100644
--- a/paludis/stripper.cc
+++ b/paludis/stripper.cc
@@ -47,7 +47,7 @@ using namespace paludis;
typedef std::set<std::pair<dev_t, ino_t> > StrippedSet;
-StripperError::StripperError(const std::string & s) throw () :
+StripperError::StripperError(const std::string & s) noexcept :
Exception(s)
{
}
diff --git a/paludis/stripper.hh b/paludis/stripper.hh
index df6088d..210a4e7 100644
--- a/paludis/stripper.hh
+++ b/paludis/stripper.hh
@@ -54,7 +54,7 @@ namespace paludis
public Exception
{
public:
- StripperError(const std::string &) throw ();
+ StripperError(const std::string &) noexcept;
};
class PALUDIS_VISIBLE Stripper
diff --git a/paludis/syncer.cc b/paludis/syncer.cc
index 7eb6709..4c94f8b 100644
--- a/paludis/syncer.cc
+++ b/paludis/syncer.cc
@@ -38,17 +38,17 @@
using namespace paludis;
-NoSuchSyncerError::NoSuchSyncerError(const std::string & format) throw () :
+NoSuchSyncerError::NoSuchSyncerError(const std::string & format) noexcept :
SyncFailedError("No such syncer for format '" + format + "'")
{
}
-SyncFailedError::SyncFailedError(const std::string & local, const std::string & remote) throw () :
+SyncFailedError::SyncFailedError(const std::string & local, const std::string & remote) noexcept :
Exception("sync of '" + local + "' from '" + remote + "' failed")
{
}
-SyncFailedError::SyncFailedError(const std::string & msg) throw () :
+SyncFailedError::SyncFailedError(const std::string & msg) noexcept :
Exception(msg)
{
}
diff --git a/paludis/syncer.hh b/paludis/syncer.hh
index bb12cfa..c6d4e92 100644
--- a/paludis/syncer.hh
+++ b/paludis/syncer.hh
@@ -161,12 +161,12 @@ namespace paludis
/**
* Constructor.
*/
- SyncFailedError(const std::string & msg) throw ();
+ SyncFailedError(const std::string & msg) noexcept;
/**
* Constructor.
*/
- SyncFailedError(const std::string & local, const std::string & remote) throw ();
+ SyncFailedError(const std::string & local, const std::string & remote) noexcept;
};
/**
@@ -181,7 +181,7 @@ namespace paludis
/**
* Constructor.
*/
- NoSuchSyncerError(const std::string & format) throw ();
+ NoSuchSyncerError(const std::string & format) noexcept;
};
}
diff --git a/paludis/unmerger.cc b/paludis/unmerger.cc
index 54b51ca..3bad886 100644
--- a/paludis/unmerger.cc
+++ b/paludis/unmerger.cc
@@ -52,7 +52,7 @@ namespace paludis
};
}
-UnmergerError::UnmergerError(const std::string & s) throw () :
+UnmergerError::UnmergerError(const std::string & s) noexcept :
Exception(s)
{
}
diff --git a/paludis/unmerger.hh b/paludis/unmerger.hh
index 849f5d4..ca58aa3 100644
--- a/paludis/unmerger.hh
+++ b/paludis/unmerger.hh
@@ -83,7 +83,7 @@ namespace paludis
///\name Basic operations
///\{
- UnmergerError(const std::string & msg) throw ();
+ UnmergerError(const std::string & msg) noexcept;
///\}
};
diff --git a/paludis/user_dep_spec-fwd.hh b/paludis/user_dep_spec-fwd.hh
index 1c8a9fd..9f06433 100644
--- a/paludis/user_dep_spec-fwd.hh
+++ b/paludis/user_dep_spec-fwd.hh
@@ -58,7 +58,7 @@ namespace paludis
///\name Basic Operations
///\{
- GotASetNotAPackageDepSpec(const std::string &) throw ();
+ GotASetNotAPackageDepSpec(const std::string &) noexcept;
///\}
};
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index a496fbf..379205e 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -457,7 +457,7 @@ UserSlotExactPartialRequirement::maybe_original_requirement_if_rewritten() const
return nullptr;
}
-GotASetNotAPackageDepSpec::GotASetNotAPackageDepSpec(const std::string & s) throw () :
+GotASetNotAPackageDepSpec::GotASetNotAPackageDepSpec(const std::string & s) noexcept :
Exception("'" + s + "' is a set, not a package")
{
}
diff --git a/paludis/util/config_file.cc b/paludis/util/config_file.cc
index 708df81..c9b4977 100644
--- a/paludis/util/config_file.cc
+++ b/paludis/util/config_file.cc
@@ -56,12 +56,12 @@ namespace paludis
};
}
-ConfigFileError::ConfigFileError(const std::string & filename, const std::string & m) throw () :
+ConfigFileError::ConfigFileError(const std::string & filename, const std::string & m) noexcept :
ConfigurationError(filename.empty() ? m : "In file '" + filename + "': " + m)
{
}
-ConfigFileError::ConfigFileError(const std::string & m) throw () :
+ConfigFileError::ConfigFileError(const std::string & m) noexcept :
ConfigurationError(m)
{
}
diff --git a/paludis/util/config_file.hh b/paludis/util/config_file.hh
index 1b2d695..e3926a1 100644
--- a/paludis/util/config_file.hh
+++ b/paludis/util/config_file.hh
@@ -66,14 +66,14 @@ namespace paludis
* the filename is not necessarily known.
* \param message A description of the error.
*/
- ConfigFileError(const std::string & filename, const std::string & message) throw ();
+ ConfigFileError(const std::string & filename, const std::string & message) noexcept;
/**
* Constructor, where the filename is not known.
*
* \param message A description of the error.
*/
- ConfigFileError(const std::string & message) throw ();
+ ConfigFileError(const std::string & message) noexcept;
///\}
};
diff --git a/paludis/util/destringify.cc b/paludis/util/destringify.cc
index a402a7a..7387feb 100644
--- a/paludis/util/destringify.cc
+++ b/paludis/util/destringify.cc
@@ -21,7 +21,7 @@
using namespace paludis;
-DestringifyError::DestringifyError(const std::string & str) throw () :
+DestringifyError::DestringifyError(const std::string & str) noexcept :
Exception("Couldn't destringify '" + str + "'")
{
}
diff --git a/paludis/util/destringify.hh b/paludis/util/destringify.hh
index 1145274..ec02b82 100644
--- a/paludis/util/destringify.hh
+++ b/paludis/util/destringify.hh
@@ -50,7 +50,7 @@ namespace paludis
///\name Basic operations
///\{
- DestringifyError(const std::string & str) throw ();
+ DestringifyError(const std::string & str) noexcept;
///\}
};
diff --git a/paludis/util/elf.cc b/paludis/util/elf.cc
index 7f6771a..3508f8f 100644
--- a/paludis/util/elf.cc
+++ b/paludis/util/elf.cc
@@ -220,7 +220,7 @@ InvalidElfFileError::InvalidElfFileError(const InvalidElfFileError & other) :
{
}
-InvalidElfFileError::InvalidElfFileError(const std::string & s) throw ():
+InvalidElfFileError::InvalidElfFileError(const std::string & s) noexcept:
Exception(s)
{
}
diff --git a/paludis/util/elf.hh b/paludis/util/elf.hh
index b3697b1..e4410a5 100644
--- a/paludis/util/elf.hh
+++ b/paludis/util/elf.hh
@@ -36,7 +36,7 @@ namespace paludis
{
public:
InvalidElfFileError(const InvalidElfFileError &);
- InvalidElfFileError(const std::string &) throw ();
+ InvalidElfFileError(const std::string &) noexcept;
};
template <typename ElfType_>
diff --git a/paludis/util/exception.cc b/paludis/util/exception.cc
index 6a46e4a..b6b1fa7 100644
--- a/paludis/util/exception.cc
+++ b/paludis/util/exception.cc
@@ -85,7 +85,7 @@ namespace paludis
};
}
-Exception::Exception(const std::string & m) throw () :
+Exception::Exception(const std::string & m) noexcept :
_message(m),
_context_data(new ContextData)
{
@@ -98,13 +98,13 @@ Exception::Exception(const Exception & other) :
{
}
-Exception::~Exception() throw ()
+Exception::~Exception() noexcept
{
delete _context_data;
}
const std::string &
-Exception::message() const throw ()
+Exception::message() const noexcept
{
return _message;
}
@@ -121,34 +121,34 @@ Exception::empty() const
return _context_data->local_context.empty();
}
-NotAvailableError::NotAvailableError(const std::string & msg) throw () :
+NotAvailableError::NotAvailableError(const std::string & msg) noexcept :
Exception("Error: Not available: " + msg)
{
}
-InternalError::InternalError(const std::string & location, const std::string & our_message) throw () :
+InternalError::InternalError(const std::string & location, const std::string & our_message) noexcept :
Exception("Eek! Internal error at " + location + ": " + our_message)
{
std::cerr << "Internal error at " << location << ": " << our_message << std::endl;
}
-NameError::NameError(const std::string & name, const std::string & role) throw () :
+NameError::NameError(const std::string & name, const std::string & role) noexcept :
Exception("Name '" + name + "' is not a valid " + role)
{
}
-NameError::NameError(const std::string & name, const std::string & role, const std::string & msg) throw () :
+NameError::NameError(const std::string & name, const std::string & role, const std::string & msg) noexcept :
Exception("Name '" + name + "' is not a valid " + role + ": " + msg)
{
}
-ConfigurationError::ConfigurationError(const std::string & msg) throw () :
+ConfigurationError::ConfigurationError(const std::string & msg) noexcept :
Exception(msg)
{
}
const char *
-Exception::what() const throw ()
+Exception::what() const noexcept
{
#ifdef HAVE_CXA_DEMANGLE
if (_what_str.empty())
diff --git a/paludis/util/exception.hh b/paludis/util/exception.hh
index 0f5a5df..8a02062 100644
--- a/paludis/util/exception.hh
+++ b/paludis/util/exception.hh
@@ -86,7 +86,7 @@ namespace paludis
///\name Basic operations
///\{
- Exception(const std::string & message) throw ();
+ Exception(const std::string & message) noexcept;
Exception(const Exception &);
@@ -96,14 +96,14 @@ namespace paludis
///\name Basic operations
///\{
- virtual ~Exception() throw () PALUDIS_ATTRIBUTE((nothrow));
+ virtual ~Exception() noexcept PALUDIS_ATTRIBUTE((nothrow));
///\}
/**
* Return our descriptive error message.
*/
- const std::string & message() const throw () PALUDIS_ATTRIBUTE((nothrow));
+ const std::string & message() const noexcept PALUDIS_ATTRIBUTE((nothrow));
/**
* Make a backtrace.
@@ -118,7 +118,7 @@ namespace paludis
/**
* A better what, if possible.
*/
- const char * what() const throw ();
+ const char * what() const noexcept;
};
/**
@@ -139,7 +139,7 @@ namespace paludis
*
* \param message A short message.
*/
- InternalError(const std::string & location, const std::string & message) throw ();
+ InternalError(const std::string & location, const std::string & message) noexcept;
};
/**
@@ -157,7 +157,7 @@ namespace paludis
/**
* Constructor.
*/
- NotAvailableError(const std::string & message) throw ();
+ NotAvailableError(const std::string & message) noexcept;
};
/**
@@ -178,7 +178,7 @@ namespace paludis
* \param name The invalid name encountered.
* \param role The role for the name, for example "package name".
*/
- NameError(const std::string & name, const std::string & role) throw ();
+ NameError(const std::string & name, const std::string & role) noexcept;
/**
* Constructor.
@@ -188,7 +188,7 @@ namespace paludis
* \param msg Any extra message.
*/
NameError(const std::string & name, const std::string & role,
- const std::string & msg) throw ();
+ const std::string & msg) noexcept;
};
/**
@@ -204,7 +204,7 @@ namespace paludis
/**
* Constructor.
*/
- ConfigurationError(const std::string & msg) throw ();
+ ConfigurationError(const std::string & msg) noexcept;
};
/** \def PALUDIS_HERE
diff --git a/paludis/util/fs_error.cc b/paludis/util/fs_error.cc
index cabcc06..e235fde 100644
--- a/paludis/util/fs_error.cc
+++ b/paludis/util/fs_error.cc
@@ -23,7 +23,7 @@
using namespace paludis;
-FSError::FSError(const std::string & our_message) throw () :
+FSError::FSError(const std::string & our_message) noexcept :
Exception(our_message)
{
}
diff --git a/paludis/util/fs_error.hh b/paludis/util/fs_error.hh
index 352a3c1..3f1466c 100644
--- a/paludis/util/fs_error.hh
+++ b/paludis/util/fs_error.hh
@@ -39,7 +39,7 @@ namespace paludis
///\name Basic operations
///\{
- FSError(const std::string & message) throw ();
+ FSError(const std::string & message) noexcept;
///\}
};
diff --git a/paludis/util/graph.cc b/paludis/util/graph.cc
index 7575c17..fcf2959 100644
--- a/paludis/util/graph.cc
+++ b/paludis/util/graph.cc
@@ -22,13 +22,13 @@
using namespace paludis;
-GraphError::GraphError(const std::string & msg) throw () :
+GraphError::GraphError(const std::string & msg) noexcept :
Exception(msg)
{
}
NoGraphTopologicalOrderExistsError::NoGraphTopologicalOrderExistsError(
- const std::shared_ptr<const RemainingNodes> & r) throw () :
+ const std::shared_ptr<const RemainingNodes> & r) noexcept :
GraphError("No topological order exists"),
_remaining_nodes(r)
{
@@ -40,7 +40,7 @@ NoGraphTopologicalOrderExistsError::remaining_nodes() const
return _remaining_nodes;
}
-NoGraphTopologicalOrderExistsError::~NoGraphTopologicalOrderExistsError() throw ()
+NoGraphTopologicalOrderExistsError::~NoGraphTopologicalOrderExistsError() noexcept
{
}
diff --git a/paludis/util/graph.hh b/paludis/util/graph.hh
index f8eacf6..b2b259f 100644
--- a/paludis/util/graph.hh
+++ b/paludis/util/graph.hh
@@ -52,7 +52,7 @@ namespace paludis
///\name Basic operations
///\{
- GraphError(const std::string & msg) throw ();
+ GraphError(const std::string & msg) noexcept;
///\}
};
@@ -72,13 +72,13 @@ namespace paludis
///\{
template <typename Node_>
- NoSuchGraphNodeError(const Node_ & node) throw () :
+ NoSuchGraphNodeError(const Node_ & node) noexcept :
GraphError("Node '" + stringify(node) + "' does not exist")
{
}
template <typename Node_>
- NoSuchGraphNodeError(const std::shared_ptr<Node_> & node) throw () :
+ NoSuchGraphNodeError(const std::shared_ptr<Node_> & node) noexcept :
GraphError("Node '" + stringify(*node) + "' does not exist")
{
}
@@ -101,7 +101,7 @@ namespace paludis
///\{
template <typename Node_>
- NoSuchGraphEdgeError(const Node_ & e1, const Node_ & e2) throw () :
+ NoSuchGraphEdgeError(const Node_ & e1, const Node_ & e2) noexcept :
GraphError("Edge '" + stringify(e1) + "' -> '" + stringify(e2) + "' does not exist")
{
}
@@ -129,8 +129,8 @@ namespace paludis
///\name Basic operations
///\{
- NoGraphTopologicalOrderExistsError(const std::shared_ptr<const RemainingNodes> &) throw ();
- ~NoGraphTopologicalOrderExistsError() throw ();
+ NoGraphTopologicalOrderExistsError(const std::shared_ptr<const RemainingNodes> &) noexcept;
+ ~NoGraphTopologicalOrderExistsError() noexcept;
///\}
diff --git a/paludis/util/process.cc b/paludis/util/process.cc
index 3b59d0b..b4b553d 100644
--- a/paludis/util/process.cc
+++ b/paludis/util/process.cc
@@ -51,7 +51,7 @@
using namespace paludis;
-ProcessError::ProcessError(const std::string & s) throw () :
+ProcessError::ProcessError(const std::string & s) noexcept :
Exception(s)
{
}
diff --git a/paludis/util/process.hh b/paludis/util/process.hh
index 108a239..0268638 100644
--- a/paludis/util/process.hh
+++ b/paludis/util/process.hh
@@ -43,7 +43,7 @@ namespace paludis
public Exception
{
public:
- ProcessError(const std::string &) throw ();
+ ProcessError(const std::string &) noexcept;
};
class PALUDIS_VISIBLE ProcessCommand
diff --git a/paludis/util/pty.cc b/paludis/util/pty.cc
index d39b128..754fdad 100644
--- a/paludis/util/pty.cc
+++ b/paludis/util/pty.cc
@@ -35,7 +35,7 @@
using namespace paludis;
-PtyError::PtyError(const std::string & our_message) throw () :
+PtyError::PtyError(const std::string & our_message) noexcept :
Exception(our_message)
{
}
diff --git a/paludis/util/pty.hh b/paludis/util/pty.hh
index 71877c6..9ce95a5 100644
--- a/paludis/util/pty.hh
+++ b/paludis/util/pty.hh
@@ -50,7 +50,7 @@ namespace paludis
///\name Basic operations
///\{
- PtyError(const std::string & message) throw ();
+ PtyError(const std::string & message) noexcept;
///\}
};
diff --git a/paludis/util/safe_ifstream.cc b/paludis/util/safe_ifstream.cc
index dce4eda..999d1e4 100644
--- a/paludis/util/safe_ifstream.cc
+++ b/paludis/util/safe_ifstream.cc
@@ -128,7 +128,7 @@ SafeIFStream::~SafeIFStream()
::close(buf.fd);
}
-SafeIFStreamError::SafeIFStreamError(const std::string & s) throw () :
+SafeIFStreamError::SafeIFStreamError(const std::string & s) noexcept :
Exception(s)
{
}
diff --git a/paludis/util/safe_ifstream.hh b/paludis/util/safe_ifstream.hh
index 70a6347..5c381bb 100644
--- a/paludis/util/safe_ifstream.hh
+++ b/paludis/util/safe_ifstream.hh
@@ -127,7 +127,7 @@ namespace paludis
public Exception
{
public:
- SafeIFStreamError(const std::string &) throw ();
+ SafeIFStreamError(const std::string &) noexcept;
};
}
diff --git a/paludis/util/safe_ofstream.cc b/paludis/util/safe_ofstream.cc
index 9f23390..d060f61 100644
--- a/paludis/util/safe_ofstream.cc
+++ b/paludis/util/safe_ofstream.cc
@@ -149,7 +149,7 @@ SafeOFStream::~SafeOFStream() noexcept(false)
throw SafeOFStreamError("Write to fd " + stringify(buf.fd) + " failed");
}
-SafeOFStreamError::SafeOFStreamError(const std::string & s) throw () :
+SafeOFStreamError::SafeOFStreamError(const std::string & s) noexcept :
Exception(s)
{
}
diff --git a/paludis/util/safe_ofstream.hh b/paludis/util/safe_ofstream.hh
index 83b7eca..a0ddce3 100644
--- a/paludis/util/safe_ofstream.hh
+++ b/paludis/util/safe_ofstream.hh
@@ -133,7 +133,7 @@ namespace paludis
public Exception
{
public:
- SafeOFStreamError(const std::string &) throw ();
+ SafeOFStreamError(const std::string &) noexcept;
};
extern template class Pimp<SafeOFStreamBuf>;
diff --git a/paludis/util/singleton_TEST.cc b/paludis/util/singleton_TEST.cc
index 25146e2..67c74e7 100644
--- a/paludis/util/singleton_TEST.cc
+++ b/paludis/util/singleton_TEST.cc
@@ -112,7 +112,7 @@ namespace
int MyThreadedClass::instances = 0;
std::mutex MyThreadedClass::mutex;
- static void thread_func(void * * const p) throw ()
+ static void thread_func(void * * const p) noexcept
{
*p = MyThreadedClass::get_instance();
}
diff --git a/paludis/util/system.cc b/paludis/util/system.cc
index 394ef8c..de4b526 100644
--- a/paludis/util/system.cc
+++ b/paludis/util/system.cc
@@ -60,7 +60,7 @@ namespace
static pid_t paludis_pid PALUDIS_ATTRIBUTE((used)) = get_paludis_pid();
}
-GetenvError::GetenvError(const std::string & key) throw () :
+GetenvError::GetenvError(const std::string & key) noexcept :
Exception("Environment variable '" + key + "' not set")
{
}
diff --git a/paludis/util/system.hh b/paludis/util/system.hh
index 9d06640..f1b7114 100644
--- a/paludis/util/system.hh
+++ b/paludis/util/system.hh
@@ -49,7 +49,7 @@ namespace paludis
///\name Basic operations
///\{
- GetenvError(const std::string & key) throw ();
+ GetenvError(const std::string & key) noexcept;
///\}
};
diff --git a/paludis/util/thread_pool.cc b/paludis/util/thread_pool.cc
index dd9f5f9..cc4b175 100644
--- a/paludis/util/thread_pool.cc
+++ b/paludis/util/thread_pool.cc
@@ -46,7 +46,7 @@ ThreadPool::~ThreadPool()
}
void
-ThreadPool::create_thread(const std::function<void () throw ()> & f)
+ThreadPool::create_thread(const std::function<void () noexcept> & f)
{
_imp->threads.emplace_back(f);
}
diff --git a/paludis/util/thread_pool.hh b/paludis/util/thread_pool.hh
index 9b450cb..0b554f4 100644
--- a/paludis/util/thread_pool.hh
+++ b/paludis/util/thread_pool.hh
@@ -59,7 +59,7 @@ namespace paludis
/**
* Create a new thread in our pool.
*/
- void create_thread(const std::function<void () throw ()> &);
+ void create_thread(const std::function<void () noexcept> &);
/**
* How many threads does our pool contain?
diff --git a/paludis/util/thread_pool_TEST.cc b/paludis/util/thread_pool_TEST.cc
index 3b51f20..a49b3ba 100644
--- a/paludis/util/thread_pool_TEST.cc
+++ b/paludis/util/thread_pool_TEST.cc
@@ -28,7 +28,7 @@ using namespace paludis;
namespace
{
- void make_one(int & b) throw ()
+ void make_one(int & b) noexcept
{
b = 1;
}
diff --git a/paludis/util/tokeniser.cc b/paludis/util/tokeniser.cc
index 96f45c1..d9e50e7 100644
--- a/paludis/util/tokeniser.cc
+++ b/paludis/util/tokeniser.cc
@@ -21,7 +21,7 @@
using namespace paludis;
-TokeniserError::TokeniserError(const std::string & s, const std::string & msg) throw () :
+TokeniserError::TokeniserError(const std::string & s, const std::string & msg) noexcept :
Exception("When tokenising '" + s + "': " + msg)
{
}
diff --git a/paludis/util/tokeniser.hh b/paludis/util/tokeniser.hh
index d34d237..925674f 100644
--- a/paludis/util/tokeniser.hh
+++ b/paludis/util/tokeniser.hh
@@ -226,7 +226,7 @@ namespace paludis
///\name Basic operations
///\{
- TokeniserError(const std::string & s, const std::string & msg) throw ();
+ TokeniserError(const std::string & s, const std::string & msg) noexcept;
///\}
};
diff --git a/paludis/util/wildcard_expander.cc b/paludis/util/wildcard_expander.cc
index 175a292..bfa6396 100644
--- a/paludis/util/wildcard_expander.cc
+++ b/paludis/util/wildcard_expander.cc
@@ -53,7 +53,7 @@ namespace paludis
};
}
-WildcardExpansionError::WildcardExpansionError(const std::string & the_message) throw () :
+WildcardExpansionError::WildcardExpansionError(const std::string & the_message) noexcept :
FSError(the_message)
{
}
diff --git a/paludis/util/wildcard_expander.hh b/paludis/util/wildcard_expander.hh
index ff92387..0e5fc4a 100644
--- a/paludis/util/wildcard_expander.hh
+++ b/paludis/util/wildcard_expander.hh
@@ -34,7 +34,7 @@ namespace paludis
public FSError
{
public:
- WildcardExpansionError(const std::string & message) throw ();
+ WildcardExpansionError(const std::string & message) noexcept;
};
class PALUDIS_VISIBLE WildcardExpander :
diff --git a/paludis/version_operator.cc b/paludis/version_operator.cc
index 35260df..673c010 100644
--- a/paludis/version_operator.cc
+++ b/paludis/version_operator.cc
@@ -160,7 +160,7 @@ VersionOperator::as_version_spec_comparator() const
}
-BadVersionOperatorError::BadVersionOperatorError(const std::string & msg) throw () :
+BadVersionOperatorError::BadVersionOperatorError(const std::string & msg) noexcept :
Exception("Bad version operator '" + msg + "'")
{
}
diff --git a/paludis/version_operator.hh b/paludis/version_operator.hh
index a548c60..14e7322 100644
--- a/paludis/version_operator.hh
+++ b/paludis/version_operator.hh
@@ -135,7 +135,7 @@ namespace paludis
/**
* Constructor.
*/
- BadVersionOperatorError(const std::string & msg) throw ();
+ BadVersionOperatorError(const std::string & msg) noexcept;
};
}
diff --git a/paludis/version_spec.cc b/paludis/version_spec.cc
index 12a001f..6eb4c0a 100644
--- a/paludis/version_spec.cc
+++ b/paludis/version_spec.cc
@@ -38,12 +38,12 @@ using namespace paludis;
#include <paludis/version_spec-se.cc>
-BadVersionSpecError::BadVersionSpecError(const std::string & name) throw () :
+BadVersionSpecError::BadVersionSpecError(const std::string & name) noexcept :
NameError(name, "version spec")
{
}
-BadVersionSpecError::BadVersionSpecError(const std::string & name, const std::string & msg) throw () :
+BadVersionSpecError::BadVersionSpecError(const std::string & name, const std::string & msg) noexcept :
NameError(name, "version spec", msg)
{
}
diff --git a/paludis/version_spec.hh b/paludis/version_spec.hh
index 01b09f0..ecffc4a 100644
--- a/paludis/version_spec.hh
+++ b/paludis/version_spec.hh
@@ -56,8 +56,8 @@ namespace paludis
///\name Basic operations
///\{
- BadVersionSpecError(const std::string & name) throw ();
- BadVersionSpecError(const std::string & name, const std::string & msg) throw ();
+ BadVersionSpecError(const std::string & name) noexcept;
+ BadVersionSpecError(const std::string & name, const std::string & msg) noexcept;
///\}
};
diff --git a/python/dep_spec.cc b/python/dep_spec.cc
index 26cfa03..1b4960b 100644
--- a/python/dep_spec.cc
+++ b/python/dep_spec.cc
@@ -702,7 +702,7 @@ class PALUDIS_VISIBLE NotAllowedInThisHeirarchy :
public Exception
{
public:
- NotAllowedInThisHeirarchy(const std::string & msg) throw () :
+ NotAllowedInThisHeirarchy(const std::string & msg) noexcept :
Exception(msg)
{
}
diff --git a/python/exception.cc b/python/exception.cc
index b796348..42c3c3c 100644
--- a/python/exception.cc
+++ b/python/exception.cc
@@ -76,19 +76,19 @@ ExceptionRegister::get_py_exception(const std::string & name)
}
}
-PythonError::PythonError(const std::string & m) throw () :
+PythonError::PythonError(const std::string & m) noexcept :
Exception(m)
{
}
PythonMethodNotImplemented::PythonMethodNotImplemented(const std::string & class_name,
- const std::string & method_name) throw () :
+ const std::string & method_name) noexcept :
PythonError("Python subclasses of '" + class_name + "' have to implement '" + method_name + "' method")
{
}
PythonContainerConversionError::PythonContainerConversionError(const std::string & class_name,
- const std::string & container_name, const std::string & o_type) throw () :
+ const std::string & container_name, const std::string & o_type) noexcept :
PythonError("Cannot add object of type '" + o_type + "' to a '"
+ class_name + "' " + container_name + " container.")
{
diff --git a/python/exception.hh b/python/exception.hh
index b817551..b1d23c2 100644
--- a/python/exception.hh
+++ b/python/exception.hh
@@ -133,7 +133,7 @@ namespace paludis
public Exception
{
public:
- PythonError(const std::string & message) throw ();
+ PythonError(const std::string & message) noexcept;
};
class PALUDIS_VISIBLE PythonMethodNotImplemented :
@@ -141,7 +141,7 @@ namespace paludis
{
public:
PythonMethodNotImplemented(const std::string & class_name,
- const std::string & function_name) throw ();
+ const std::string & function_name) noexcept;
};
class PALUDIS_VISIBLE PythonContainerConversionError :
@@ -149,7 +149,7 @@ namespace paludis
{
public:
PythonContainerConversionError(const std::string & class_name,
- const std::string & container_name, const std::string & o_type) throw ();
+ const std::string & container_name, const std::string & o_type) noexcept;
};
}
}
diff --git a/src/clients/cave/command_factory.cc b/src/clients/cave/command_factory.cc
index 206b181..e1e7d5c 100644
--- a/src/clients/cave/command_factory.cc
+++ b/src/clients/cave/command_factory.cc
@@ -247,7 +247,7 @@ CommandFactory::end() const
return first_iterator(_imp->handlers.end());
}
-UnknownCommand::UnknownCommand(const std::string & s) throw () :
+UnknownCommand::UnknownCommand(const std::string & s) noexcept :
Exception("Unknown command '" + s + "'")
{
}
diff --git a/src/clients/cave/command_factory.hh b/src/clients/cave/command_factory.hh
index dc3a609..6afcb43 100644
--- a/src/clients/cave/command_factory.hh
+++ b/src/clients/cave/command_factory.hh
@@ -36,7 +36,7 @@ namespace paludis
public Exception
{
public:
- UnknownCommand(const std::string &) throw ();
+ UnknownCommand(const std::string &) noexcept;
};
class PALUDIS_VISIBLE CommandFactory :
diff --git a/src/clients/cave/exceptions.cc b/src/clients/cave/exceptions.cc
index b606320..4dc197f 100644
--- a/src/clients/cave/exceptions.cc
+++ b/src/clients/cave/exceptions.cc
@@ -31,46 +31,46 @@
using namespace paludis;
using namespace cave;
-NothingMatching::NothingMatching(const PackageDepSpec & spec) throw () :
+NothingMatching::NothingMatching(const PackageDepSpec & spec) noexcept :
Exception("Found nothing suitable matching '" + stringify(spec) + "'")
{
}
-NothingMatching::NothingMatching(const std::string & name) throw () :
+NothingMatching::NothingMatching(const std::string & name) noexcept :
Exception("Found nothing suitable matching '" + name + "'")
{
}
-NothingMatching::NothingMatching(const std::string & name, const std::string & extra_message) throw () :
+NothingMatching::NothingMatching(const std::string & name, const std::string & extra_message) noexcept :
Exception("Found nothing suitable matching '" + name + "'" + extra_message)
{
}
-NothingMatchingWithSuggestions::NothingMatchingWithSuggestions(const std::string & name, const std::string & suggestions) throw () :
+NothingMatchingWithSuggestions::NothingMatchingWithSuggestions(const std::string & name, const std::string & suggestions) noexcept :
NothingMatching(name, "; did you mean " + suggestions + "?")
{
}
-BeMoreSpecific::BeMoreSpecific(const PackageDepSpec & spec, const std::shared_ptr<const PackageIDSequence> & s) throw () :
+BeMoreSpecific::BeMoreSpecific(const PackageDepSpec & spec, const std::shared_ptr<const PackageIDSequence> & s) noexcept :
Exception("Found multiple suitable IDs matching '" + stringify(spec) + "': { '" + join(indirect_iterator(s->begin()),
indirect_iterator(s->end()), "', '") + "' }")
{
}
BeMoreSpecific::BeMoreSpecific(const PackageDepSpec & spec, const std::shared_ptr<const PackageIDSequence> & s,
- const std::string & extra_message) throw () :
+ const std::string & extra_message) noexcept :
Exception("Found multiple suitable IDs matching '" + stringify(spec) + "': { '" + join(indirect_iterator(s->begin()),
indirect_iterator(s->end()), "', '") + "' }. " + extra_message)
{
}
BadIDForCommand::BadIDForCommand(const PackageDepSpec & spec, const std::shared_ptr<const PackageID> & s,
- const std::string & r) throw () :
+ const std::string & r) noexcept :
Exception("Spec '" + stringify(spec) + "' resolves to ID '" + stringify(*s) + "', which " + r)
{
}
-BadRepositoryForCommand::BadRepositoryForCommand(const RepositoryName & name, const std::string & r) throw () :
+BadRepositoryForCommand::BadRepositoryForCommand(const RepositoryName & name, const std::string & r) noexcept :
Exception("Repository '" + stringify(name) + "' unsuitable: " + r)
{
}
diff --git a/src/clients/cave/exceptions.hh b/src/clients/cave/exceptions.hh
index 233c393..f929acf 100644
--- a/src/clients/cave/exceptions.hh
+++ b/src/clients/cave/exceptions.hh
@@ -36,25 +36,25 @@ namespace paludis
public Exception
{
public:
- NothingMatching(const PackageDepSpec &) throw ();
- NothingMatching(const std::string &) throw ();
- NothingMatching(const std::string &, const std::string &) throw ();
+ NothingMatching(const PackageDepSpec &) noexcept;
+ NothingMatching(const std::string &) noexcept;
+ NothingMatching(const std::string &, const std::string &) noexcept;
};
class PALUDIS_VISIBLE NothingMatchingWithSuggestions :
public NothingMatching
{
public:
- NothingMatchingWithSuggestions(const std::string &, const std::string &) throw ();
+ NothingMatchingWithSuggestions(const std::string &, const std::string &) noexcept;
};
class PALUDIS_VISIBLE BeMoreSpecific :
public Exception
{
public:
- BeMoreSpecific(const PackageDepSpec &, const std::shared_ptr<const PackageIDSequence> &) throw ();
+ BeMoreSpecific(const PackageDepSpec &, const std::shared_ptr<const PackageIDSequence> &) noexcept;
BeMoreSpecific(const PackageDepSpec &, const std::shared_ptr<const PackageIDSequence> &,
- const std::string & extra_message) throw ();
+ const std::string & extra_message) noexcept;
};
class PALUDIS_VISIBLE BadIDForCommand :
@@ -64,7 +64,7 @@ namespace paludis
BadIDForCommand(
const PackageDepSpec &,
const std::shared_ptr<const PackageID> &,
- const std::string & r) throw ();
+ const std::string & r) noexcept;
};
class PALUDIS_VISIBLE BadRepositoryForCommand :
@@ -73,7 +73,7 @@ namespace paludis
public:
BadRepositoryForCommand(
const RepositoryName &,
- const std::string & r) throw ();
+ const std::string & r) noexcept;
};
void nothing_matching_error(
diff --git a/src/clients/cave/format_string.cc b/src/clients/cave/format_string.cc
index 4802e9c..ee5d32b 100644
--- a/src/clients/cave/format_string.cc
+++ b/src/clients/cave/format_string.cc
@@ -29,7 +29,7 @@
using namespace paludis;
using namespace cave;
-FormatStringError::FormatStringError(const std::string & f, const std::string & m) throw () :
+FormatStringError::FormatStringError(const std::string & f, const std::string & m) noexcept :
Exception("Bad format string '" + f + "': " + m)
{
}
diff --git a/src/clients/cave/format_string.hh b/src/clients/cave/format_string.hh
index 72b6c8a..e07baf8 100644
--- a/src/clients/cave/format_string.hh
+++ b/src/clients/cave/format_string.hh
@@ -34,7 +34,7 @@ namespace paludis
public Exception
{
public:
- FormatStringError(const std::string & f, const std::string & msg) throw ();
+ FormatStringError(const std::string & f, const std::string & msg) noexcept;
};
std::string format_string(