feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Json: Fix compile for MSVC2013

Browse Source 
Change-Id: I5266165c64bb4c1bdb75ac04f9a5fadb6d97e6ee
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-11-11 08:07:02 +01:00
committed by David Schulz
parent 90ed0cf793
commit 66c2ba6076
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/shared/json/json.h
View File

@@ -34,6 +34,7 @@
#ifndef JSONVALUE_H #ifndef JSONVALUE_H
#define JSONVALUE_H #define JSONVALUE_H
#include <cstdint>
#include <initializer_list> #include <initializer_list>
#include <string> #include <string>
#include <vector> #include <vector>
@@ -390,8 +391,8 @@ public:
typedef JsonValue value_type; typedef JsonValue value_type;
typedef JsonValueRef reference; typedef JsonValueRef reference;
constexpr iterator() : o(nullptr), i(0) {} iterator() : o(nullptr), i(0) {}
constexpr iterator(JsonObject *obj, int index) : o(obj), i(index) {} iterator(JsonObject *obj, int index) : o(obj), i(index) {}
std::string key() const { return o->keyAt(i); } std::string key() const { return o->keyAt(i); }
JsonValueRef value() const { return JsonValueRef(o, i); } JsonValueRef value() const { return JsonValueRef(o, i); }
@@ -428,8 +429,8 @@ public:
typedef JsonValue value_type; typedef JsonValue value_type;
typedef JsonValue reference; typedef JsonValue reference;
constexpr const_iterator() : o(nullptr), i(0) {} const_iterator() : o(nullptr), i(0) {}
constexpr const_iterator(const JsonObject *obj, int index) const_iterator(const JsonObject *obj, int index)
: o(obj), i(index) {} : o(obj), i(index) {}
const_iterator(const iterator &other) const_iterator(const iterator &other)
: o(other.o), i(other.i) {} : o(other.o), i(other.i) {}