Bug 1386876 - Replace all uses of DISABLE_STL_WRAPPING with a template, remove DISABLE_STL_WRAPPING. r=glandium

MozReview-Commit-ID: FMEtb5PY7iP

--HG--
extra : rebase_source : 3cdee7528846462c758e623d6bcd2e6e17dbabff

accessible/ipc/win/handler/moz.build

@@ -67,5 +67,5 @@ USE_STATIC_LIBS = True
 LIBRARY_DEFINES['UNICODE'] = True
 LIBRARY_DEFINES['_UNICODE'] = True
 LIBRARY_DEFINES['MOZ_NO_MOZALLOC'] = True
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 

build/clang-plugin/moz.build

@@ -48,7 +48,7 @@ third_party_paths.inputs = [
     '/tools/rewriting/ThirdPartyPaths.txt',
 ]
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 NO_VISIBILITY_FLAGS = True
 
 # libc++ is required to build plugins against clang on OS X.

build/clang-plugin/tests/moz.build

@@ -45,5 +45,5 @@ SOURCES += [
     'TestTrivialCtorDtor.cpp',
 ]
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 NO_VISIBILITY_FLAGS = True

build/unix/stdc++compat/moz.build

@@ -18,7 +18,7 @@ FORCE_STATIC_LIB = True
 
 NO_PGO = True
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION']
 HOST_DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']

config/external/icu/defs.mozbuild

@@ -33,7 +33,7 @@ if CONFIG['GNU_CXX']:
 elif CONFIG['OS_TARGET'] == 'WINNT':
     CXXFLAGS += ['-GR']
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 ALLOW_COMPILER_WARNINGS = True
 
 # We allow compiler warnings, but we can at least cut down on spammy

dom/media/gmp-plugin-openh264/moz.build

@@ -27,5 +27,5 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 USE_STATIC_LIBS = True
 NO_VISIBILITY_FLAGS = True
 # Don't use STL wrappers; this isn't Gecko code
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 NO_PGO = True

dom/media/gmp-plugin/moz.build

@@ -29,5 +29,5 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 USE_STATIC_LIBS = True
 NO_VISIBILITY_FLAGS = True
 # Don't use STL wrappers; this isn't Gecko code
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 NO_PGO = True

dom/plugins/ipc/hangui/moz.build

@@ -15,7 +15,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 DEFINES['NS_NO_XPCOM'] = True
 DEFINES['_HAS_EXCEPTIONS'] = 0
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 if CONFIG['GNU_CC']:
     WIN32_EXE_LDFLAGS += ['-municode']

dom/plugins/test/testplugin/testplugin.mozbuild

@@ -35,7 +35,7 @@ elif toolkit == 'windows':
 USE_STATIC_LIBS = True
 
 # Don't use STL wrappers; nptest isn't Gecko code
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 NO_PGO = True
 

ipc/mscom/oop/moz.build

@@ -30,7 +30,7 @@ LIBRARY_DEFINES['_UNICODE'] = True
 LIBRARY_DEFINES['MOZ_NO_MOZALLOC'] = True
 LIBRARY_DEFINES['MOZ_MSCOM_REMARSHAL_NO_HANDLER'] = True
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 NO_EXPAND_LIBS = True
 FORCE_STATIC_LIB = True
 

media/gmp-clearkey/0.1/moz.build

@@ -52,7 +52,7 @@ TEST_DIRS += [
     'gtest',
 ]
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 DEFINES['MOZ_NO_MOZALLOC'] = True
 
 USE_LIBS += ['psshparser']

media/psshparser/moz.build

