Skip to content

Commit

Permalink
Remove legacy throw() specifications, conform to c++11 (#864)
Browse files Browse the repository at this point in the history 
Several of them were wrong anyway, as the functions were allocating
strings.

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>

Co-authored-by: Cary Phillips <cary@ilm.com>
  • Loading branch information
@kdt3rd @cary-ilm
kdt3rd and cary-ilm authored Nov 19, 2020
1 parent bc88cdb commit 95d2376
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 44 deletions.
37 changes: 22 additions & 15 deletions src/lib/Iex/IexBaseExc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,41 +76,48 @@ stackTracer ()
}


BaseExc::BaseExc (const char* s) throw () :
_message (s? s: ""),
_stackTrace (currentStackTracer? currentStackTracer(): "")
BaseExc::BaseExc (const char* s) :
_message (s? s : ""),
_stackTrace (currentStackTracer? currentStackTracer(): std::string())
{
// empty
}


BaseExc::BaseExc (const std::string &s) throw () :
BaseExc::BaseExc (const std::string &s) :
_message (s),
_stackTrace (currentStackTracer? currentStackTracer(): "")
_stackTrace (currentStackTracer? currentStackTracer(): std::string())
{
// empty
}


BaseExc::BaseExc (std::string &&s) :
_message (std::move (s)),
_stackTrace (currentStackTracer? currentStackTracer(): std::string())
{
// empty
}


BaseExc::BaseExc (std::stringstream &s) throw () :
BaseExc::BaseExc (std::stringstream &s) :
_message (s.str()),
_stackTrace (currentStackTracer? currentStackTracer(): "")
_stackTrace (currentStackTracer? currentStackTracer(): std::string())
{
// empty
}

BaseExc::BaseExc (const BaseExc &be) throw()
BaseExc::BaseExc (const BaseExc &be)
: _message (be._message),
_stackTrace (be._stackTrace)
{
}

BaseExc::~BaseExc () throw ()
BaseExc::~BaseExc () noexcept
{
}

BaseExc &
BaseExc::operator = (const BaseExc& be) throw ()
BaseExc::operator = (const BaseExc& be)
{
if (this != &be)
{
Expand All @@ -122,7 +129,7 @@ BaseExc::operator = (const BaseExc& be) throw ()
}

BaseExc &
BaseExc::operator = (BaseExc&& be) throw ()
BaseExc::operator = (BaseExc&& be) noexcept
{
if (this != &be)
{
Expand All @@ -133,7 +140,7 @@ BaseExc::operator = (BaseExc&& be) throw ()
}

const char *
BaseExc::what () const throw ()
BaseExc::what () const noexcept
{
return _message.c_str();
}
Expand All @@ -154,7 +161,7 @@ BaseExc::append (std::stringstream &s)
}

const std::string &
BaseExc::message() const
BaseExc::message() const noexcept
{
return _message;
}
Expand Down Expand Up @@ -204,7 +211,7 @@ BaseExc::operator += (const char *s)


const std::string &
BaseExc::stackTrace () const
BaseExc::stackTrace () const noexcept
{
return _stackTrace;
}
Expand Down
61 changes: 32 additions & 29 deletions src/lib/Iex/IexBaseExc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,22 +65,23 @@ class BaseExc: public std::exception
// Constructors and destructor
//----------------------------

IEX_EXPORT BaseExc (const char *s = nullptr) throw(); // std::string (s)
IEX_EXPORT BaseExc (const std::string &s) throw(); // std::string (s)
IEX_EXPORT BaseExc (std::stringstream &s) throw(); // std::string (s.str())
IEX_EXPORT BaseExc (const char *s = nullptr);
IEX_EXPORT BaseExc (const std::string &s);
IEX_EXPORT BaseExc (std::string &&s); // not noexcept because of stacktrace
IEX_EXPORT BaseExc (std::stringstream &s);

IEX_EXPORT BaseExc (const BaseExc &be) throw();
IEX_EXPORT BaseExc (BaseExc &&be) throw();
IEX_EXPORT virtual ~BaseExc () throw ();
IEX_EXPORT BaseExc (const BaseExc &be);
IEX_EXPORT BaseExc (BaseExc &&be) noexcept;
IEX_EXPORT virtual ~BaseExc () noexcept;

IEX_EXPORT BaseExc & operator = (const BaseExc& be) throw ();
IEX_EXPORT BaseExc & operator = (BaseExc&& be) throw ();
IEX_EXPORT BaseExc & operator = (const BaseExc& be);
IEX_EXPORT BaseExc & operator = (BaseExc&& be) noexcept;

//---------------------------------------------------
// what() method -- e.what() returns _message.c_str()
//---------------------------------------------------

IEX_EXPORT virtual const char * what () const throw ();
IEX_EXPORT virtual const char * what () const noexcept;


//--------------------------------------------------
Expand Down Expand Up @@ -109,7 +110,7 @@ class BaseExc: public std::exception
// Access to the string representation of the message
//---------------------------------------------------

IEX_EXPORT const std::string & message () const;
IEX_EXPORT const std::string & message () const noexcept;

//--------------------------------------------------
// Stack trace for the point at which the exception
Expand All @@ -118,7 +119,7 @@ class BaseExc: public std::exception
// has been installed (see below, setStackTracer()).
//--------------------------------------------------

IEX_EXPORT const std::string & stackTrace () const;
IEX_EXPORT const std::string & stackTrace () const noexcept;

private:

Expand All @@ -136,26 +137,28 @@ class BaseExc: public std::exception
class name: public base \
{ \
public: \
exp name() throw(); \
exp name (const char* text) throw(); \
exp name (const std::string &text) throw(); \
exp name (std::stringstream &text) throw(); \
exp name (const name &other) throw(); \
exp name (name &&other) throw(); \
exp name& operator = (name &other) throw(); \
exp name& operator = (name &&other) throw(); \
exp ~name() throw(); \
exp name(); \
exp name (const char* text); \
exp name (const std::string &text); \
exp name (std::string &&text); \
exp name (std::stringstream &text); \
exp name (const name &other); \
exp name (name &&other) noexcept; \
exp name& operator = (name &other); \
exp name& operator = (name &&other) noexcept; \
exp ~name() noexcept; \
};

#define DEFINE_EXC_EXP_IMPL(exp, name, base) \
exp name::name () throw () : base () {} \
exp name::name (const char* text) throw () : base (text) {} \
exp name::name (const std::string& text) throw () : base (text) {} \
exp name::name (std::stringstream& text) throw () : base (text) {} \
exp name::name (const name &other) throw() : base (other) {} \
exp name::name (name &&other) throw() : base (other) {} \
exp name& name::operator = (name &other) throw() { base::operator=(other); return *this; } \
exp name& name::operator = (name &&other) throw() { base::operator=(other); return *this; } \
#define DEFINE_EXC_EXP_IMPL(exp, name, base) \
exp name::name () : base () {} \
exp name::name (const char* text) : base (text) {} \
exp name::name (const std::string& text) : base (text) {} \
exp name::name (std::string&& text) : base (std::move (text)) {} \
exp name::name (std::stringstream& text) : base (text) {} \
exp name::name (const name &other) : base (other) {} \
exp name::name (name &&other) noexcept : base (other) {} \
exp name& name::operator = (name &other) { base::operator=(other); return *this; } \
exp name& name::operator = (name &&other) noexcept { base::operator=(other); return *this; } \
exp name::~name () throw () {}

// For backward compatibility.
Expand Down

0 comments on commit 95d2376

Please sign in to comment.