From b6089295e76835c9e4da7a88e89bcb40b996defb Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Fri, 18 Jun 2010 15:39:07 +0000
Subject: [PATCH] + put enumerartion macros into mapnik namespace   ( clang++
 emmits errors otherwise)

---
 src/stroke.cpp          |  8 ++------
 src/text_symbolizer.cpp | 16 +++++++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/stroke.cpp b/src/stroke.cpp
index 678acdc14..05578dd05 100644
--- a/src/stroke.cpp
+++ b/src/stroke.cpp
@@ -41,14 +41,10 @@ static const char * line_join_strings[] = {
     ""
 };
 
-}
-
-IMPLEMENT_ENUM( mapnik::line_cap_e, line_cap_strings );
-IMPLEMENT_ENUM( mapnik::line_join_e, line_join_strings );
+IMPLEMENT_ENUM( line_cap_e, line_cap_strings );
+IMPLEMENT_ENUM( line_join_e, line_join_strings );
 
 
-namespace mapnik
-{
 stroke::stroke() 
     : c_(0,0,0),
       width_(1.0),
diff --git a/src/text_symbolizer.cpp b/src/text_symbolizer.cpp
index fea17e138..2c9fbb9ff 100644
--- a/src/text_symbolizer.cpp
+++ b/src/text_symbolizer.cpp
@@ -27,6 +27,9 @@
 // boost
 #include <boost/scoped_ptr.hpp>
 
+namespace mapnik
+{
+
 static const char * label_placement_strings[] = {
     "point",
     "line",
@@ -35,7 +38,7 @@ static const char * label_placement_strings[] = {
 };
 
 
-IMPLEMENT_ENUM( mapnik::label_placement_e, label_placement_strings );
+IMPLEMENT_ENUM( label_placement_e, label_placement_strings );
 
 static const char * vertical_alignment_strings[] = {
     "top",
@@ -45,7 +48,7 @@ static const char * vertical_alignment_strings[] = {
 };
 
 
-IMPLEMENT_ENUM( mapnik::vertical_alignment_e, vertical_alignment_strings );
+IMPLEMENT_ENUM( vertical_alignment_e, vertical_alignment_strings );
 
 static const char * horizontal_alignment_strings[] = {
     "left",
@@ -55,7 +58,7 @@ static const char * horizontal_alignment_strings[] = {
 };
 
 
-IMPLEMENT_ENUM( mapnik::horizontal_alignment_e, horizontal_alignment_strings );
+IMPLEMENT_ENUM(horizontal_alignment_e, horizontal_alignment_strings );
 
 static const char * justify_alignment_strings[] = {
     "left",
@@ -65,7 +68,7 @@ static const char * justify_alignment_strings[] = {
 };
 
 
-IMPLEMENT_ENUM( mapnik::justify_alignment_e, justify_alignment_strings );
+IMPLEMENT_ENUM( justify_alignment_e, justify_alignment_strings );
 
 static const char * text_convert_strings[] = {
     "none",
@@ -75,11 +78,10 @@ static const char * text_convert_strings[] = {
 };
 
 
-IMPLEMENT_ENUM( mapnik::text_convert_e, text_convert_strings );
+IMPLEMENT_ENUM( text_convert_e, text_convert_strings );
+
 
 
-namespace mapnik
-{
 text_symbolizer::text_symbolizer(expression_ptr name, std::string const& face_name, unsigned size, color const& fill)
     : name_(name),
       face_name_(face_name),