@@ -17,7 +17,7 @@ UNIFIED_SOURCES += [
 
 Library('psshparser')
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 DEFINES['MOZ_NO_MOZALLOC'] = True
 
 TEST_DIRS += [

media/webrtc/trunk/gtest/moz.build

@@ -16,7 +16,7 @@ DEFINES['WEBRTC_INTELLIGIBILITY_ENHANCER'] = 0
 DEFINES['WEBRTC_MOZILLA_BUILD'] = 1
 
 # Hit build errors on windows with xutility otherwise
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 LOCAL_INCLUDES += [
     '../',

memory/mozalloc/moz.build

@@ -38,7 +38,7 @@ FINAL_LIBRARY = 'mozglue'
 # The strndup declaration in string.h is in an ifdef __USE_GNU section
 DEFINES['_GNU_SOURCE'] = True
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 DEFINES['IMPL_MFBT'] = True
 

memory/mozalloc/staticruntime/moz.build

@@ -26,7 +26,7 @@ SOURCES += [
 
 LOCAL_INCLUDES += ['!/xpcom']
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 DEFINES['IMPL_MFBT'] = True
 

memory/mozjemalloc/moz.build

@@ -27,4 +27,4 @@ if CONFIG['GNU_CXX']:
 if CONFIG['_MSC_VER']:
     CXXFLAGS += ['-wd4273'] # inconsistent dll linkage (bug 558163)
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()

memory/replace/dmd/moz.build

@@ -25,7 +25,7 @@ DEFINES['XPCOM_GLUE'] = True
 if CONFIG['MOZ_OPTIMIZE']:
     DEFINES['MOZ_OPTIMIZE'] = True
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     OS_LIBS += [

memory/replace/dmd/test/moz.build

@@ -16,7 +16,7 @@ else:
 
 DEFINES['MOZ_NO_MOZALLOC'] = True
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 XPCSHELL_TESTS_MANIFESTS += [
     'xpcshell.ini',

memory/replace/logalloc/logalloc.mozbuild

@@ -9,7 +9,7 @@ SOURCES += [
     'LogAlloc.cpp',
 ]
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 USE_STATIC_LIBS = True
 NO_PGO = True
 DEFINES['MOZ_NO_MOZALLOC'] = True

memory/replace/logalloc/replay/moz.build

@@ -24,4 +24,4 @@ USE_LIBS += [
 # The memory library defines this, so it's needed here too.
 DEFINES['IMPL_MFBT'] = True
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()

memory/replace/replace/moz.build

@@ -10,4 +10,4 @@ SOURCES += [
     'ReplaceMalloc.cpp',
 ]
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()

mfbt/moz.build

@@ -123,7 +123,7 @@ DEFINES['IMPL_MFBT'] = True
 
 SOURCES += mfbt_nonunified_src_cppsrcs
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 # Suppress warnings in third-party LZ4 code.
 # TODO: Remove these suppressions after bug 993267 is fixed.

mfbt/staticruntime/moz.build

@@ -16,7 +16,7 @@ SOURCES += mfbt_nonunified_src_cppsrcs
 
 USE_STATIC_LIBS = True
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 # Suppress warnings in third-party LZ4 code.
 # TODO: Remove these suppressions after bug 993267 is fixed.

mfbt/tests/moz.build

@@ -68,7 +68,7 @@ if not CONFIG['MOZ_ASAN']:
 # Since we link directly with MFBT object files, define IMPL_MFBT
 DEFINES['IMPL_MFBT'] = True
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 if CONFIG['_MSC_VER']:
   CXXFLAGS += [

mozglue/android/moz.build

@@ -52,7 +52,7 @@ LOCAL_INCLUDES += [
     '/xpcom/build',
 ]
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']

mozglue/build/moz.build

@@ -47,7 +47,7 @@ if not CONFIG['JS_STANDALONE']:
         SOURCES += [
             'WindowsDllBlocklist.cpp',
         ]
-        DISABLE_STL_WRAPPING = True
+        DisableStlWrapping()
         OS_LIBS += [
             'version',
         ]

mozglue/linker/moz.build

@@ -19,7 +19,7 @@ FINAL_LIBRARY = 'mozglue'
 
 DEFINES['IMPL_MFBT'] = True
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 TEST_DIRS += ['tests']
 

mozglue/linker/tests/moz.build

@@ -18,7 +18,7 @@ if CONFIG['ZLIB_IN_MOZGLUE']:
     USE_LIBS += [ 'modules_zlib_src' ]
 else:
     OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 PYTHON_UNITTEST_MANIFESTS += ['python.ini']
 

mozglue/tests/moz.build

@@ -4,7 +4,7 @@
 # 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/.
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 GeckoCppUnitTests([
     'ShowSSEConfig',

python/mozbuild/mozbuild/frontend/context.py

@@ -1126,11 +1126,6 @@ VARIABLES = {
            FINAL_TARGET_FILES.images['do-not-use'] += ['bar.svg']
         """),
 
-    'DISABLE_STL_WRAPPING': (bool, bool,
-        """Disable the wrappers for STL which allow it to work with C++ exceptions
-        disabled.
-        """),
-
     'FINAL_TARGET_PP_FILES': (ContextDerivedTypedHierarchicalStringList(Path), list,
         """Like ``FINAL_TARGET_FILES``, with preprocessing.
         """),
@@ -2172,6 +2167,16 @@ DEPRECATION_HINTS = {
             CPP_UNIT_TESTS += ['foo', 'bar']
         ''',
 
+    'DISABLE_STL_WRAPPING': '''
+        Please use
+
+            DisableStlWrapping()
+
+        instead of
+
+            DISABLE_STL_WRAPPING = True
+        ''',
+
     'HOST_PROGRAM': '''
         Please use
 

security/sandbox/linux/moz.build

@@ -100,7 +100,7 @@ if '-flto' in CONFIG['OS_CXXFLAGS'] and not CONFIG['CLANG_CXX']:
     LDFLAGS += ['--param lto-partitions=1']
 
 DEFINES['NS_NO_XPCOM'] = True
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 LOCAL_INCLUDES += ['/security/sandbox/linux']
 LOCAL_INCLUDES += ['/security/sandbox/chromium-shim']

security/sandbox/moz.build

@@ -165,7 +165,7 @@ elif CONFIG['OS_ARCH'] == 'WINNT':
     LOCAL_INCLUDES += ['/security/sandbox/chromium']
     LOCAL_INCLUDES += ['/nsprpub']
 
-    DISABLE_STL_WRAPPING = True
+    DisableStlWrapping()
 
     # Suppress warnings in third-party code.
     if CONFIG['_MSC_VER']:

testing/mochitest/ssltunnel/moz.build

@@ -17,7 +17,7 @@ USE_LIBS += [
 
 # This isn't XPCOM code, but it wants to use STL, so disable the STL
 # wrappers
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-shadow']

toolkit/components/ctypes/tests/moz.build

@@ -22,7 +22,7 @@ LOCAL_INCLUDES += [
 ]
 
 # Don't use STL wrappers here (i.e. wrapped <new>); they require mozalloc.
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 NO_PGO = True
 

toolkit/components/jsoncpp/src/lib_json/moz.build

@@ -27,7 +27,7 @@ elif not CONFIG['_MSC_VER']:
     ]
 
 # Required to build with exceptions enabled
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 Library('jsoncpp')
 

toolkit/components/maintenanceservice/moz.build

@@ -42,7 +42,7 @@ if CONFIG['_MSC_VER']:
 
 RCINCLUDE = 'maintenanceservice.rc'
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 OS_LIBS += [
     'comctl32',

toolkit/components/telemetry/pingsender/moz.build

@@ -35,4 +35,4 @@ else:
 
 # Don't use the STL wrappers; we don't link with -lmozalloc, and it really
 # doesn't matter here anyway.
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()

toolkit/crashreporter/breakpad-windows-libxul/moz.build

@@ -32,4 +32,4 @@ SOURCES += objs_handler
 SOURCES += objs_sender
 SOURCES += objs_client_common
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()

toolkit/crashreporter/breakpad-windows-standalone/moz.build

@@ -26,4 +26,4 @@ SOURCES += objs_client_common
 
 USE_STATIC_LIBS = True
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()

toolkit/crashreporter/client/moz.build

@@ -85,6 +85,6 @@ RCINCLUDE = 'crashreporter.rc'
 
 # Don't use the STL wrappers in the crashreporter clients; they don't
 # link with -lmozalloc, and it really doesn't matter here anyway.
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 include('/toolkit/crashreporter/crashreporter.mozbuild')

toolkit/crashreporter/google-breakpad/src/processor/moz.build

@@ -58,7 +58,7 @@ DEFINES['BPLOG_MINIMUM_SEVERITY'] = 'SEVERITY_ERROR'
 Library('breakpad_processor')
 
 # Don't use the STL wrappers in the crashreporter clients
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True

toolkit/crashreporter/injector/moz.build

@@ -24,4 +24,4 @@ if CONFIG['GNU_CC']:
 else:
     LDFLAGS += ['-ENTRY:DummyEntryPoint']
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()

toolkit/crashreporter/minidump-analyzer/moz.build

@@ -29,6 +29,6 @@ if CONFIG['OS_TARGET'] != 'Android':
 
 # Don't use the STL wrappers in the crashreporter clients; they don't
 # link with -lmozalloc, and it really doesn't matter here anyway.
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 include('/toolkit/crashreporter/crashreporter.mozbuild')

toolkit/mozapps/update/updater/updater-common.build

@@ -100,7 +100,7 @@ if have_progressui == 0:
 SOURCES += sorted(srcs)
 
 DEFINES['NS_NO_XPCOM'] = True
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 

toolkit/xre/test/win/moz.build

@@ -19,7 +19,7 @@ LOCAL_INCLUDES += [
     '/toolkit/xre',
 ]
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 USE_STATIC_LIBS = True
 
 OS_LIBS += [

tools/power/moz.build

@@ -18,4 +18,4 @@ if do_rapl:
         'rapl',
     ])
 
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()

xpcom/glue/standalone/moz.build

@@ -32,7 +32,7 @@ LOCAL_INCLUDES += [
 ]
 
 # Don't use STL wrappers here (i.e. wrapped <new>); they require mozalloc
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 # Include fallible for third party code using the xpcom glue
 USE_LIBS += [

xpcom/glue/standalone/staticruntime/moz.build

@@ -31,7 +31,7 @@ LOCAL_INCLUDES += [
 USE_STATIC_LIBS = True
 
 # Don't use STL wrappers here (i.e. wrapped <new>); they require mozalloc
-DISABLE_STL_WRAPPING = True
+DisableStlWrapping()
 
 # Include fallible for third party code using the xpcom glue
 USE_LIBS += [