[cpp-log4shib] 04/04: Remove deprecated dynamic throw declarations.
Scott Cantor
cantor.2 at osu.edu
Tue Oct 19 14:55:33 UTC 2021
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository cpp-log4shib.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=84a4a19b1344ea4d8b7410590f34945da9e218d8
commit 84a4a19b1344ea4d8b7410590f34945da9e218d8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Oct 19 10:38:20 2021 -0400
Remove deprecated dynamic throw declarations.
---
include/log4shib/Category.hh | 6 ++----
include/log4shib/PatternLayout.hh | 3 +--
include/log4shib/Priority.hh | 3 +--
include/log4shib/PropertyConfigurator.hh | 2 +-
include/log4shib/SimpleConfigurator.hh | 5 +++--
src/Category.cpp | 6 ++----
src/PatternLayout.cpp | 2 +-
src/Priority.cpp | 3 +--
src/PropertyConfigurator.cpp | 2 +-
src/PropertyConfiguratorImpl.cpp | 8 ++++----
src/PropertyConfiguratorImpl.hh | 10 ++++------
src/SimpleConfigurator.cpp | 4 ++--
12 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/include/log4shib/Category.hh b/include/log4shib/Category.hh
index f0aed3f..2d1ae39 100644
--- a/include/log4shib/Category.hh
+++ b/include/log4shib/Category.hh
@@ -111,8 +111,7 @@ namespace log4shib {
* @exception std::invalid_argument if the caller tries to set
* Priority::NOTSET on the Root Category.
**/
- virtual void setPriority(Priority::Value priority)
- noexcept(false);
+ virtual void setPriority(Priority::Value priority);
/**
* Returns the assigned Priority, if any, for this Category.
@@ -145,8 +144,7 @@ namespace log4shib {
* @param appender The Appender to wich this category has to log.
* @exception std::invalid_argument if the appender is NULL.
**/
- virtual void addAppender(Appender* appender)
- noexcept(false);
+ virtual void addAppender(Appender* appender);
/**
* Adds an Appender for this Category.
diff --git a/include/log4shib/PatternLayout.hh b/include/log4shib/PatternLayout.hh
index fb9604d..484ce10 100644
--- a/include/log4shib/PatternLayout.hh
+++ b/include/log4shib/PatternLayout.hh
@@ -79,8 +79,7 @@ namespace log4shib {
@param conversionPattern the conversion pattern
@exception ConfigureFailure if the pattern is invalid
**/
- virtual void setConversionPattern(const std::string& conversionPattern)
- noexcept(false);
+ virtual void setConversionPattern(const std::string& conversionPattern);
virtual std::string getConversionPattern() const;
diff --git a/include/log4shib/Priority.hh b/include/log4shib/Priority.hh
index d81e8e6..474785e 100644
--- a/include/log4shib/Priority.hh
+++ b/include/log4shib/Priority.hh
@@ -102,8 +102,7 @@ namespace log4shib {
* @throw std::invalid_argument if the priorityName does not
* correspond with a known Priority name or a number
**/
- static Value getPriorityValue(const std::string& priorityName)
- noexcept(false);
+ static Value getPriorityValue(const std::string& priorityName);
};
}
diff --git a/include/log4shib/PropertyConfigurator.hh b/include/log4shib/PropertyConfigurator.hh
index 5d58f2e..a285052 100644
--- a/include/log4shib/PropertyConfigurator.hh
+++ b/include/log4shib/PropertyConfigurator.hh
@@ -45,7 +45,7 @@ namespace log4shib {
**/
class LOG4SHIB_EXPORT PropertyConfigurator {
public:
- static void configure(const std::string& initFileName) noexcept(false);
+ static void configure(const std::string& initFileName);
};
}
diff --git a/include/log4shib/SimpleConfigurator.hh b/include/log4shib/SimpleConfigurator.hh
index 6b135c4..bb381de 100644
--- a/include/log4shib/SimpleConfigurator.hh
+++ b/include/log4shib/SimpleConfigurator.hh
@@ -34,7 +34,7 @@ namespace log4shib {
* @exception ConfigureFailure if the method encountered a read or
* syntax error.
**/
- static void configure(const std::string& initFileName) noexcept(false);
+ static void configure(const std::string& initFileName);
/**
* Configure log4shib with the configuration in the given file.
@@ -45,7 +45,8 @@ namespace log4shib {
* @exception ConfigureFailure if the method encountered a read or
* syntax error.
**/
- static void configure(std::istream& initFile) noexcept(false); };
+ static void configure(std::istream& initFile);
+ };
}
#endif
diff --git a/src/Category.cpp b/src/Category.cpp
index a6557fe..1823431 100644
--- a/src/Category.cpp
+++ b/src/Category.cpp
@@ -68,8 +68,7 @@ namespace log4shib {
return _priority;
}
- void Category::setPriority(Priority::Value priority)
- noexcept(false) {
+ void Category::setPriority(Priority::Value priority) {
if ((priority < Priority::NOTSET) || (getParent() != NULL)) {
_priority = priority;
} else {
@@ -91,8 +90,7 @@ namespace log4shib {
return c->getPriority();
}
- void Category::addAppender(Appender* appender)
- noexcept(false) {
+ void Category::addAppender(Appender* appender) {
if (appender) {
threading::ScopedLock lock(_appenderSetMutex);
{
diff --git a/src/PatternLayout.cpp b/src/PatternLayout.cpp
index 0cd1b2f..4d3c829 100644
--- a/src/PatternLayout.cpp
+++ b/src/PatternLayout.cpp
@@ -280,7 +280,7 @@ namespace log4shib {
_conversionPattern = "";
}
- void PatternLayout::setConversionPattern(const std::string& conversionPattern) noexcept(false) {
+ void PatternLayout::setConversionPattern(const std::string& conversionPattern) {
#ifdef LOG4SHIB_HAVE_SSTREAM
std::istringstream conversionStream(conversionPattern);
#else
diff --git a/src/Priority.cpp b/src/Priority.cpp
index 5bccf32..9bf8144 100644
--- a/src/Priority.cpp
+++ b/src/Priority.cpp
@@ -27,8 +27,7 @@ namespace log4shib {
return names[((priority < 0) || (priority > 8)) ? 8 : priority];
}
- Priority::Value Priority::getPriorityValue(const std::string& priorityName)
- noexcept(false) {
+ Priority::Value Priority::getPriorityValue(const std::string& priorityName) {
Priority::Value value = -1;
for (unsigned int i = 0; i < 10; i++) {
diff --git a/src/PropertyConfigurator.cpp b/src/PropertyConfigurator.cpp
index ad053da..5df4178 100644
--- a/src/PropertyConfigurator.cpp
+++ b/src/PropertyConfigurator.cpp
@@ -11,7 +11,7 @@
namespace log4shib {
- void PropertyConfigurator::configure(const std::string& initFileName) noexcept(false) {
+ void PropertyConfigurator::configure(const std::string& initFileName) {
PropertyConfiguratorImpl configurator;
configurator.doConfigure(initFileName);
diff --git a/src/PropertyConfiguratorImpl.cpp b/src/PropertyConfiguratorImpl.cpp
index ec9c267..b121bd0 100644
--- a/src/PropertyConfiguratorImpl.cpp
+++ b/src/PropertyConfiguratorImpl.cpp
@@ -62,7 +62,7 @@ namespace log4shib {
PropertyConfiguratorImpl::~PropertyConfiguratorImpl() {
}
- void PropertyConfiguratorImpl::doConfigure(const std::string& initFileName) noexcept(false) {
+ void PropertyConfiguratorImpl::doConfigure(const std::string& initFileName) {
std::ifstream initFile(initFileName.c_str());
if (!initFile) {
@@ -73,7 +73,7 @@ namespace log4shib {
}
- void PropertyConfiguratorImpl::doConfigure(std::istream& in) noexcept(false) {
+ void PropertyConfiguratorImpl::doConfigure(std::istream& in) {
// parse the file to get all of the configuration
_properties.load(in);
@@ -89,7 +89,7 @@ namespace log4shib {
}
}
- void PropertyConfiguratorImpl::instantiateAllAppenders() noexcept(false) {
+ void PropertyConfiguratorImpl::instantiateAllAppenders() {
std::string currentAppender;
std::string prefix("appender");
@@ -131,7 +131,7 @@ namespace log4shib {
}
}
- void PropertyConfiguratorImpl::configureCategory(const std::string& categoryName) noexcept(false) {
+ void PropertyConfiguratorImpl::configureCategory(const std::string& categoryName) {
// start by reading the "rootCategory" key
std::string tempCatName =
(categoryName == "rootCategory") ? categoryName : "category." + categoryName;
diff --git a/src/PropertyConfiguratorImpl.hh b/src/PropertyConfiguratorImpl.hh
index a33ccfc..c42b993 100644
--- a/src/PropertyConfiguratorImpl.hh
+++ b/src/PropertyConfiguratorImpl.hh
@@ -28,10 +28,8 @@ namespace log4shib {
PropertyConfiguratorImpl();
virtual ~PropertyConfiguratorImpl();
- virtual void doConfigure(const std::string& initFileName)
- noexcept(false);
- virtual void doConfigure(std::istream& in)
- noexcept(false);
+ virtual void doConfigure(const std::string& initFileName);
+ virtual void doConfigure(std::istream& in);
protected:
/**
@@ -42,7 +40,7 @@ namespace log4shib {
The name 'rootCategory' refers to the root Category.
throw ConfigureFailure
**/
- void configureCategory(const std::string& categoryname) noexcept(false);
+ void configureCategory(const std::string& categoryname);
/**
* Get a list of categories for which we should do the configuration. This simply
@@ -51,7 +49,7 @@ namespace log4shib {
*/
void getCategories(std::vector<std::string>& categories) const;
- void instantiateAllAppenders() noexcept(false);
+ void instantiateAllAppenders();
/**
* Intantiate and configure the appender referred to by the given name. This method searches the
diff --git a/src/SimpleConfigurator.cpp b/src/SimpleConfigurator.cpp
index 6c2b0f0..0587c14 100644
--- a/src/SimpleConfigurator.cpp
+++ b/src/SimpleConfigurator.cpp
@@ -42,7 +42,7 @@
namespace log4shib {
- void SimpleConfigurator::configure(const std::string& initFileName) noexcept(false) {
+ void SimpleConfigurator::configure(const std::string& initFileName) {
std::ifstream initFile(initFileName.c_str());
if (!initFile) {
@@ -52,7 +52,7 @@ namespace log4shib {
configure(initFile);
}
- void SimpleConfigurator::configure(std::istream& initFile) noexcept(false) {
+ void SimpleConfigurator::configure(std::istream& initFile) {
std::string nextCommand;
std::string categoryName;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list