From f4ec38e27ccab6c3a1f6639e531bdb796ad3380f Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Thu, 18 Jan 2018 14:15:21 +0000
Subject: [PATCH] STL_extensions

---
 Installation/include/CGAL/disable_warnings.h                  | 3 ++-
 STL_Extension/include/CGAL/Concurrent_compact_container.h     | 4 ++++
 STL_Extension/test/STL_Extension/test_Compact_container.cpp   | 2 ++
 .../test/STL_Extension/test_Concurrent_compact_container.cpp  | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Installation/include/CGAL/disable_warnings.h b/Installation/include/CGAL/disable_warnings.h
index 75cb6574e6e..6c180ab3514 100644
--- a/Installation/include/CGAL/disable_warnings.h
+++ b/Installation/include/CGAL/disable_warnings.h
@@ -27,7 +27,8 @@
 #  pragma warning(disable: 4355) // 'this' : used in base member initializer list
 #  pragma warning(disable: 4396) //  the inline specifier cannot be used when a friend declaration refers to a specialization of a function template
 #  pragma warning(disable: 4510) // default constructor could not be generated
-#  pragma warning(disable: 4512) //  assignment operator could not be generated#  pragma warning(disable: 4522)  // multiple assignment operators specified
+#  pragma warning(disable: 4512) //  assignment operator could not be generated
+#  pragma warning(disable: 4522) // multiple assignment operators specified
 #  pragma warning(disable: 4610) // can never be instantiated - user defined constructor required
 #  pragma warning(disable: 4706) // assignment within conditional expression
 #  pragma warning(disable: 4714) // function marked as __forceinline not inlined
diff --git a/STL_Extension/include/CGAL/Concurrent_compact_container.h b/STL_Extension/include/CGAL/Concurrent_compact_container.h
index 811a631b394..af9212fa734 100644
--- a/STL_Extension/include/CGAL/Concurrent_compact_container.h
+++ b/STL_Extension/include/CGAL/Concurrent_compact_container.h
@@ -23,6 +23,8 @@
 #ifndef CGAL_CONCURRENT_COMPACT_CONTAINER_H
 #define CGAL_CONCURRENT_COMPACT_CONTAINER_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/basic.h>
 #include <CGAL/Default.h>
 
@@ -1057,6 +1059,8 @@ namespace std {
 
 } // namespace std
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_CONCURRENT_COMPACT_CONTAINER_H
 
 #endif // CGAL_LINKED_WITH_TBB
diff --git a/STL_Extension/test/STL_Extension/test_Compact_container.cpp b/STL_Extension/test/STL_Extension/test_Compact_container.cpp
index 19d40d71549..1e78c93d382 100644
--- a/STL_Extension/test/STL_Extension/test_Compact_container.cpp
+++ b/STL_Extension/test/STL_Extension/test_Compact_container.cpp
@@ -15,6 +15,8 @@
 
 #include <boost/type_traits/is_base_of.hpp>
 
+#include <CGAL/disable_warnings.h>
+
 template <typename Has_timestamp_ = CGAL::Tag_true>
 struct Node_1
 : public CGAL::Compact_container_base
diff --git a/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp b/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp
index b4f6ede8654..1c12ab0507e 100644
--- a/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp
+++ b/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp
@@ -27,6 +27,8 @@ int main()
 # include <tbb/parallel_for.h>
 # include <tbb/atomic.h>
 
+#include <CGAL/disable_warnings.h>
+
 struct Node_1
 : public CGAL::Compact_container_base
 {