This commit is contained in:
Josh Soref
2017-12-03 11:54:29 -05:00
committed by Christopher Dunn
parent 7c979e8661
commit e6a588a246
12 changed files with 57 additions and 57 deletions

View File

@@ -25,9 +25,9 @@
#define JSON_USE_EXCEPTION 1
#endif
/// If defined, indicates that the source file is amalgated
/// If defined, indicates that the source file is amalgamated
/// to prevent private header inclusion.
/// Remarks: it is automatically defined in the generated amalgated header.
/// Remarks: it is automatically defined in the generated amalgamated header.
// #define JSON_IS_AMALGAMATION
#ifdef JSON_IN_CPPTL
@@ -78,7 +78,7 @@
#endif // defined(_MSC_VER)
// In c++11 the override keyword allows you to explicity define that a function
// In c++11 the override keyword allows you to explicitly define that a function
// is intended to override the base-class version. This makes the code more
// managable and fixes a set of common hard-to-find bugs.
#if __cplusplus >= 201103L