From a72fca38a681aa37f8c44b5ac384cc9d56860f23 Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Mon, 17 Apr 2023 21:52:50 +0200 Subject: json: Use the union initialization that is supported in C++17 C++20 has it, and C99 has it, so it works but isn't guaranteed to. --- src/json.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/json.cc b/src/json.cc index ac2e15f..aa2bdec 100644 --- a/src/json.cc +++ b/src/json.cc @@ -49,13 +49,16 @@ struct ArrayJsonValue : public JsonValue { struct BasicJsonValue : public JsonValue { BasicJsonValue(double d) - : JsonValue(JsonType::DOUBLE), data({ .d = d }) { + : JsonValue(JsonType::DOUBLE) { + data.d = d; } BasicJsonValue(int64_t i) - : JsonValue(JsonType::INT64), data({ .i = i }) { + : JsonValue(JsonType::INT64) { + data.i = i; } BasicJsonValue(bool b) - : JsonValue(JsonType::BOOL), data({ .b = b }) { + : JsonValue(JsonType::BOOL) { + data.b = b; } union { double d; -- cgit v1.2.3-70-g09d2