fix for bug 147 - Being prepared for Removing Deprecated Exception Specifications from C++17

Author: Alexander Perepelkin

include/log4cpp/Category.hh

@@ -118,8 +118,7 @@ namespace log4cpp {
  * @exception std::invalid_argument if the caller tries to set
  * Priority::NOTSET on the Root Category.
  **/
- virtual void setPriority(Priority::Value priority) 
- throw(std::invalid_argument);
+ virtual void setPriority(Priority::Value priority);
 
  /**
  * Returns the assigned Priority, if any, for this Category.
@@ -152,8 +151,7 @@ namespace log4cpp {
  * @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) 
- throw(std::invalid_argument);
+ virtual void addAppender(Appender* appender);
 
  /**
  * Adds an Appender for this Category.

include/log4cpp/PatternLayout.hh

@@ -81,8 +81,7 @@ namespace log4cpp {
  * @param conversionPattern the conversion pattern
  * @exception ConfigureFailure if the pattern is invalid
  **/
- virtual void setConversionPattern(const std::string& conversionPattern)
- throw(ConfigureFailure);
+ virtual void setConversionPattern(const std::string& conversionPattern);
 
  virtual std::string getConversionPattern() const;
 

include/log4cpp/Priority.hh

@@ -103,8 +103,7 @@ namespace log4cpp {
  * @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)
-throw(std::invalid_argument);
+ static Value getPriorityValue(const std::string& priorityName);
  };
 }
 

include/log4cpp/PropertyConfigurator.hh

@@ -45,7 +45,13 @@ namespace log4cpp {
  **/
  class LOG4CPP_EXPORT PropertyConfigurator {
  public:
- static void configure(const std::string& initFileName) throw (ConfigureFailure);
+ /**
+ *
+ * @param initFileName
+ * @exception ConfigureFailure if the method encountered a read or
+ * syntax error.
+ */
+ static void configure(const std::string& initFileName);
  };
 }
 

include/log4cpp/SimpleConfigurator.hh

@@ -34,7 +34,7 @@ namespace log4cpp {
  * @exception ConfigureFailure if the method encountered a read or 
  * syntax error.
  **/
- static void configure(const std::string& initFileName) throw (ConfigureFailure);
+ static void configure(const std::string& initFileName);
 
  /**
  * Configure log4cpp with the configuration in the given file.
@@ -45,7 +45,8 @@ namespace log4cpp {
  * @exception ConfigureFailure if the method encountered a read or 
  * syntax error.
  **/
- static void configure(std::istream& initFile) throw (ConfigureFailure); };
+ static void configure(std::istream& initFile);
+ };
 }
 
 #endif

src/Category.cpp

@@ -74,8 +74,7 @@ namespace log4cpp {
  return _priority; 
  }
 
- void Category::setPriority(Priority::Value priority)
- throw(std::invalid_argument) {
+ void Category::setPriority(Priority::Value priority) {
  if ((priority < Priority::NOTSET) || (getParent() != NULL)) {
  _priority = priority;
  } else {
@@ -97,8 +96,7 @@ namespace log4cpp {
  return c->getPriority();
  }
 
- void Category::addAppender(Appender* appender) 
- throw(std::invalid_argument) {
+ void Category::addAppender(Appender* appender) {
  if (appender) {
  threading::ScopedLock lock(_appenderSetMutex);
  {

src/PatternLayout.cpp

@@ -276,7 +276,7 @@ namespace log4cpp {
  _conversionPattern = "";
  }
 
- void PatternLayout::setConversionPattern(const std::string& conversionPattern) throw(ConfigureFailure) {
+ void PatternLayout::setConversionPattern(const std::string& conversionPattern) {
 #ifdef LOG4CPP_HAVE_SSTREAM 
  std::istringstream conversionStream(conversionPattern);
 #else

src/Priority.cpp

@@ -41,8 +41,7 @@ namespace log4cpp {
  return names()[((priority < 0) || (priority > 8)) ? 8 : priority];
  }
 
- Priority::Value Priority::getPriorityValue(const std::string& priorityName) 
- throw(std::invalid_argument) {
+ Priority::Value Priority::getPriorityValue(const std::string& priorityName) {
 Priority::Value value = -1;
 
 for (unsigned int i = 0; i < 10; i++) {

src/PropertyConfigurator.cpp

@@ -11,7 +11,7 @@
 
 namespace log4cpp {
 
- void PropertyConfigurator::configure(const std::string& initFileName) throw (ConfigureFailure) {
+ void PropertyConfigurator::configure(const std::string& initFileName) {
  static PropertyConfiguratorImpl configurator;
 
  configurator.doConfigure(initFileName);

src/PropertyConfiguratorImpl.cpp

@@ -66,7 +66,7 @@ namespace log4cpp {
  PropertyConfiguratorImpl::~PropertyConfiguratorImpl() {
  }
 
- void PropertyConfiguratorImpl::doConfigure(const std::string& initFileName) throw (ConfigureFailure) {
+ void PropertyConfiguratorImpl::doConfigure(const std::string& initFileName) {
  std::ifstream initFile(initFileName.c_str());
 
  if (!initFile) {
@@ -77,7 +77,7 @@ namespace log4cpp {
  }
 
 
- void PropertyConfiguratorImpl::doConfigure(std::istream& in) throw (ConfigureFailure) {
+ void PropertyConfiguratorImpl::doConfigure(std::istream& in) {
  // parse the file to get all of the configuration
  _properties.load(in);
 
@@ -93,7 +93,7 @@ namespace log4cpp {
  }
  }
 
- void PropertyConfiguratorImpl::instantiateAllAppenders() throw(ConfigureFailure) {
+ void PropertyConfiguratorImpl::instantiateAllAppenders() {
  std::string currentAppender;
 
  std::string prefix("appender");
@@ -132,7 +132,7 @@ namespace log4cpp {
  }
  }
 
- void PropertyConfiguratorImpl::configureCategory(const std::string& categoryName) throw (ConfigureFailure) {
+ void PropertyConfiguratorImpl::configureCategory(const std::string& categoryName) {
  // start by reading the "rootCategory" key
  std::string tempCatName = 
  (categoryName == "rootCategory") ? categoryName : "category." + categoryName;