update

5 files changed, 16 insertions, 17 deletions

diff --git a/eigen/Eigen/src/StlSupport/CMakeLists.txt b/eigen/Eigen/src/StlSupport/CMakeLists.txt
deleted file mode 100644
index 0f094f6..0000000
--- a/eigen/Eigen/src/StlSupport/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-FILE(GLOB Eigen_StlSupport_SRCS "*.h")
-
-INSTALL(FILES
-  ${Eigen_StlSupport_SRCS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen/src/StlSupport COMPONENT Devel
-  )
diff --git a/eigen/Eigen/src/StlSupport/StdDeque.h b/eigen/Eigen/src/StlSupport/StdDeque.h
index 69a46b2..cf1fedf 100644
--- a/eigen/Eigen/src/StlSupport/StdDeque.h
+++ b/eigen/Eigen/src/StlSupport/StdDeque.h
@@ -45,7 +45,7 @@ namespace std \
 }
 
 // check whether we really need the std::deque specialization
-#if !(defined(_GLIBCXX_DEQUE) && (!EIGEN_GNUC_AT_LEAST(4,1))) /* Note that before gcc-4.1 we already have: std::deque::resize(size_type,const T&). */
+#if !EIGEN_HAS_CXX11_CONTAINERS && !(defined(_GLIBCXX_DEQUE) && (!EIGEN_GNUC_AT_LEAST(4,1))) /* Note that before gcc-4.1 we already have: std::deque::resize(size_type,const T&). */
 
 namespace std {
 
diff --git a/eigen/Eigen/src/StlSupport/StdList.h b/eigen/Eigen/src/StlSupport/StdList.h
index 050c237..e1eba49 100644
--- a/eigen/Eigen/src/StlSupport/StdList.h
+++ b/eigen/Eigen/src/StlSupport/StdList.h
@@ -43,8 +43,8 @@ namespace std \
   }; \
 }
 
-// check whether we really need the std::vector specialization
-#if !(defined(_GLIBCXX_VECTOR) && (!EIGEN_GNUC_AT_LEAST(4,1))) /* Note that before gcc-4.1 we already have: std::list::resize(size_type,const T&). */
+// check whether we really need the std::list specialization
+#if !EIGEN_HAS_CXX11_CONTAINERS && !(defined(_GLIBCXX_LIST) && (!EIGEN_GNUC_AT_LEAST(4,1))) /* Note that before gcc-4.1 we already have: std::list::resize(size_type,const T&). */
 
 namespace std
 {
diff --git a/eigen/Eigen/src/StlSupport/StdVector.h b/eigen/Eigen/src/StlSupport/StdVector.h
index 611664a..ec22821 100644
--- a/eigen/Eigen/src/StlSupport/StdVector.h
+++ b/eigen/Eigen/src/StlSupport/StdVector.h
@@ -44,6 +44,9 @@ namespace std \
   }; \
 }
 
+// Don't specialize if containers are implemented according to C++11
+#if !EIGEN_HAS_CXX11_CONTAINERS
+
 namespace std {
 
 #define EIGEN_STD_VECTOR_SPECIALIZATION_BODY \
@@ -122,5 +125,7 @@ namespace std {
 #endif
   };
 }
+#endif // !EIGEN_HAS_CXX11_CONTAINERS
+
 
 #endif // EIGEN_STDVECTOR_H
diff --git a/eigen/Eigen/src/StlSupport/details.h b/eigen/Eigen/src/StlSupport/details.h
index d8debc7..2cfd13e 100644
--- a/eigen/Eigen/src/StlSupport/details.h
+++ b/eigen/Eigen/src/StlSupport/details.h
@@ -22,13 +22,13 @@ namespace Eigen {
   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;
+    typedef std::size_t     size_type;
+    typedef std::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
@@ -46,7 +46,7 @@ namespace Eigen {
     ~aligned_allocator_indirection() {}
   };
 
-#ifdef _MSC_VER
+#if EIGEN_COMP_MSVC
 
   // 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