Revision c8f861e2adcb56028398bc4cfcdf2316ca40e7da authored by B2G Bumper Bot on 07 April 2014, 18:20:21 UTC, committed by B2G Bumper Bot on 07 April 2014, 18:20:21 UTC
========

https://hg.mozilla.org/integration/gaia-1_3/rev/65893b72eb03
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #18050 from bobsilverberg/revert_revert

Bug 991657 - [v1.3] Backport test_cards_view_with_two_apps.py test to v1.3

========

https://hg.mozilla.org/integration/gaia-1_3/rev/37604331df73
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Fix issue with mozdevice >=0.31 on TBPL

========

https://hg.mozilla.org/integration/gaia-1_3/rev/583c3db01206
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Revert "Revert "Merge pull request #17988 from bobsilverberg/cards_view_v1.3""

This reverts commit f43898e5c9488ae8614c71d2fe9b7c205726c471.

========

https://hg.mozilla.org/integration/gaia-1_3/rev/f34b173dd4a0
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #17988 from bobsilverberg/cards_view_v1.3"

This reverts commit 76e87fb7c2aa4ae4311b92ddab3e3fd484f28094, reversing
changes made to 7928935802853da76aeb5577a76678eef72d84e9.
1 parent da52300
Raw File
msvc-stl-wrapper.template.h
/* -*- 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

// Suppress windef.h min and max macros - they make std::min/max not compile.
#define NOMINMAX 1

// Code built with !_HAS_EXCEPTIONS calls std::_Throw(), but the win2k
// CRT doesn't export std::_Throw().  So we define it.
#ifndef mozilla_Throw_h
#  include "mozilla/throw_msvc.h"
#endif

// 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}>

// 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.
#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
#  include "mozilla/mozalloc.h"
#else
#  error "STL code can only be used with infallible ::operator new()"
#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 -DDEBUG), 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

// C4275: When _HAS_EXCEPTIONS is set to 0, system STL header
//        will generate the warning which we can't modify.
// C4530: We know that code won't be able to catch exceptions,
//        but that's OK because we're not throwing them.
#pragma warning( push )
#pragma warning( disable : 4275 4530 )

#include <${HEADER_PATH}>

#pragma warning( pop )

#endif  // if mozilla_${HEADER}_h
back to top