mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
Update config/msvc-stl-wrapper.template.h
This commit is contained in:
@@ -18,12 +18,15 @@
|
||||
# include "mozilla/throw_msvc.h"
|
||||
#endif
|
||||
|
||||
#if defined (_MSC_VER) && _MSC_VER <= 1800
|
||||
// Code might include <new> before other wrapped headers, but <new>
|
||||
// includes <exception> and so we want to wrap it. But mozalloc.h
|
||||
// wants <new> also, so we break the cycle by always explicitly
|
||||
// including <new> here.
|
||||
#include <${NEW_HEADER_PATH}>
|
||||
#endif
|
||||
|
||||
#if defined (_MSC_VER) && _MSC_VER <= 1800
|
||||
// See if we're in code that can use mozalloc. NB: this duplicates
|
||||
// code in nscore.h because nscore.h pulls in prtypes.h, and chromium
|
||||
// can't build with that being included before base/basictypes.h.
|
||||
@@ -32,6 +35,7 @@
|
||||
#else
|
||||
# error "STL code can only be used with infallible ::operator new()"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef _DEBUG
|
||||
// From
|
||||
|
||||
Reference in New Issue
Block a user