From d64e8a9371e7b802a2b092eb622c28f7a5391276 Mon Sep 17 00:00:00 2001
From: Marc Glisse <Marc.Glisse@inria.fr>
Date: Fri, 13 May 2011 18:37:13 +0000
Subject: [PATCH] Fix misinterpretation of decay

---
 STL_Extension/include/CGAL/is_iterator.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/STL_Extension/include/CGAL/is_iterator.h b/STL_Extension/include/CGAL/is_iterator.h
index 920805ee06e..a094078ed8a 100644
--- a/STL_Extension/include/CGAL/is_iterator.h
+++ b/STL_Extension/include/CGAL/is_iterator.h
@@ -41,13 +41,18 @@ template <class T,class U> struct is_iterator_type_<T,U,true> :
 	//boost::is_base_of<U,typename std::iterator_traits<T>::iterator_category>
 	boost::is_convertible<typename std::iterator_traits<T>::iterator_category,U>
 	{};
+
+template <class T> struct decay_array { typedef T type; };
+template <class T> struct decay_array<T[]> { typedef T* type; };
+template <class T,int d> struct decay_array<T[d]> { typedef T* type; };
 }
 
+// NOTE: we don't want the real std::decay or functions are included
 template <class T> struct is_iterator :
-	internal::is_iterator_<typename boost::decay<T>::type> {};
+	internal::is_iterator_<typename internal::decay_array<typename boost::remove_cv<typename boost::remove_reference<T>::type>::type>::type> {};
 
 template <class T,class Tag> struct is_iterator_type :
-	internal::is_iterator_type_<typename boost::decay<T>::type,Tag> {};
+	internal::is_iterator_type_<typename internal::decay_array<typename boost::remove_cv<typename boost::remove_reference<T>::type>::type>::type,Tag> {};
 
 }