From ea4320234437b4a493afefd978acbda95b77b711 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Sat, 24 Jul 2010 01:33:38 +0000
Subject: [PATCH] + fixed template parameter shadowing (clang++)

---
 include/mapnik/utils.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/mapnik/utils.hpp b/include/mapnik/utils.hpp
index 23889a7b5..7aa66dc1d 100644
--- a/include/mapnik/utils.hpp
+++ b/include/mapnik/utils.hpp
@@ -96,7 +96,7 @@ namespace mapnik
     };
     
     template <typename T,
-              template <typename T> class CreatePolicy=CreateStatic> class singleton
+          template <typename U> class CreatePolicy=CreateStatic> class singleton
               {
 #ifdef __SUNPRO_CC
 		/* Sun's C++ compiler will issue the following errors if CreatePolicy<T> is used:
@@ -159,13 +159,13 @@ namespace mapnik
               };
 #ifdef MAPNIK_THREADSAFE
     template <typename T,
-              template <typename T> class CreatePolicy> mutex singleton<T,CreatePolicy>::mutex_;
+          template <typename U> class CreatePolicy> mutex singleton<T,CreatePolicy>::mutex_;
 #endif
     
     template <typename T,
-              template <typename T> class CreatePolicy> T* singleton<T,CreatePolicy>::pInstance_=0;
+          template <typename U> class CreatePolicy> T* singleton<T,CreatePolicy>::pInstance_=0;
     template <typename T,
-              template <typename T> class CreatePolicy> bool singleton<T,CreatePolicy>::destroyed_=false;
+          template <typename U> class CreatePolicy> bool singleton<T,CreatePolicy>::destroyed_=false;
    
 }