From fe09323aa7fed04eb16dd2e136922c4f4ae32c02 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 2 Nov 2016 17:47:19 +0100 Subject: [PATCH] Make the allocator in CGAL::vector not static --- STL_Extension/include/CGAL/vector.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/STL_Extension/include/CGAL/vector.h b/STL_Extension/include/CGAL/vector.h index 9e671720814..cf1766792ee 100644 --- a/STL_Extension/include/CGAL/vector.h +++ b/STL_Extension/include/CGAL/vector.h @@ -174,11 +174,7 @@ public: typedef std::reverse_iterator const_reverse_iterator; protected: -#ifndef _MSC_VER - // Somehow the static initialization does not work correctly for MSVC - // ---> strange linker errors - static -#endif // _MSC_VER + Allocator alloc; iterator start_; @@ -520,11 +516,6 @@ protected: } }; // class vector -#ifndef _MSC_VER -// init static member allocator object -template -Alloc vector< T, Alloc>::alloc = Alloc(); -#endif // _MSC_VER template