summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-07-03 09:32:56 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-07-03 10:42:12 +0200
commit4dc30cbbb078c72bc11a41853bf47cc1530d27d5 (patch)
treeb83f1ad7ef9368076499e0a3e80fb146b89e5464
parent2fb634269fbb292d10efb75237632c5227feeafb (diff)
downloadqtlocation-mapboxgl-4dc30cbbb078c72bc11a41853bf47cc1530d27d5.tar.gz
remove variant options; they're all functions anyway
-rw-r--r--include/llmr/style/property_value.hpp3
-rw-r--r--src/style/property_fallback.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/include/llmr/style/property_value.hpp b/include/llmr/style/property_value.hpp
index f648e9bef6..3e2a675b53 100644
--- a/include/llmr/style/property_value.hpp
+++ b/include/llmr/style/property_value.hpp
@@ -8,9 +8,6 @@
namespace llmr {
typedef util::variant<
- bool,
- float,
- Color,
std::string,
TranslateAnchorType,
RotateAnchorType,
diff --git a/src/style/property_fallback.cpp b/src/style/property_fallback.cpp
index b57a6a216b..0560ba299f 100644
--- a/src/style/property_fallback.cpp
+++ b/src/style/property_fallback.cpp
@@ -51,6 +51,6 @@ const std::map<PropertyKey, PropertyValue> PropertyFallbackValue::properties = {
{ PropertyKey::BackgroundColor, Color({{ 0, 0, 0, 0 }}) },
};
-const PropertyValue PropertyFallbackValue::defaultProperty = PropertyValue();
+const PropertyValue PropertyFallbackValue::defaultProperty = false;
}