Merge a4859ceae5fab9bd8a3355fa0afb393b833fa7f7 into 07472612522e4da6b96f589ccd1d20607c28c2b8

This commit is contained in:
Hallucino 2020-05-18 16:58:36 +00:00 committed by GitHub
commit c7b75d2a8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 9 deletions

View File

@ -205,7 +205,7 @@ class Arg
* The char used as a place holder when SwitchArgs are combined. * The char used as a place holder when SwitchArgs are combined.
* Currently set to the bell char (ASCII 7). * Currently set to the bell char (ASCII 7).
*/ */
static char blankChar() { return (char)7; } static char blankChar() { return static_cast<char>(7); }
/** /**
* The char that indicates the beginning of a flag. Defaults to '-', but * The char that indicates the beginning of a flag. Defaults to '-', but

View File

@ -54,10 +54,6 @@ class ArgException : public std::exception
_typeDescription(td) _typeDescription(td)
{ } { }
/**
* Destructor.
*/
virtual ~ArgException() throw() { }
/** /**
* Returns the error text. * Returns the error text.
@ -78,7 +74,7 @@ class ArgException : public std::exception
/** /**
* Returns the arg id and error text. * Returns the arg id and error text.
*/ */
const char* what() const throw() const char* what() const noexcept
{ {
static std::string ex; static std::string ex;
ex = _argId + " -- " + _errorText; ex = _argId + " -- " + _errorText;

View File

@ -38,7 +38,6 @@ namespace TCLAP {
*/ */
struct ValueLike { struct ValueLike {
typedef ValueLike ValueCategory; typedef ValueLike ValueCategory;
virtual ~ValueLike() {}
}; };
/** /**

View File

@ -137,7 +137,7 @@ class CmdLine : public CmdLineInterface
/** /**
* Throws an exception listing the missing args. * Throws an exception listing the missing args.
*/ */
void missingArgsException(); [[ noreturn ]] void missingArgsException();
/** /**
* Checks whether a name/flag string matches entirely matches * Checks whether a name/flag string matches entirely matches
@ -533,7 +533,7 @@ inline bool CmdLine::_emptyCombined(const std::string& s)
return true; return true;
} }
inline void CmdLine::missingArgsException() [[ noreturn ]] inline void CmdLine::missingArgsException()
{ {
int count = 0; int count = 0;