Bug 1465585: Disable stl wrapping in some places under toolkit/mozapps/update. r=glandium
authorEmilio Cobos Álvarez <emilio@crisal.io>
Thu, 31 May 2018 17:09:47 +0200
changeset 475078 73a2ea4007a0fe8706801a1a73011fa4a5c27a7f
parent 475043 a6d7c670b2f564c8c1c0fee8652dde0ec308ab10
child 475079 6979fe6c19b1c304bdfbc5b23f687c14b46f6c35
push id9374
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:43:20 +0000
treeherdermozilla-beta@160e085dfb0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1465585
milestone62.0a1
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
Bug 1465585: Disable stl wrapping in some places under toolkit/mozapps/update. r=glandium This is disabled already in updater-common.build and similar places, so that they can use UniquePtr and include <new>. These files were getting around it because they didn't include the stl at all, but now they include <utility> transitively for std::move. MozReview-Commit-ID: IaU9mRbbCAk
toolkit/mozapps/update/common/moz.build
toolkit/mozapps/update/tests/moz.build
--- a/toolkit/mozapps/update/common/moz.build
+++ b/toolkit/mozapps/update/common/moz.build
@@ -23,16 +23,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
             'registrycertificates.h',
         ]
 
 Library('updatecommon')
 
 DEFINES['NS_NO_XPCOM'] = True
 USE_STATIC_LIBS = True
 
+DisableStlWrapping()
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     SOURCES += [
         'pathhash.cpp',
         'uachelper.cpp',
         'updatehelper.cpp',
     ]
     if CONFIG['MOZ_MAINTENANCE_SERVICE']:
         SOURCES += [
--- a/toolkit/mozapps/update/tests/moz.build
+++ b/toolkit/mozapps/update/tests/moz.build
@@ -41,16 +41,18 @@ USE_LIBS += [
 ]
 
 for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_DISPLAYNAME',
             'MOZ_APP_VENDOR', 'BIN_SUFFIX', 'MOZ_DEBUG'):
     DEFINES[var] = CONFIG[var]
 
 DEFINES['NS_NO_XPCOM'] = True
 
+DisableStlWrapping()
+
 if CONFIG['MOZ_MAINTENANCE_SERVICE']:
     DEFINES['MOZ_MAINTENANCE_SERVICE'] = CONFIG['MOZ_MAINTENANCE_SERVICE']
 
 # For debugging purposes only
 #DEFINES['DISABLE_UPDATER_AUTHENTICODE_CHECK'] = True
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     DEFINES['UNICODE'] = True