From a0f181e667f3d3b299784809cd610a4782e5be92 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Sun, 15 Feb 2015 01:18:00 +0100 Subject: Fixed compilation of VariantReader and Typesystem on GCC 4.9 --- src/core/common/VariantReader.cpp | 2 +- src/core/common/VariantReader.hpp | 2 +- src/core/model/Typesystem.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core') diff --git a/src/core/common/VariantReader.cpp b/src/core/common/VariantReader.cpp index 3f02226..fb93ad0 100644 --- a/src/core/common/VariantReader.cpp +++ b/src/core/common/VariantReader.cpp @@ -495,7 +495,7 @@ std::pair VariantReader::parseBool(CharReader &reader, bool val = false; CharReaderFork readerFork = reader.fork(); LoggerFork loggerFork = logger.fork(); - auto res = parseToken(readerFork, loggerFork, {}); + auto res = parseToken(readerFork, loggerFork, std::unordered_set{}); if (res.first) { bool valid = false; if (res.second == "true") { diff --git a/src/core/common/VariantReader.hpp b/src/core/common/VariantReader.hpp index 1232f6e..44132a0 100644 --- a/src/core/common/VariantReader.hpp +++ b/src/core/common/VariantReader.hpp @@ -322,7 +322,7 @@ public: */ static std::pair parseTyped( VariantType type, CharReader &reader, Logger &logger, - const std::unordered_set &delims = {}); + const std::unordered_set &delims = std::unordered_set{}); /** * Tries to parse an instance of the given type from the given string. The * called method is one of the parse methods defined here and adheres to the diff --git a/src/core/model/Typesystem.hpp b/src/core/model/Typesystem.hpp index 9f9470e..9d22c0b 100644 --- a/src/core/model/Typesystem.hpp +++ b/src/core/model/Typesystem.hpp @@ -179,7 +179,7 @@ public: * These characters are not included in the result. May not be nullptr. */ std::pair read(CharReader &reader, Logger &logger, - const std::unordered_set &delims = {}); + const std::unordered_set &delims = std::unordered_set{}); /** * Tries to parse an instance of this type from the given string. -- cgit v1.2.3