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