lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Code Activity

fixed error when compiled with Clang

Browse Source
This commit is contained in:
Niels
2016-02-14 16:58:24 +01:00
parent 836fdfedf2
commit 49dc2dff68
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/json.hpp
View File

@ -719,7 +719,7 @@ class basic_json
number_float_t number_float; number_float_t number_float;
/// default constructor (for null values) /// default constructor (for null values)
json_value() noexcept = default; json_value() = default;
/// constructor for booleans /// constructor for booleans
json_value(boolean_t v) noexcept : boolean(v) {} json_value(boolean_t v) noexcept : boolean(v) {}
/// constructor for numbers (integer) /// constructor for numbers (integer)
@ -957,7 +957,7 @@ class basic_json
@since version 1.0.0 @since version 1.0.0
*/ */
basic_json() noexcept = default; basic_json() = default;
/*! /*!
@brief create a null object (explicitly) @brief create a null object (explicitly)
@ -6284,7 +6284,7 @@ class basic_json
using iterator_category = std::bidirectional_iterator_tag; using iterator_category = std::bidirectional_iterator_tag;
/// default constructor /// default constructor
const_iterator() noexcept = default; const_iterator() = default;
/// constructor for a given JSON instance /// constructor for a given JSON instance
explicit const_iterator(pointer object) noexcept explicit const_iterator(pointer object) noexcept
@ -6818,7 +6818,7 @@ class basic_json
using reference = typename basic_json::reference; using reference = typename basic_json::reference;
/// default constructor /// default constructor
iterator() noexcept = default; iterator() = default;
/// constructor for a given JSON instance /// constructor for a given JSON instance
explicit iterator(pointer object) noexcept explicit iterator(pointer object) noexcept
@ -7106,7 +7106,7 @@ class basic_json
} }
/// default constructor /// default constructor
lexer() noexcept = default; lexer() = default;
// switch off unwanted functions // switch off unwanted functions
lexer(const lexer&) = delete; lexer(const lexer&) = delete;

10
src/json.hpp.re2c
View File

@ -719,7 +719,7 @@ class basic_json
number_float_t number_float; number_float_t number_float;
/// default constructor (for null values) /// default constructor (for null values)
json_value() noexcept = default; json_value() = default;
/// constructor for booleans /// constructor for booleans
json_value(boolean_t v) noexcept : boolean(v) {} json_value(boolean_t v) noexcept : boolean(v) {}
/// constructor for numbers (integer) /// constructor for numbers (integer)
@ -957,7 +957,7 @@ class basic_json
@since version 1.0.0 @since version 1.0.0
*/ */
basic_json() noexcept = default; basic_json() = default;
/*! /*!
@brief create a null object (explicitly) @brief create a null object (explicitly)
@ -6284,7 +6284,7 @@ class basic_json
using iterator_category = std::bidirectional_iterator_tag; using iterator_category = std::bidirectional_iterator_tag;
/// default constructor /// default constructor
const_iterator() noexcept = default; const_iterator() = default;
/// constructor for a given JSON instance /// constructor for a given JSON instance
explicit const_iterator(pointer object) noexcept explicit const_iterator(pointer object) noexcept
@ -6818,7 +6818,7 @@ class basic_json
using reference = typename basic_json::reference; using reference = typename basic_json::reference;
/// default constructor /// default constructor
iterator() noexcept = default; iterator() = default;
/// constructor for a given JSON instance /// constructor for a given JSON instance
explicit iterator(pointer object) noexcept explicit iterator(pointer object) noexcept
@ -7106,7 +7106,7 @@ class basic_json
} }
/// default constructor /// default constructor
lexer() noexcept = default; lexer() = default;
// switch off unwanted functions // switch off unwanted functions
lexer(const lexer&) = delete; lexer(const lexer&) = delete;