diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-15 21:32:54 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-15 21:32:54 +0100 |
| commit | 8e5e08c4f293434585d2a88f7f331f8ce49b67b9 (patch) | |
| tree | fa82a937b1ea80f45d7955938c333f68f8a0f3f6 /src/core/common/VariantReader.hpp | |
| parent | 2544749215bc2465bfeca431e271110ca86d8a83 (diff) | |
| parent | 40f4666c43211d9071a827ad8a2524688e7f678f (diff) | |
Merge branch 'astoecke_parser_stack_new'
Conflicts:
application/src/core/parser/stack/DocumentHandler.cpp
application/src/core/parser/stack/DocumentHandler.hpp
Diffstat (limited to 'src/core/common/VariantReader.hpp')
| -rw-r--r-- | src/core/common/VariantReader.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<bool, Variant> parseTyped( VariantType type, CharReader &reader, Logger &logger, - const std::unordered_set<char> &delims = {}); + const std::unordered_set<char> &delims = std::unordered_set<char>{}); /** * 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 |