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

included fixes for MSVC (see #62)

Browse source 
94de11e, f673c8d, 540b763
This commit is contained in:
Niels 2015-06-04 21:02:16 +02:00
parent 29512ae989
commit adc065d328
2 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/json.hpp
View file

@ -139,9 +139,10 @@ class basic_json
/////////////////////////// ///////////////////////////
/// a type for an object /// a type for an object
using object_t = ObjectType<StringType, basic_json>; using object_t =
ObjectType<StringType, basic_json, std::less<StringType>, AllocatorType<std::pair<const StringType, basic_json>>>;
/// a type for an array /// a type for an array
using array_t = ArrayType<basic_json>; using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
/// a type for a string /// a type for a string
using string_t = StringType; using string_t = StringType;
/// a type for a boolean /// a type for a boolean
@ -2350,15 +2351,15 @@ class basic_json
public: public:
/// the type of the values when the iterator is dereferenced /// the type of the values when the iterator is dereferenced
using value_type = basic_json::value_type; using value_type = typename basic_json::value_type;
/// a type to represent differences between iterators /// a type to represent differences between iterators
using difference_type = basic_json::difference_type; using difference_type = typename basic_json::difference_type;
/// defines a pointer to the type iterated over (value_type) /// defines a pointer to the type iterated over (value_type)
using pointer = basic_json::pointer; using pointer = typename basic_json::pointer;
/// defines a reference to the type iterated over (value_type) /// defines a reference to the type iterated over (value_type)
using reference = basic_json::reference; using reference = typename basic_json::reference;
/// the category of the iterator /// the category of the iterator
using iterator_category = std::bidirectional_iterator_tag; using iterator_category = typename std::bidirectional_iterator_tag;
/// default constructor /// default constructor
inline iterator() = default; inline iterator() = default;
@ -2866,15 +2867,15 @@ class basic_json
public: public:
/// the type of the values when the iterator is dereferenced /// the type of the values when the iterator is dereferenced
using value_type = basic_json::value_type; using value_type = typename basic_json::value_type;
/// a type to represent differences between iterators /// a type to represent differences between iterators
using difference_type = basic_json::difference_type; using difference_type = typename basic_json::difference_type;
/// defines a pointer to the type iterated over (value_type) /// defines a pointer to the type iterated over (value_type)
using pointer = basic_json::const_pointer; using pointer = typename basic_json::const_pointer;
/// defines a reference to the type iterated over (value_type) /// defines a reference to the type iterated over (value_type)
using reference = basic_json::const_reference; using reference = typename basic_json::const_reference;
/// the category of the iterator /// the category of the iterator
using iterator_category = std::bidirectional_iterator_tag; using iterator_category = typename std::bidirectional_iterator_tag;
/// default constructor /// default constructor
inline const_iterator() = default; inline const_iterator() = default;
@ -3394,10 +3395,11 @@ class basic_json
}; };
/// a reverse random access iterator for the basic_json class /// a reverse random access iterator for the basic_json class
class reverse_iterator : private std::reverse_iterator<basic_json::iterator> class reverse_iterator : private std::reverse_iterator<typename basic_json::iterator>
{ {
public: public:
inline reverse_iterator(const typename std::reverse_iterator<basic_json::iterator>::iterator_type& inline reverse_iterator(const typename
std::reverse_iterator<typename basic_json::iterator>::iterator_type&
it) it)
: std::reverse_iterator<basic_json::iterator>(it) {} : std::reverse_iterator<basic_json::iterator>(it) {}
@ -3415,11 +3417,11 @@ class basic_json
}; };
/// a const reverse random access iterator for the basic_json class /// a const reverse random access iterator for the basic_json class
class const_reverse_iterator : private std::reverse_iterator<basic_json::const_iterator> class const_reverse_iterator : private std::reverse_iterator<typename basic_json::const_iterator>
{ {
public: public:
inline const_reverse_iterator(const typename inline const_reverse_iterator(const typename
std::reverse_iterator<basic_json::const_iterator>::iterator_type& it) std::reverse_iterator<typename basic_json::const_iterator>::iterator_type& it)
: std::reverse_iterator<basic_json::const_iterator>(it) {} : std::reverse_iterator<basic_json::const_iterator>(it) {}
/// return the key of an object iterator /// return the key of an object iterator

34
src/json.hpp.re2c
View file

@ -139,9 +139,10 @@ class basic_json
/////////////////////////// ///////////////////////////
/// a type for an object /// a type for an object
using object_t = ObjectType<StringType, basic_json>; using object_t =
ObjectType<StringType, basic_json, std::less<StringType>, AllocatorType<std::pair<const StringType, basic_json>>>;
/// a type for an array /// a type for an array
using array_t = ArrayType<basic_json>; using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
/// a type for a string /// a type for a string
using string_t = StringType; using string_t = StringType;
/// a type for a boolean /// a type for a boolean
@ -2350,15 +2351,15 @@ class basic_json
public: public:
/// the type of the values when the iterator is dereferenced /// the type of the values when the iterator is dereferenced
using value_type = basic_json::value_type; using value_type = typename basic_json::value_type;
/// a type to represent differences between iterators /// a type to represent differences between iterators
using difference_type = basic_json::difference_type; using difference_type = typename basic_json::difference_type;
/// defines a pointer to the type iterated over (value_type) /// defines a pointer to the type iterated over (value_type)
using pointer = basic_json::pointer; using pointer = typename basic_json::pointer;
/// defines a reference to the type iterated over (value_type) /// defines a reference to the type iterated over (value_type)
using reference = basic_json::reference; using reference = typename basic_json::reference;
/// the category of the iterator /// the category of the iterator
using iterator_category = std::bidirectional_iterator_tag; using iterator_category = typename std::bidirectional_iterator_tag;
/// default constructor /// default constructor
inline iterator() = default; inline iterator() = default;
@ -2866,15 +2867,15 @@ class basic_json
public: public:
/// the type of the values when the iterator is dereferenced /// the type of the values when the iterator is dereferenced
using value_type = basic_json::value_type; using value_type = typename basic_json::value_type;
/// a type to represent differences between iterators /// a type to represent differences between iterators
using difference_type = basic_json::difference_type; using difference_type = typename basic_json::difference_type;
/// defines a pointer to the type iterated over (value_type) /// defines a pointer to the type iterated over (value_type)
using pointer = basic_json::const_pointer; using pointer = typename basic_json::const_pointer;
/// defines a reference to the type iterated over (value_type) /// defines a reference to the type iterated over (value_type)
using reference = basic_json::const_reference; using reference = typename basic_json::const_reference;
/// the category of the iterator /// the category of the iterator
using iterator_category = std::bidirectional_iterator_tag; using iterator_category = typename std::bidirectional_iterator_tag;
/// default constructor /// default constructor
inline const_iterator() = default; inline const_iterator() = default;
@ -3394,10 +3395,11 @@ class basic_json
}; };
/// a reverse random access iterator for the basic_json class /// a reverse random access iterator for the basic_json class
class reverse_iterator : private std::reverse_iterator<basic_json::iterator> class reverse_iterator : private std::reverse_iterator<typename basic_json::iterator>
{ {
public: public:
inline reverse_iterator(const typename std::reverse_iterator<basic_json::iterator>::iterator_type& inline reverse_iterator(const typename
std::reverse_iterator<typename basic_json::iterator>::iterator_type&
it) it)
: std::reverse_iterator<basic_json::iterator>(it) {} : std::reverse_iterator<basic_json::iterator>(it) {}
@ -3415,11 +3417,11 @@ class basic_json
}; };
/// a const reverse random access iterator for the basic_json class /// a const reverse random access iterator for the basic_json class
class const_reverse_iterator : private std::reverse_iterator<basic_json::const_iterator> class const_reverse_iterator : private std::reverse_iterator<typename basic_json::const_iterator>
{ {
public: public:
inline const_reverse_iterator(const typename inline const_reverse_iterator(const typename
std::reverse_iterator<basic_json::const_iterator>::iterator_type& it) std::reverse_iterator<typename basic_json::const_iterator>::iterator_type& it)
: std::reverse_iterator<basic_json::const_iterator>(it) {} : std::reverse_iterator<basic_json::const_iterator>(it) {}
/// return the key of an object iterator /// return the key of an object iterator