Band-aid for bug 602558: Avoid the VS10 STL wrappers getting tangled up in <utility>. r=vlad a=bustage
authorChris Jones <jones.chris.g@gmail.com>
Thu, 07 Oct 2010 17:57:47 -0500
changeset 55171 007411b984788bb58ca4d72c55258345a75dc3b7
parent 55170 c11770ffab99bd69e4dde54600152f50692e0796
child 55172 025c3aeb0b1318266f606da1c08f1bba51898dba
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvlad, bustage
bugs602558
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Band-aid for bug 602558: Avoid the VS10 STL wrappers getting tangled up in <utility>. r=vlad a=bustage
gfx/ots/src/gasp.cc
gfx/ots/src/glyf.cc
gfx/ots/src/hmtx.cc
memory/mozalloc/msvc_raise_wrappers.h
--- a/gfx/ots/src/gasp.cc
+++ b/gfx/ots/src/gasp.cc
@@ -1,12 +1,13 @@
 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <new>
 #include "gasp.h"
 
 // gasp - Grid-fitting And Scan-conversion Procedure
 // http://www.microsoft.com/opentype/otspec/gasp.htm
 
 #define DROP_THIS_TABLE \
   do { delete file->gasp; file->gasp = 0; } while (0)
 
--- a/gfx/ots/src/glyf.cc
+++ b/gfx/ots/src/glyf.cc
@@ -1,12 +1,13 @@
 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <new>
 #include "glyf.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "head.h"
 #include "loca.h"
 #include "maxp.h"
--- a/gfx/ots/src/hmtx.cc
+++ b/gfx/ots/src/hmtx.cc
@@ -1,12 +1,13 @@
 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <new>
 #include "hmtx.h"
 
 #include "hhea.h"
 #include "maxp.h"
 
 // hmtx - Horizontal Metrics
 // http://www.microsoft.com/opentype/otspec/hmtx.htm
 
--- a/memory/mozalloc/msvc_raise_wrappers.h
+++ b/memory/mozalloc/msvc_raise_wrappers.h
@@ -34,17 +34,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef mozilla_msvc_raise_wrappers_h
-#define mozilla_msvc_throw_wrappers_h
+#define mozilla_msvc_raise_wrappers_h
 
 #ifdef _XSTDDEF_
 #  error "Unable to wrap _RAISE(); CRT _RAISE() already defined"
 #endif
 #ifdef _XUTILITY_
 #  error "Unabled to wrap _X[exception]"(); CRT versions already declared"
 #endif