From 66c2ba607605940c77c6b13d79e66506cc2c7f19 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 11 Nov 2015 08:07:02 +0100 Subject: [PATCH] Json: Fix compile for MSVC2013 Change-Id: I5266165c64bb4c1bdb75ac04f9a5fadb6d97e6ee Reviewed-by: David Schulz --- src/shared/json/json.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/shared/json/json.h b/src/shared/json/json.h index 7bc945cd3e9..4b9c543ff0c 100644 --- a/src/shared/json/json.h +++ b/src/shared/json/json.h @@ -34,6 +34,7 @@ #ifndef JSONVALUE_H #define JSONVALUE_H +#include #include #include #include @@ -390,8 +391,8 @@ public: typedef JsonValue value_type; typedef JsonValueRef reference; - constexpr iterator() : o(nullptr), i(0) {} - constexpr iterator(JsonObject *obj, int index) : o(obj), i(index) {} + iterator() : o(nullptr), i(0) {} + iterator(JsonObject *obj, int index) : o(obj), i(index) {} std::string key() const { return o->keyAt(i); } JsonValueRef value() const { return JsonValueRef(o, i); } @@ -428,8 +429,8 @@ public: typedef JsonValue value_type; typedef JsonValue reference; - constexpr const_iterator() : o(nullptr), i(0) {} - constexpr const_iterator(const JsonObject *obj, int index) + const_iterator() : o(nullptr), i(0) {} + const_iterator(const JsonObject *obj, int index) : o(obj), i(index) {} const_iterator(const iterator &other) : o(other.o), i(other.i) {}