diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-09-26 14:14:44 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-10-23 09:56:43 -0700 |
| commit | 4b2e1cddb4645fb6d2c5f9634dbeb7c21516cede (patch) | |
| tree | f11bd97ea5abf17bc6956f254796f1e8cf4a96f9 /include/mbgl/style/conversion/position.hpp | |
| parent | bb58ddaea8c2d9da9551601318944d9d143ee247 (diff) | |
| download | qtlocation-mapboxgl-4b2e1cddb4645fb6d2c5f9634dbeb7c21516cede.tar.gz | |
Replace compile-time polymorphism with runtime polymorphism in the conversion system
Diffstat (limited to 'include/mbgl/style/conversion/position.hpp')
| -rw-r--r-- | include/mbgl/style/conversion/position.hpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/include/mbgl/style/conversion/position.hpp b/include/mbgl/style/conversion/position.hpp index 7036b03822..044c45862d 100644 --- a/include/mbgl/style/conversion/position.hpp +++ b/include/mbgl/style/conversion/position.hpp @@ -2,9 +2,6 @@ #include <mbgl/style/conversion.hpp> #include <mbgl/style/position.hpp> -#include <mbgl/util/optional.hpp> - -#include <array> namespace mbgl { namespace style { @@ -12,16 +9,7 @@ namespace conversion { template <> struct Converter<Position> { - template <class V> - optional<Position> operator()(const V& value, Error& error) const { - optional<std::array<float, 3>> spherical = convert<std::array<float, 3>>(value, error); - - if (!spherical) { - return {}; - } - - return Position(*spherical); - } + optional<Position> operator()(const Convertible& value, Error& error) const; }; } // namespace conversion |