From 038cc41cd41fa69ac3aff6f5edf2cc3fba2f23d4 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 4 Sep 2014 18:26:17 +0000
Subject: [PATCH] we are targeting 2014 so rollback 2013 CTP workarounds

---
 include/mapnik/group/group_rule.hpp |  2 +-
 src/load_map.cpp                    | 41 -----------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/include/mapnik/group/group_rule.hpp b/include/mapnik/group/group_rule.hpp
index b971c040c..0de2f2373 100644
--- a/include/mapnik/group/group_rule.hpp
+++ b/include/mapnik/group/group_rule.hpp
@@ -40,7 +40,7 @@ struct MAPNIK_DECL group_rule
 {
    using symbolizers = std::vector<symbolizer>;
 
-   group_rule(const expression_ptr& filter = expression_ptr(new expr_node),
+   group_rule(const expression_ptr& filter =std::make_shared<mapnik::expr_node>(true),
               const expression_ptr& repeat_key = expression_ptr());
 
    group_rule &operator=(const group_rule &rhs);
diff --git a/src/load_map.cpp b/src/load_map.cpp
index 2732728dd..f4e6663b7 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -777,46 +777,6 @@ void map_parser::parse_symbolizers(rule & rule, xml_node const & node)
     rule.reserve(node.size());
     for (auto const& sym_node : node)
     {
-#if defined(_MSC_VER) && _MSC_VER <= 1800
-        std::string const& name = sym_node.name();
-        if (name == "PointSymbolizer") {
-            parse_point_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        } else if (name == "LinePatternSymbolizer") {
-            parse_line_pattern_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        } else if (name == "PolygonPatternSymbolizer") {
-            parse_polygon_pattern_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        } else if (name == "TextSymbolizer") {
-            parse_text_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        } else if (name == "ShieldSymbolizer") {
-            parse_shield_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        } else if (name == "LineSymbolizer") {
-            parse_line_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        } else if (name == "PolygonSymbolizer") {
-            parse_polygon_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        } else if (name == "BuildingSymbolizer") {
-            parse_building_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        } else if (name == "RasterSymbolizer") {
-            parse_raster_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        } else if (name == "MarkersSymbolizer") {
-            parse_markers_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        } else if (name == "GroupSymbolizer") {
-            parse_group_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        } else if (name == "DebugSymbolizer") {
-            parse_debug_symbolizer(rule, sym_node);
-            sym_node.set_processed(true);
-        }
-#else
         switch (name2int(sym_node.name().c_str()))
         {
         case name2int("PointSymbolizer"):
@@ -870,7 +830,6 @@ void map_parser::parse_symbolizers(rule & rule, xml_node const & node)
         default:
             break;
         }
-#endif
     }
 }