From 4dc30cbbb078c72bc11a41853bf47cc1530d27d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Thu, 3 Jul 2014 09:32:56 +0200 Subject: [PATCH] remove variant options; they're all functions anyway --- include/llmr/style/property_value.hpp | 3 --- src/style/property_fallback.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/llmr/style/property_value.hpp b/include/llmr/style/property_value.hpp index f648e9bef..3e2a675b5 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 b57a6a216..0560ba299 100644 --- a/src/style/property_fallback.cpp +++ b/src/style/property_fallback.cpp @@ -51,6 +51,6 @@ const std::map PropertyFallbackValue::properties = { { PropertyKey::BackgroundColor, Color({{ 0, 0, 0, 0 }}) }, }; -const PropertyValue PropertyFallbackValue::defaultProperty = PropertyValue(); +const PropertyValue PropertyFallbackValue::defaultProperty = false; }