generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-13 10:22:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #445 from ya1gaurav/patch-36

Browse Source 
Added NORETURN for throw functions.
This commit is contained in:
Christopher Dunn 2016-03-17 20:54:26 -05:00
commit 59e327f50b
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/json/value.h
View File

@ -22,6 +22,19 @@
#include <cpptl/forwards.h>
#endif
//Conditional NORETURN attribute on the throw functions would:
// a) suppress false positives from static code analysis
// b) possibly improve optimization opportunities.
#if !defined(JSONCPP_NORETURN)
# if defined(_MSC_VER)
# define JSONCPP_NORETURN __declspec(noreturn)
# elif defined(__GNUC__)
# define JSONCPP_NORETURN __attribute__ ((__noreturn__))
# else
# define JSONCPP_NORETURN
# endif
#endif
// Disable warning C4251: <data member>: <type> needs to have dll-interface to
// be used by...
#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
@ -69,9 +82,9 @@ public:
};
/// used internally
void throwRuntimeError(JSONCPP_STRING const& msg);
JSONCPP_NORETURN void throwRuntimeError(JSONCPP_STRING const& msg);
/// used internally
void throwLogicError(JSONCPP_STRING const& msg);
JSONCPP_NORETURN void throwLogicError(JSONCPP_STRING const& msg);
/** \brief Type of the value held by a Value object.
*/

4
src/lib_json/json_value.cpp
View File

@ -171,11 +171,11 @@ RuntimeError::RuntimeError(JSONCPP_STRING const& msg)
LogicError::LogicError(JSONCPP_STRING const& msg)
: Exception(msg)
{}
void throwRuntimeError(JSONCPP_STRING const& msg)
JSONCPP_NORETURN void throwRuntimeError(JSONCPP_STRING const& msg)
{
throw RuntimeError(msg);
}
void throwLogicError(JSONCPP_STRING const& msg)
JSONCPP_NORETURN void throwLogicError(JSONCPP_STRING const& msg)
{
throw LogicError(msg);
}