mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-26 18:42:41 +01:00
merge some changes from develop branch; modernize and clean-up code; remove support for compiling without POCO_WIN32_UTF8
This commit is contained in:
@@ -43,19 +43,19 @@ public:
|
||||
Exception(const Exception& exc);
|
||||
/// Copy constructor.
|
||||
|
||||
~Exception() throw();
|
||||
~Exception() noexcept;
|
||||
/// Destroys the exception and deletes the nested exception.
|
||||
|
||||
Exception& operator = (const Exception& exc);
|
||||
/// Assignment operator.
|
||||
|
||||
virtual const char* name() const throw();
|
||||
virtual const char* name() const noexcept;
|
||||
/// Returns a static string describing the exception.
|
||||
|
||||
virtual const char* className() const throw();
|
||||
virtual const char* className() const noexcept;
|
||||
/// Returns the name of the exception class.
|
||||
|
||||
virtual const char* what() const throw();
|
||||
virtual const char* what() const noexcept;
|
||||
/// Returns a static string describing the exception.
|
||||
///
|
||||
/// Same as name(), but for compatibility with std::exception.
|
||||
@@ -146,10 +146,10 @@ inline int Exception::code() const
|
||||
CLS(const std::string& msg, const std::string& arg, int code = CODE); \
|
||||
CLS(const std::string& msg, const Poco::Exception& exc, int code = CODE); \
|
||||
CLS(const CLS& exc); \
|
||||
~CLS() throw(); \
|
||||
~CLS() noexcept; \
|
||||
CLS& operator = (const CLS& exc); \
|
||||
const char* name() const throw(); \
|
||||
const char* className() const throw(); \
|
||||
const char* name() const noexcept; \
|
||||
const char* className() const noexcept; \
|
||||
Poco::Exception* clone() const; \
|
||||
void rethrow() const; \
|
||||
};
|
||||
@@ -173,7 +173,7 @@ inline int Exception::code() const
|
||||
CLS::CLS(const CLS& exc): BASE(exc) \
|
||||
{ \
|
||||
} \
|
||||
CLS::~CLS() throw() \
|
||||
CLS::~CLS() noexcept \
|
||||
{ \
|
||||
} \
|
||||
CLS& CLS::operator = (const CLS& exc) \
|
||||
@@ -181,11 +181,11 @@ inline int Exception::code() const
|
||||
BASE::operator = (exc); \
|
||||
return *this; \
|
||||
} \
|
||||
const char* CLS::name() const throw() \
|
||||
const char* CLS::name() const noexcept \
|
||||
{ \
|
||||
return NAME; \
|
||||
} \
|
||||
const char* CLS::className() const throw() \
|
||||
const char* CLS::className() const noexcept \
|
||||
{ \
|
||||
return typeid(*this).name(); \
|
||||
} \
|
||||
|
||||
Reference in New Issue
Block a user