1 files changed, 72 insertions, 0 deletions
diff --git a/config/msvc-stl-wrapper.template.h b/config/msvc-stl-wrapper.template.h
new file mode 100644
index 0000000000..fe9be05011
--- /dev/null
+++ b/config/msvc-stl-wrapper.template.h
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=8 et :
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_${HEADER}_h
+#define mozilla_${HEADER}_h
+
+#if _HAS_EXCEPTIONS
+#  error "STL code can only be used with -fno-exceptions"
+#endif
+
+#if defined(__clang__)
+// Silence "warning: #include_next is a language extension [-Wgnu-include-next]"
+#pragma clang system_header
+#endif
+
+// Include mozalloc after the STL header and all other headers it includes
+// have been preprocessed.
+#if !defined(MOZ_INCLUDE_MOZALLOC_H)
+#  define MOZ_INCLUDE_MOZALLOC_H
+#  define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER}
+#endif
+
+#ifdef _DEBUG
+// From
+//   http://msdn.microsoft.com/en-us/library/aa985982%28VS.80%29.aspx
+// and
+//   http://msdn.microsoft.com/en-us/library/aa985965%28VS.80%29.aspx
+// there appear to be two types of STL container checking.  The
+// former is enabled by -D_DEBUG (which is implied by -MDd or -MTd), and
+// looks to be full generation/mutation checked iterators as done by
+// _GLIBCXX_DEBUG.  The latter appears to just be bounds checking, and
+// is enabled by the following macros.  It appears that the _DEBUG
+// iterators subsume _SECURE_SCL, and the following settings are
+// default anyway, so we'll just leave this commented out.
+//#  define _SECURE_SCL 1
+//#  define _SECURE_SCL_THROWS 0
+#else
+// Note: _SECURE_SCL iterators are on by default in opt builds.  We
+// could leave them on, but since gcc doesn't, we might as well
+// preserve that behavior for perf reasons.  nsTArray is in the same
+// camp as gcc.  Can revisit later.
+//
+// FIXME/bug 551254: because we're not wrapping all the STL headers we
+// use, undefining this here can cause some headers to be built with
+// iterator checking and others not.  Turning this off until we have a
+// better plan.
+//#  undef _SECURE_SCL
+#endif
+
+#include_next <${HEADER}>
+
+#ifdef MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER}
+// See if we're in code that can use mozalloc.
+#  if !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
+//   In recent versions of MSVC, <new>, which mozalloc.h includes, uses
+//   <type_traits> without including it. Before MSVC 17.7, this worked
+//   fine because <new> included <exception>, which includes <type_traits>.
+//   That is still the case, but it now also includes <cstdlib> before
+//   <type_traits>, so when something includes <exception> before <new>,
+//   we get here before <type_traits> is included, which ends up not working.
+#    include <type_traits>
+#    include "mozilla/mozalloc.h"
+#  else
+#    error "STL code can only be used with infallible ::operator new()"
+#  endif
+#endif
+
+#endif  // if mozilla_${HEADER}_h