Skip to content

Commit 852267a

Browse files
committed
remove JSONCPP_OP_EXPLICIT
This codebase in C++11. No need for compatibility with C++98. Signed-off-by: Rosen Penev <rosenp@gmail.com>
1 parent 2f67bc4 commit 852267a

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

include/json/config.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,12 @@ extern JSON_API int msvc_pre1900_c99_snprintf(char* outBuf, size_t size,
7676

7777
#if __cplusplus >= 201103L
7878
#define JSONCPP_NOEXCEPT noexcept
79-
#define JSONCPP_OP_EXPLICIT explicit
8079
#elif defined(_MSC_VER) && _MSC_VER < 1900
8180
#define JSONCPP_NOEXCEPT throw()
82-
#define JSONCPP_OP_EXPLICIT explicit
8381
#elif defined(_MSC_VER) && _MSC_VER >= 1900
8482
#define JSONCPP_NOEXCEPT noexcept
85-
#define JSONCPP_OP_EXPLICIT explicit
8683
#else
8784
#define JSONCPP_NOEXCEPT throw()
88-
#define JSONCPP_OP_EXPLICIT
8985
#endif
9086

9187
#ifdef __clang__

include/json/value.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ class JSON_API Value {
421421
bool empty() const;
422422

423423
/// Return !isNull()
424-
JSONCPP_OP_EXPLICIT operator bool() const;
424+
explicit operator bool() const;
425425

426426
/// Remove all object members and array elements.
427427
/// \pre type() is arrayValue, objectValue, or nullValue

0 commit comments

Comments
 (0)