diff options
Diffstat (limited to 'src/mbgl/style/conversion/constant.cpp')
-rw-r--r-- | src/mbgl/style/conversion/constant.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mbgl/style/conversion/constant.cpp b/src/mbgl/style/conversion/constant.cpp index e837c4e70b..d432b5f051 100644 --- a/src/mbgl/style/conversion/constant.cpp +++ b/src/mbgl/style/conversion/constant.cpp @@ -7,8 +7,8 @@ namespace conversion { optional<bool> Converter<bool>::operator()(const Convertible& value, Error& error) const { optional<bool> converted = toBool(value); if (!converted) { - error = { "value must be a boolean" }; - return {}; + error.message = "value must be a boolean"; + return nullopt; } return *converted; } @@ -16,8 +16,8 @@ optional<bool> Converter<bool>::operator()(const Convertible& value, Error& erro optional<float> Converter<float>::operator()(const Convertible& value, Error& error) const { optional<float> converted = toNumber(value); if (!converted) { - error = { "value must be a number" }; - return {}; + error.message = "value must be a number"; + return nullopt; } return *converted; } @@ -25,8 +25,8 @@ optional<float> Converter<float>::operator()(const Convertible& value, Error& er optional<std::string> Converter<std::string>::operator()(const Convertible& value, Error& error) const { optional<std::string> converted = toString(value); if (!converted) { - error = { "value must be a string" }; - return {}; + error.message = "value must be a string"; + return nullopt; } return *converted; } @@ -34,14 +34,14 @@ optional<std::string> Converter<std::string>::operator()(const Convertible& valu optional<Color> Converter<Color>::operator()(const Convertible& value, Error& error) const { optional<std::string> string = toString(value); if (!string) { - error = { "value must be a string" }; - return {}; + error.message = "value must be a string"; + return nullopt; } optional<Color> color = Color::parse(*string); if (!color) { - error = { "value must be a valid color" }; - return {}; + error.message = "value must be a valid color"; + return nullopt; } return *color; @@ -49,8 +49,8 @@ optional<Color> Converter<Color>::operator()(const Convertible& value, Error& er optional<std::vector<float>> Converter<std::vector<float>>::operator()(const Convertible& value, Error& error) const { if (!isArray(value)) { - error = { "value must be an array" }; - return {}; + error.message = "value must be an array"; + return nullopt; } std::vector<float> result; @@ -59,8 +59,8 @@ optional<std::vector<float>> Converter<std::vector<float>>::operator()(const Con for (std::size_t i = 0; i < arrayLength(value); ++i) { optional<float> number = toNumber(arrayMember(value, i)); if (!number) { - error = { "value must be an array of numbers" }; - return {}; + error.message = "value must be an array of numbers"; + return nullopt; } result.push_back(*number); } @@ -70,8 +70,8 @@ optional<std::vector<float>> Converter<std::vector<float>>::operator()(const Con optional<std::vector<std::string>> Converter<std::vector<std::string>>::operator()(const Convertible& value, Error& error) const { if (!isArray(value)) { - error = { "value must be an array" }; - return {}; + error.message = "value must be an array"; + return nullopt; } std::vector<std::string> result; @@ -80,8 +80,8 @@ optional<std::vector<std::string>> Converter<std::vector<std::string>>::operator for (std::size_t i = 0; i < arrayLength(value); ++i) { optional<std::string> string = toString(arrayMember(value, i)); if (!string) { - error = { "value must be an array of strings" }; - return {}; + error.message = "value must be an array of strings"; + return nullopt; } result.push_back(*string); } |