Commit aee99b36 authored by Niels's avatar Niels

some editing

parent 54a41391
...@@ -214,13 +214,11 @@ class basic_json ...@@ -214,13 +214,11 @@ class basic_json
/// the type of an element reference /// the type of an element reference
using reference = value_type&; using reference = value_type&;
/// the type of an element const reference /// the type of an element const reference
using const_reference = const value_type&; using const_reference = const value_type&;
/// a type to represent differences between iterators /// a type to represent differences between iterators
using difference_type = std::ptrdiff_t; using difference_type = std::ptrdiff_t;
/// a type to represent container sizes /// a type to represent container sizes
using size_type = std::size_t; using size_type = std::size_t;
...@@ -336,6 +334,14 @@ class basic_json ...@@ -336,6 +334,14 @@ class basic_json
@sa @ref array_t -- type for an array value @sa @ref array_t -- type for an array value
@since version 1.0.0 @since version 1.0.0
@note The order name/value pairs are added to the object is *not* preserved
by the library. Therefore, iterating an object may return name/value pairs
in a different order than they were originally stored. In fact, keys will
be traversed in alphabetical order as `std::map` with `std::less` is used
by default. Please note this behavior conforms to [RFC
7159](http://rfc7159.net/rfc7159), because any order implements the
specified "unordered" nature of JSON objects.
*/ */
using object_t = ObjectType<StringType, using object_t = ObjectType<StringType,
basic_json, basic_json,
...@@ -7785,10 +7791,10 @@ basic_json_parser_64: ...@@ -7785,10 +7791,10 @@ basic_json_parser_64:
@return the floating point number @return the floating point number
@warning This function uses `std::strtof`, `std::strtod`, or @bug This function uses `std::strtof`, `std::strtod`, or `std::strtold`
`std::strtold` which use the current C locale to determine which which use the current C locale to determine which character is used as
character is used as decimal point character. This may yield to parse decimal point character. This may yield to parse errors if the locale
errors if the locale does not used `.`. does not used `.`.
*/ */
long double str_to_float_t(long double* /* type */, char** endptr) const long double str_to_float_t(long double* /* type */, char** endptr) const
{ {
......
...@@ -214,13 +214,11 @@ class basic_json ...@@ -214,13 +214,11 @@ class basic_json
/// the type of an element reference /// the type of an element reference
using reference = value_type&; using reference = value_type&;
/// the type of an element const reference /// the type of an element const reference
using const_reference = const value_type&; using const_reference = const value_type&;
/// a type to represent differences between iterators /// a type to represent differences between iterators
using difference_type = std::ptrdiff_t; using difference_type = std::ptrdiff_t;
/// a type to represent container sizes /// a type to represent container sizes
using size_type = std::size_t; using size_type = std::size_t;
...@@ -336,6 +334,14 @@ class basic_json ...@@ -336,6 +334,14 @@ class basic_json
@sa @ref array_t -- type for an array value @sa @ref array_t -- type for an array value
@since version 1.0.0 @since version 1.0.0
@note The order name/value pairs are added to the object is *not* preserved
by the library. Therefore, iterating an object may return name/value pairs
in a different order than they were originally stored. In fact, keys will
be traversed in alphabetical order as `std::map` with `std::less` is used
by default. Please note this behavior conforms to [RFC
7159](http://rfc7159.net/rfc7159), because any order implements the
specified "unordered" nature of JSON objects.
*/ */
using object_t = ObjectType<StringType, using object_t = ObjectType<StringType,
basic_json, basic_json,
...@@ -7064,10 +7070,10 @@ class basic_json ...@@ -7064,10 +7070,10 @@ class basic_json
@return the floating point number @return the floating point number
@warning This function uses `std::strtof`, `std::strtod`, or @bug This function uses `std::strtof`, `std::strtod`, or `std::strtold`
`std::strtold` which use the current C locale to determine which which use the current C locale to determine which character is used as
character is used as decimal point character. This may yield to parse decimal point character. This may yield to parse errors if the locale
errors if the locale does not used `.`. does not used `.`.
*/ */
long double str_to_float_t(long double* /* type */, char** endptr) const long double str_to_float_t(long double* /* type */, char** endptr) const
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment