bug #86 : use internal:: namespace instead of ei_ prefix

1 files changed, 45 insertions, 43 deletions

diff --git a/Eigen/src/StlSupport/details.h b/Eigen/src/StlSupport/details.h
index 5ee4dba94..d3dbe0be8 100644
--- a/Eigen/src/StlSupport/details.h
+++ b/Eigen/src/StlSupport/details.h
@@ -27,58 +27,60 @@
 #define EIGEN_STL_DETAILS_H
 
 #ifndef EIGEN_ALIGNED_ALLOCATOR
-	#define EIGEN_ALIGNED_ALLOCATOR Eigen::aligned_allocator
+  #define EIGEN_ALIGNED_ALLOCATOR Eigen::aligned_allocator
 #endif
 
 namespace Eigen {
 
-	// This one is needed to prevent reimplementing the whole std::vector.
-	template <class T>
-	class aligned_allocator_indirection : public EIGEN_ALIGNED_ALLOCATOR<T>
-	{
-	public:
-		typedef size_t    size_type;
-		typedef ptrdiff_t difference_type;
-		typedef T*        pointer;
-		typedef const T*  const_pointer;
-		typedef T&        reference;
-		typedef const T&  const_reference;
-		typedef T         value_type;
+  // This one is needed to prevent reimplementing the whole std::vector.
+  template <class T>
+  class aligned_allocator_indirection : public EIGEN_ALIGNED_ALLOCATOR<T>
+  {
+  public:
+    typedef size_t    size_type;
+    typedef ptrdiff_t difference_type;
+    typedef T*        pointer;
+    typedef const T*  const_pointer;
+    typedef T&        reference;
+    typedef const T&  const_reference;
+    typedef T         value_type;
 
-		template<class U>
-		struct rebind
-		{
-			typedef aligned_allocator_indirection<U> other;
-		};
+    template<class U>
+    struct rebind
+    {
+      typedef aligned_allocator_indirection<U> other;
+    };
 
-		aligned_allocator_indirection() {}
-		aligned_allocator_indirection(const aligned_allocator_indirection& ) : EIGEN_ALIGNED_ALLOCATOR<T>() {}
-		aligned_allocator_indirection(const EIGEN_ALIGNED_ALLOCATOR<T>& ) {}
-		template<class U>
-		aligned_allocator_indirection(const aligned_allocator_indirection<U>& ) {}
-		template<class U>
-		aligned_allocator_indirection(const EIGEN_ALIGNED_ALLOCATOR<U>& ) {}
-		~aligned_allocator_indirection() {}
-	};
+    aligned_allocator_indirection() {}
+    aligned_allocator_indirection(const aligned_allocator_indirection& ) : EIGEN_ALIGNED_ALLOCATOR<T>() {}
+    aligned_allocator_indirection(const EIGEN_ALIGNED_ALLOCATOR<T>& ) {}
+    template<class U>
+    aligned_allocator_indirection(const aligned_allocator_indirection<U>& ) {}
+    template<class U>
+    aligned_allocator_indirection(const EIGEN_ALIGNED_ALLOCATOR<U>& ) {}
+    ~aligned_allocator_indirection() {}
+  };
 
 #ifdef _MSC_VER
 
-	// sometimes, MSVC detects, at compile time, that the argument x
-	// in std::vector::resize(size_t s,T x) won't be aligned and generate an error
-	// even if this function is never called. Whence this little wrapper.
-#define EIGEN_WORKAROUND_MSVC_STL_SUPPORT(T) Eigen::ei_workaround_msvc_stl_support<T>
-	template<typename T> struct ei_workaround_msvc_stl_support : public T
-	{
-		inline ei_workaround_msvc_stl_support() : T() {}
-		inline ei_workaround_msvc_stl_support(const T& other) : T(other) {}
-		inline operator T& () { return *static_cast<T*>(this); }
-		inline operator const T& () const { return *static_cast<const T*>(this); }
-		template<typename OtherT>
-		inline T& operator=(const OtherT& other)
-		{ T::operator=(other); return *this; }
-		inline ei_workaround_msvc_stl_support& operator=(const ei_workaround_msvc_stl_support& other)
-		{ T::operator=(other); return *this; }
-	};
+  // sometimes, MSVC detects, at compile time, that the argument x
+  // in std::vector::resize(size_t s,T x) won't be aligned and generate an error
+  // even if this function is never called. Whence this little wrapper.
+#define EIGEN_WORKAROUND_MSVC_STL_SUPPORT(T) Eigen::internal::workaround_msvc_stl_support<T>
+  namespace internal {
+  template<typename T> struct workaround_msvc_stl_support : public T
+  {
+    inline workaround_msvc_stl_support() : T() {}
+    inline workaround_msvc_stl_support(const T& other) : T(other) {}
+    inline operator T& () { return *static_cast<T*>(this); }
+    inline operator const T& () const { return *static_cast<const T*>(this); }
+    template<typename OtherT>
+    inline T& operator=(const OtherT& other)
+    { T::operator=(other); return *this; }
+    inline workaround_msvc_stl_support& operator=(const workaround_msvc_stl_support& other)
+    { T::operator=(other); return *this; }
+  };
+  }
 
 #else