j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:nlohmann/json

Browse source
This commit is contained in:
Raphael Isemann 2015-01-05 11:20:32 +01:00
commit bd4e0e4fee
2 changed files with 345 additions and 345 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

644
src/json.cc
View file

File diff suppressed because it is too large Load diff

46
src/json.h
View file

@ -112,17 +112,17 @@ class json
public: public:
/// create an object according to given type /// create an object according to given type
json(const value_type) noexcept; json(const value_type);
/// create a null object /// create a null object
json() = default; json() = default;
/// create a null object /// create a null object
json(std::nullptr_t) noexcept; json(std::nullptr_t) noexcept;
/// create a string object from a C++ string /// create a string object from a C++ string
json(const std::string&) noexcept; json(const std::string&);
/// create a string object from a C++ string (move) /// create a string object from a C++ string (move)
json(std::string&&) noexcept; json(std::string&&);
/// create a string object from a C string /// create a string object from a C string
json(const char*) noexcept; json(const char*);
/// create a Boolean object /// create a Boolean object
json(const bool) noexcept; json(const bool) noexcept;
/// create a number object /// create a number object
@ -130,18 +130,18 @@ class json
/// create a number object /// create a number object
json(const double) noexcept; json(const double) noexcept;
/// create an array /// create an array
json(const array_t&) noexcept; json(const array_t&);
/// create an array (move) /// create an array (move)
json(array_t&&) noexcept; json(array_t&&);
/// create an object /// create an object
json(const object_t&) noexcept; json(const object_t&);
/// create an object (move) /// create an object (move)
json(object_t&&) noexcept; json(object_t&&);
/// create from an initializer list (to an array or object) /// create from an initializer list (to an array or object)
json(list_init_t) noexcept; json(list_init_t);
/// copy constructor /// copy constructor
json(const json&) noexcept; json(const json&);
/// move constructor /// move constructor
json(json&&) noexcept; json(json&&) noexcept;
@ -158,7 +158,7 @@ class json
private: private:
/// return the type as string /// return the type as string
const std::string _typename() const noexcept; const std::string type_name() const noexcept;
public: public:
/// explicit value conversion /// explicit value conversion
@ -312,14 +312,14 @@ class json
private: private:
/// the type of this object /// the type of this object
value_type _type = value_type::null; value_type type_ = value_type::null;
/// the payload /// the payload
value _value {}; value value_ {};
private: private:
/// mutex to guard payload /// mutex to guard payload
static std::mutex _token; static std::mutex token_;
public: public:
/// an iterator /// an iterator
@ -347,11 +347,11 @@ class json
private: private:
/// a JSON value /// a JSON value
json* _object = nullptr; json* object_ = nullptr;
/// an iterator for JSON arrays /// an iterator for JSON arrays
array_t::iterator* _vi = nullptr; array_t::iterator* vi_ = nullptr;
/// an iterator for JSON objects /// an iterator for JSON objects
object_t::iterator* _oi = nullptr; object_t::iterator* oi_ = nullptr;
}; };
/// a const iterator /// a const iterator
@ -380,11 +380,11 @@ class json
private: private:
/// a JSON value /// a JSON value
const json* _object = nullptr; const json* object_ = nullptr;
/// an iterator for JSON arrays /// an iterator for JSON arrays
array_t::const_iterator* _vi = nullptr; array_t::const_iterator* vi_ = nullptr;
/// an iterator for JSON objects /// an iterator for JSON objects
object_t::const_iterator* _oi = nullptr; object_t::const_iterator* oi_ = nullptr;
}; };
private: private:
@ -427,11 +427,11 @@ class json
private: private:
/// a buffer of the input /// a buffer of the input
std::string _buffer {}; std::string buffer_ {};
/// the current character /// the current character
char _current {}; char current_ {};
/// the position inside the input buffer /// the position inside the input buffer
size_t _pos = 0; size_t pos_ = 0;
}; };
}; };