From f70d08c5aab8369d3249cff3ff10e6b7e4416c7f Mon Sep 17 00:00:00 2001 From: Masatoshi Kimura Date: Sun, 11 Jan 2015 11:34:52 +0900 Subject: [PATCH] Bug 1120062 - Part 1: Remove most Nullptr.h includes. r=waldo --- build/unix/elfhack/elfxx.h | 2 -- dom/bluetooth/bluez/BluetoothDBusService.cpp | 1 - dom/bluetooth2/bluez/BluetoothDBusService.cpp | 1 - dom/media/compiledtest/TestAudioBuffers.cpp | 1 - dom/media/eme/EMELog.cpp | 1 - dom/media/gmp-plugin/gmp-test-decryptor.cpp | 1 - dom/media/gmp-plugin/gmp-test-storage.cpp | 1 - dom/media/gmp/GMPLoader.cpp | 1 - dom/media/gstreamer/GStreamerLoader.cpp | 1 - dom/media/omx/mediaresourcemanager/MediaResourceHandler.cpp | 1 - dom/media/systemservices/OSXRunLoopSingleton.cpp | 1 - dom/media/systemservices/OpenSLESProvider.cpp | 1 - dom/plugins/test/testplugin/nptest.cpp | 2 -- dom/plugins/test/testplugin/nptest_gtk2.cpp | 1 - dom/plugins/test/testplugin/nptest_utils.cpp | 1 - gfx/2d/Types.h | 1 - gfx/layers/AtomicRefCountedWithFinalize.h | 1 - gfx/thebes/nsUnicodeRange.cpp | 1 - ipc/chromium/src/chrome/common/child_process_host.cc | 2 +- js/public/CharacterEncoding.h | 1 - js/public/Class.h | 1 - js/public/GCAPI.h | 2 -- js/public/HashTable.h | 1 - js/public/Id.h | 2 -- js/public/MemoryMetrics.h | 1 - js/public/ProfilingStack.h | 1 - js/public/StructuredClone.h | 2 -- js/public/TracingAPI.h | 2 -- js/public/Utility.h | 1 - js/src/asmjs/AsmJSFrameIterator.h | 2 -- js/src/jit/JSONSpewer.h | 2 -- js/src/jspubtd.h | 1 - js/xpconnect/src/XPCLog.cpp | 1 - layout/base/StackArena.h | 1 - layout/style/CounterStyleManager.h | 1 - media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp | 1 - media/gmp-clearkey/0.1/ClearKeyStorage.cpp | 1 - media/gmp-clearkey/0.1/ClearKeyUtils.cpp | 1 - media/gmp-clearkey/0.1/gmp-clearkey.cpp | 1 - media/mtransport/nriceresolverfake.h | 1 - media/mtransport/rlogringbuffer.cpp | 1 - memory/build/replace_malloc_bridge.h | 1 - memory/mozalloc/VolatileBuffer.h | 1 - memory/mozalloc/VolatileBufferAshmem.cpp | 1 - memory/mozalloc/VolatileBufferFallback.cpp | 1 - memory/mozalloc/mozalloc.h | 1 - memory/mozalloc/tests/TestVolatileBuffer.cpp | 1 - memory/replace/logalloc/FdPrintf.cpp | 1 - memory/replace/logalloc/LogAlloc.cpp | 1 - memory/replace/logalloc/replay/Replay.cpp | 1 - mfbt/AllocPolicy.h | 1 - mfbt/AlreadyAddRefed.h | 1 - mfbt/GuardObjects.h | 1 - mfbt/LinkedList.h | 1 - mfbt/Range.h | 1 - mfbt/RangedPtr.h | 1 - mfbt/RefPtr.h | 1 - mfbt/Scoped.h | 1 - mfbt/SplayTree.h | 1 - mfbt/TaggedAnonymousMemory.cpp | 1 - mfbt/ThreadLocal.h | 1 - mfbt/Vector.h | 1 - mfbt/WeakPtr.h | 1 - mfbt/decimal/moz-decimal-utils.h | 1 - mfbt/tests/TestArrayUtils.cpp | 1 - mfbt/tests/TestPoisonArea.cpp | 1 - mozglue/build/arm.cpp | 2 -- netwerk/protocol/rtsp/rtsp/ARTPConnection.cpp | 1 - netwerk/protocol/rtsp/rtsp/ARTPWriter.cpp | 1 - netwerk/protocol/rtsp/rtsp/RTSPTransmitter.h | 1 - netwerk/protocol/rtsp/rtsp/UDPPusher.cpp | 1 - parser/html/jArray.h | 3 +-- security/sandbox/linux/Sandbox.cpp | 1 - security/sandbox/linux/SandboxAssembler.cpp | 1 - security/sandbox/linux/SandboxFilter.cpp | 1 - security/sandbox/linux/common/SandboxInfo.cpp | 1 - security/sandbox/linux/glue/SandboxCrash.cpp | 1 - testing/gtest/mozilla/GTestRunner.cpp | 1 - testing/tools/screenshot/gdk-screenshot.cpp | 1 - .../finalizationwitness/FinalizationWitnessService.cpp | 1 - toolkit/crashreporter/client/crashreporter.cpp | 1 - toolkit/crashreporter/client/crashreporter_gtk_common.cpp | 1 - toolkit/crashreporter/client/crashreporter_linux.cpp | 1 - toolkit/crashreporter/client/crashreporter_win.cpp | 1 - .../library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp | 1 - toolkit/library/StaticXULComponentsStart.cpp | 1 - toolkit/mozapps/update/common/readstrings.h | 2 -- toolkit/mozapps/update/tests/TestAUSHelper.cpp | 1 - toolkit/mozapps/update/updater/archivereader.h | 1 - tools/profiler/AutoObjectMapper.cpp | 1 - tools/profiler/GeckoProfiler.h | 1 - tools/profiler/GeckoProfilerFunc.h | 1 - tools/profiler/LulCommonExt.h | 1 - tools/profiler/LulExidx.cpp | 1 - tools/profiler/LulRWLock.cpp | 1 - tools/profiler/PseudoStack.h | 1 - widget/gonk/libdisplay/BootAnimation.cpp | 1 - widget/gonk/libdisplay/GonkDisplayICS.cpp | 1 - xpcom/base/StaticPtr.h | 1 - xpcom/base/nscore.h | 4 ---- xpcom/glue/nsCOMPtr.h | 1 - 101 files changed, 2 insertions(+), 115 deletions(-) diff --git a/build/unix/elfhack/elfxx.h b/build/unix/elfhack/elfxx.h index 86b851d308e..a05b0234833 100644 --- a/build/unix/elfhack/elfxx.h +++ b/build/unix/elfhack/elfxx.h @@ -2,8 +2,6 @@ * 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/. */ -#include "mozilla/NullPtr.h" - #include #include #include diff --git a/dom/bluetooth/bluez/BluetoothDBusService.cpp b/dom/bluetooth/bluez/BluetoothDBusService.cpp index 4c092ae5a00..aa7ea4b689a 100644 --- a/dom/bluetooth/bluez/BluetoothDBusService.cpp +++ b/dom/bluetooth/bluez/BluetoothDBusService.cpp @@ -46,7 +46,6 @@ #include "mozilla/LazyIdleThread.h" #include "mozilla/Monitor.h" #include "mozilla/Mutex.h" -#include "mozilla/NullPtr.h" #include "mozilla/StaticMutex.h" #include "mozilla/unused.h" diff --git a/dom/bluetooth2/bluez/BluetoothDBusService.cpp b/dom/bluetooth2/bluez/BluetoothDBusService.cpp index 9ff22e65b0f..b4312069d82 100644 --- a/dom/bluetooth2/bluez/BluetoothDBusService.cpp +++ b/dom/bluetooth2/bluez/BluetoothDBusService.cpp @@ -45,7 +45,6 @@ #include "mozilla/ipc/RawDBusConnection.h" #include "mozilla/LazyIdleThread.h" #include "mozilla/Mutex.h" -#include "mozilla/NullPtr.h" #include "mozilla/StaticMutex.h" #include "mozilla/unused.h" diff --git a/dom/media/compiledtest/TestAudioBuffers.cpp b/dom/media/compiledtest/TestAudioBuffers.cpp index d2b2b8e804d..dd6eaa5ff6f 100644 --- a/dom/media/compiledtest/TestAudioBuffers.cpp +++ b/dom/media/compiledtest/TestAudioBuffers.cpp @@ -5,7 +5,6 @@ #include #include -#include #include "AudioBufferUtils.h" const uint32_t FRAMES = 256; diff --git a/dom/media/eme/EMELog.cpp b/dom/media/eme/EMELog.cpp index 4f79fb94ed5..a4bd498b7eb 100644 --- a/dom/media/eme/EMELog.cpp +++ b/dom/media/eme/EMELog.cpp @@ -5,7 +5,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "EMELog.h" -#include "mozilla/NullPtr.h" namespace mozilla { diff --git a/dom/media/gmp-plugin/gmp-test-decryptor.cpp b/dom/media/gmp-plugin/gmp-test-decryptor.cpp index dd2e7d06c06..41133085b55 100644 --- a/dom/media/gmp-plugin/gmp-test-decryptor.cpp +++ b/dom/media/gmp-plugin/gmp-test-decryptor.cpp @@ -17,7 +17,6 @@ #include "mozilla/Assertions.h" #include "mozilla/Attributes.h" -#include "mozilla/NullPtr.h" using namespace std; diff --git a/dom/media/gmp-plugin/gmp-test-storage.cpp b/dom/media/gmp-plugin/gmp-test-storage.cpp index 0046d40bec3..27ff44b750b 100644 --- a/dom/media/gmp-plugin/gmp-test-storage.cpp +++ b/dom/media/gmp-plugin/gmp-test-storage.cpp @@ -8,7 +8,6 @@ #include "mozilla/Assertions.h" #include "mozilla/Attributes.h" -#include "mozilla/NullPtr.h" class WriteRecordClient : public GMPRecordClient { public: diff --git a/dom/media/gmp/GMPLoader.cpp b/dom/media/gmp/GMPLoader.cpp index 7f54d437b8d..95607364644 100644 --- a/dom/media/gmp/GMPLoader.cpp +++ b/dom/media/gmp/GMPLoader.cpp @@ -7,7 +7,6 @@ #include "GMPLoader.h" #include #include "mozilla/Attributes.h" -#include "mozilla/NullPtr.h" #include "gmp-entrypoints.h" #include "prlink.h" diff --git a/dom/media/gstreamer/GStreamerLoader.cpp b/dom/media/gstreamer/GStreamerLoader.cpp index e6457e0012f..8182f689f40 100644 --- a/dom/media/gstreamer/GStreamerLoader.cpp +++ b/dom/media/gstreamer/GStreamerLoader.cpp @@ -7,7 +7,6 @@ #include #include "nsDebug.h" -#include "mozilla/NullPtr.h" #include "GStreamerLoader.h" diff --git a/dom/media/omx/mediaresourcemanager/MediaResourceHandler.cpp b/dom/media/omx/mediaresourcemanager/MediaResourceHandler.cpp index 9486a6c0733..17371a1be9e 100644 --- a/dom/media/omx/mediaresourcemanager/MediaResourceHandler.cpp +++ b/dom/media/omx/mediaresourcemanager/MediaResourceHandler.cpp @@ -5,7 +5,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "MediaResourceHandler.h" -#include "mozilla/NullPtr.h" namespace android { diff --git a/dom/media/systemservices/OSXRunLoopSingleton.cpp b/dom/media/systemservices/OSXRunLoopSingleton.cpp index 1515e1f5fa1..6211d5c127f 100644 --- a/dom/media/systemservices/OSXRunLoopSingleton.cpp +++ b/dom/media/systemservices/OSXRunLoopSingleton.cpp @@ -5,7 +5,6 @@ #include "OSXRunLoopSingleton.h" #include -#include #include #include diff --git a/dom/media/systemservices/OpenSLESProvider.cpp b/dom/media/systemservices/OpenSLESProvider.cpp index bf8fc3dde03..4b2d336d751 100644 --- a/dom/media/systemservices/OpenSLESProvider.cpp +++ b/dom/media/systemservices/OpenSLESProvider.cpp @@ -6,7 +6,6 @@ #include "OpenSLESProvider.h" #include "prlog.h" #include "nsDebug.h" -#include "mozilla/NullPtr.h" #include #include diff --git a/dom/plugins/test/testplugin/nptest.cpp b/dom/plugins/test/testplugin/nptest.cpp index 9d5c91ee604..6271f33ba98 100644 --- a/dom/plugins/test/testplugin/nptest.cpp +++ b/dom/plugins/test/testplugin/nptest.cpp @@ -58,8 +58,6 @@ #include #endif -#include "mozilla/NullPtr.h" - using namespace std; #define PLUGIN_VERSION "1.0.0.0" diff --git a/dom/plugins/test/testplugin/nptest_gtk2.cpp b/dom/plugins/test/testplugin/nptest_gtk2.cpp index 07751723287..913976a768d 100644 --- a/dom/plugins/test/testplugin/nptest_gtk2.cpp +++ b/dom/plugins/test/testplugin/nptest_gtk2.cpp @@ -45,7 +45,6 @@ #include #include -#include "mozilla/NullPtr.h" #include "mozilla/IntentionalCrash.h" using namespace std; diff --git a/dom/plugins/test/testplugin/nptest_utils.cpp b/dom/plugins/test/testplugin/nptest_utils.cpp index a8b68acbe49..d33603143a9 100644 --- a/dom/plugins/test/testplugin/nptest_utils.cpp +++ b/dom/plugins/test/testplugin/nptest_utils.cpp @@ -33,7 +33,6 @@ #include #include #include -#include "mozilla/NullPtr.h" NPUTF8* createCStringFromNPVariant(const NPVariant* variant) diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h index 2e232a60d07..2bb8fe779fa 100644 --- a/gfx/2d/Types.h +++ b/gfx/2d/Types.h @@ -6,7 +6,6 @@ #ifndef MOZILLA_GFX_TYPES_H_ #define MOZILLA_GFX_TYPES_H_ -#include "mozilla/NullPtr.h" #include "mozilla/TypedEnum.h" #include diff --git a/gfx/layers/AtomicRefCountedWithFinalize.h b/gfx/layers/AtomicRefCountedWithFinalize.h index 27795694808..82ac76b17f0 100644 --- a/gfx/layers/AtomicRefCountedWithFinalize.h +++ b/gfx/layers/AtomicRefCountedWithFinalize.h @@ -7,7 +7,6 @@ #define MOZILLA_ATOMICREFCOUNTEDWITHFINALIZE_H_ #include "mozilla/RefPtr.h" -#include "mozilla/NullPtr.h" #include "mozilla/Likely.h" #include "MainThreadUtils.h" #include "base/message_loop.h" diff --git a/gfx/thebes/nsUnicodeRange.cpp b/gfx/thebes/nsUnicodeRange.cpp index 833f6b53992..69b0cc34e76 100644 --- a/gfx/thebes/nsUnicodeRange.cpp +++ b/gfx/thebes/nsUnicodeRange.cpp @@ -5,7 +5,6 @@ #include "nsUnicodeRange.h" #include "nsGkAtoms.h" -#include "mozilla/NullPtr.h" // This table depends on unicode range definitions. // Each item's index must correspond unicode range value diff --git a/ipc/chromium/src/chrome/common/child_process_host.cc b/ipc/chromium/src/chrome/common/child_process_host.cc index 5627a5b0574..8ec59986598 100644 --- a/ipc/chromium/src/chrome/common/child_process_host.cc +++ b/ipc/chromium/src/chrome/common/child_process_host.cc @@ -53,7 +53,7 @@ ChildProcessHost::ChildProcessHost(ProcessType type) ChildProcessInfo(type), ALLOW_THIS_IN_INITIALIZER_LIST(listener_(this)), opening_channel_(false), - process_event_(NULL) { + process_event_(nullptr) { Singleton::get()->push_back(this); } diff --git a/js/public/CharacterEncoding.h b/js/public/CharacterEncoding.h index 147c77a8a2d..66657321121 100644 --- a/js/public/CharacterEncoding.h +++ b/js/public/CharacterEncoding.h @@ -7,7 +7,6 @@ #ifndef js_CharacterEncoding_h #define js_CharacterEncoding_h -#include "mozilla/NullPtr.h" #include "mozilla/Range.h" #include "js/TypeDecls.h" diff --git a/js/public/Class.h b/js/public/Class.h index fba40bcd8eb..4bb312535ff 100644 --- a/js/public/Class.h +++ b/js/public/Class.h @@ -10,7 +10,6 @@ #define js_Class_h #include "mozilla/DebugOnly.h" -#include "mozilla/NullPtr.h" #include "jstypes.h" diff --git a/js/public/GCAPI.h b/js/public/GCAPI.h index dfbb84e8f6f..988e269b17c 100644 --- a/js/public/GCAPI.h +++ b/js/public/GCAPI.h @@ -7,8 +7,6 @@ #ifndef js_GCAPI_h #define js_GCAPI_h -#include "mozilla/NullPtr.h" - #include "js/HeapAPI.h" namespace js { diff --git a/js/public/HashTable.h b/js/public/HashTable.h index bffc7ab7dee..c5659c51bf0 100644 --- a/js/public/HashTable.h +++ b/js/public/HashTable.h @@ -13,7 +13,6 @@ #include "mozilla/Casting.h" #include "mozilla/MemoryReporting.h" #include "mozilla/Move.h" -#include "mozilla/NullPtr.h" #include "mozilla/PodOperations.h" #include "mozilla/ReentrancyGuard.h" #include "mozilla/TemplateLib.h" diff --git a/js/public/Id.h b/js/public/Id.h index dd0e7234caf..7ed868ab4c7 100644 --- a/js/public/Id.h +++ b/js/public/Id.h @@ -20,8 +20,6 @@ // A jsid is not implicitly convertible to or from a jsval; JS_ValueToId or // JS_IdToValue must be used instead. -#include "mozilla/NullPtr.h" - #include "jstypes.h" #include "js/HeapAPI.h" diff --git a/js/public/MemoryMetrics.h b/js/public/MemoryMetrics.h index 1c526c1aae0..1d85696916c 100644 --- a/js/public/MemoryMetrics.h +++ b/js/public/MemoryMetrics.h @@ -11,7 +11,6 @@ // at your own risk. #include "mozilla/MemoryReporting.h" -#include "mozilla/NullPtr.h" #include "mozilla/PodOperations.h" #include diff --git a/js/public/ProfilingStack.h b/js/public/ProfilingStack.h index 99f2ef87607..da4ebaa6eb1 100644 --- a/js/public/ProfilingStack.h +++ b/js/public/ProfilingStack.h @@ -7,7 +7,6 @@ #ifndef js_ProfilingStack_h #define js_ProfilingStack_h -#include "mozilla/NullPtr.h" #include "mozilla/TypedEnum.h" #include "jsbytecode.h" diff --git a/js/public/StructuredClone.h b/js/public/StructuredClone.h index 6d8e6b392e8..0e7dd5d161b 100644 --- a/js/public/StructuredClone.h +++ b/js/public/StructuredClone.h @@ -7,8 +7,6 @@ #ifndef js_StructuredClone_h #define js_StructuredClone_h -#include "mozilla/NullPtr.h" - #include #include "jstypes.h" diff --git a/js/public/TracingAPI.h b/js/public/TracingAPI.h index b9c4861f6ca..8f1fe449110 100644 --- a/js/public/TracingAPI.h +++ b/js/public/TracingAPI.h @@ -7,8 +7,6 @@ #ifndef js_TracingAPI_h #define js_TracingAPI_h -#include "mozilla/NullPtr.h" - #include "jsalloc.h" #include "jspubtd.h" diff --git a/js/public/Utility.h b/js/public/Utility.h index e9ae6d72a0c..650587a8df1 100644 --- a/js/public/Utility.h +++ b/js/public/Utility.h @@ -11,7 +11,6 @@ #include "mozilla/Attributes.h" #include "mozilla/Compiler.h" #include "mozilla/Move.h" -#include "mozilla/NullPtr.h" #include "mozilla/Scoped.h" #include "mozilla/TemplateLib.h" #include "mozilla/UniquePtr.h" diff --git a/js/src/asmjs/AsmJSFrameIterator.h b/js/src/asmjs/AsmJSFrameIterator.h index 9df31971023..a046f5b55a1 100644 --- a/js/src/asmjs/AsmJSFrameIterator.h +++ b/js/src/asmjs/AsmJSFrameIterator.h @@ -19,8 +19,6 @@ #ifndef asmjs_AsmJSFrameIterator_h #define asmjs_AsmJSFrameIterator_h -#include "mozilla/NullPtr.h" - #include #include "js/ProfilingFrameIterator.h" diff --git a/js/src/jit/JSONSpewer.h b/js/src/jit/JSONSpewer.h index 9ab000e5d92..909d7435b4b 100644 --- a/js/src/jit/JSONSpewer.h +++ b/js/src/jit/JSONSpewer.h @@ -7,8 +7,6 @@ #ifndef jit_JSONSpewer_h #define jit_JSONSpewer_h -#include "mozilla/NullPtr.h" - #include #include "js/TypeDecls.h" diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h index fbd443007d4..8196b5f210d 100644 --- a/js/src/jspubtd.h +++ b/js/src/jspubtd.h @@ -13,7 +13,6 @@ #include "mozilla/Assertions.h" #include "mozilla/LinkedList.h" -#include "mozilla/NullPtr.h" #include "mozilla/PodOperations.h" #include "jsprototypes.h" diff --git a/js/xpconnect/src/XPCLog.cpp b/js/xpconnect/src/XPCLog.cpp index b1e8662218f..05098e43b04 100644 --- a/js/xpconnect/src/XPCLog.cpp +++ b/js/xpconnect/src/XPCLog.cpp @@ -10,7 +10,6 @@ #include "prlog.h" #include "prprf.h" #include "mozilla/mozalloc.h" -#include "mozilla/NullPtr.h" #include #include diff --git a/layout/base/StackArena.h b/layout/base/StackArena.h index c84e4617e8f..15d33202696 100644 --- a/layout/base/StackArena.h +++ b/layout/base/StackArena.h @@ -8,7 +8,6 @@ #include "nsError.h" #include "mozilla/Assertions.h" #include "mozilla/MemoryReporting.h" -#include "mozilla/NullPtr.h" namespace mozilla { diff --git a/layout/style/CounterStyleManager.h b/layout/style/CounterStyleManager.h index 770f7d81f67..ff640af24c0 100644 --- a/layout/style/CounterStyleManager.h +++ b/layout/style/CounterStyleManager.h @@ -12,7 +12,6 @@ #include "nsStyleConsts.h" -#include "mozilla/NullPtr.h" #include "mozilla/Attributes.h" #include "nsCSSValue.h" diff --git a/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp b/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp index 4e2e54d0791..d9178ed240d 100644 --- a/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp +++ b/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp @@ -12,7 +12,6 @@ #include "gmp-task-utils.h" #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" using namespace mozilla; using namespace std; diff --git a/media/gmp-clearkey/0.1/ClearKeyStorage.cpp b/media/gmp-clearkey/0.1/ClearKeyStorage.cpp index f3dfa69bfff..3c80e990505 100644 --- a/media/gmp-clearkey/0.1/ClearKeyStorage.cpp +++ b/media/gmp-clearkey/0.1/ClearKeyStorage.cpp @@ -8,7 +8,6 @@ #include "gmp-task-utils.h" #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" #include "mozilla/ArrayUtils.h" #include diff --git a/media/gmp-clearkey/0.1/ClearKeyUtils.cpp b/media/gmp-clearkey/0.1/ClearKeyUtils.cpp index c173ea6d875..43644a0465c 100644 --- a/media/gmp-clearkey/0.1/ClearKeyUtils.cpp +++ b/media/gmp-clearkey/0.1/ClearKeyUtils.cpp @@ -12,7 +12,6 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/Assertions.h" #include "mozilla/Endian.h" -#include "mozilla/NullPtr.h" #include "openaes/oaes_lib.h" using namespace std; diff --git a/media/gmp-clearkey/0.1/gmp-clearkey.cpp b/media/gmp-clearkey/0.1/gmp-clearkey.cpp index 2b4ede19731..c34d5b04656 100644 --- a/media/gmp-clearkey/0.1/gmp-clearkey.cpp +++ b/media/gmp-clearkey/0.1/gmp-clearkey.cpp @@ -10,7 +10,6 @@ #include "gmp-api/gmp-decryption.h" #include "gmp-api/gmp-platform.h" #include "mozilla/Attributes.h" -#include "mozilla/NullPtr.h" static GMPPlatformAPI* sPlatform = nullptr; GMPPlatformAPI* diff --git a/media/mtransport/nriceresolverfake.h b/media/mtransport/nriceresolverfake.h index a07c7f990f8..006e1fe4b90 100644 --- a/media/mtransport/nriceresolverfake.h +++ b/media/mtransport/nriceresolverfake.h @@ -49,7 +49,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "nspr.h" #include "prnetdb.h" -#include "mozilla/NullPtr.h" typedef struct nr_resolver_ nr_resolver; typedef struct nr_resolver_vtbl_ nr_resolver_vtbl; diff --git a/media/mtransport/rlogringbuffer.cpp b/media/mtransport/rlogringbuffer.cpp index 6bf73eced7f..d8ebf2d74f7 100644 --- a/media/mtransport/rlogringbuffer.cpp +++ b/media/mtransport/rlogringbuffer.cpp @@ -16,7 +16,6 @@ #include "mozilla/Assertions.h" #include "mozilla/Move.h" // Pinch hitting for and std::move #include "mozilla/Mutex.h" -#include "mozilla/NullPtr.h" #include extern "C" { diff --git a/memory/build/replace_malloc_bridge.h b/memory/build/replace_malloc_bridge.h index 9bce4f47255..81634392516 100644 --- a/memory/build/replace_malloc_bridge.h +++ b/memory/build/replace_malloc_bridge.h @@ -50,7 +50,6 @@ struct ReplaceMallocBridge; #ifdef __cplusplus -#include "mozilla/NullPtr.h" #include "mozilla/Types.h" #ifndef REPLACE_MALLOC_IMPL diff --git a/memory/mozalloc/VolatileBuffer.h b/memory/mozalloc/VolatileBuffer.h index bce8da30df0..54bd88c743a 100644 --- a/memory/mozalloc/VolatileBuffer.h +++ b/memory/mozalloc/VolatileBuffer.h @@ -8,7 +8,6 @@ #include "mozilla/mozalloc.h" #include "mozilla/RefPtr.h" #include "mozilla/MemoryReporting.h" -#include "mozilla/NullPtr.h" /* VolatileBuffer * diff --git a/memory/mozalloc/VolatileBufferAshmem.cpp b/memory/mozalloc/VolatileBufferAshmem.cpp index c5102ab65cc..ea34df26386 100644 --- a/memory/mozalloc/VolatileBufferAshmem.cpp +++ b/memory/mozalloc/VolatileBufferAshmem.cpp @@ -4,7 +4,6 @@ #include "VolatileBuffer.h" #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" #include "mozilla/mozalloc.h" #include diff --git a/memory/mozalloc/VolatileBufferFallback.cpp b/memory/mozalloc/VolatileBufferFallback.cpp index bcc3045af1b..9445b606739 100644 --- a/memory/mozalloc/VolatileBufferFallback.cpp +++ b/memory/mozalloc/VolatileBufferFallback.cpp @@ -4,7 +4,6 @@ #include "VolatileBuffer.h" #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" #include "mozilla/mozalloc.h" #ifdef MOZ_MEMORY diff --git a/memory/mozalloc/mozalloc.h b/memory/mozalloc/mozalloc.h index 21f0a9d3d9f..2b370ec2522 100644 --- a/memory/mozalloc/mozalloc.h +++ b/memory/mozalloc/mozalloc.h @@ -21,7 +21,6 @@ #if defined(__cplusplus) #include "mozilla/fallible.h" -#include "mozilla/NullPtr.h" #include "mozilla/TemplateLib.h" #endif #include "mozilla/Attributes.h" diff --git a/memory/mozalloc/tests/TestVolatileBuffer.cpp b/memory/mozalloc/tests/TestVolatileBuffer.cpp index 4f1661e587e..6bd3194295d 100644 --- a/memory/mozalloc/tests/TestVolatileBuffer.cpp +++ b/memory/mozalloc/tests/TestVolatileBuffer.cpp @@ -4,7 +4,6 @@ #include "TestHarness.h" #include "mozilla/VolatileBuffer.h" -#include "mozilla/NullPtr.h" #include #if defined(ANDROID) diff --git a/memory/replace/logalloc/FdPrintf.cpp b/memory/replace/logalloc/FdPrintf.cpp index 2f3cdcaa558..50d98dc40fd 100644 --- a/memory/replace/logalloc/FdPrintf.cpp +++ b/memory/replace/logalloc/FdPrintf.cpp @@ -13,7 +13,6 @@ #endif #include #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" /* Template class allowing a limited number of increments on a value */ template diff --git a/memory/replace/logalloc/LogAlloc.cpp b/memory/replace/logalloc/LogAlloc.cpp index e12f2524423..7557ee179ed 100644 --- a/memory/replace/logalloc/LogAlloc.cpp +++ b/memory/replace/logalloc/LogAlloc.cpp @@ -19,7 +19,6 @@ #include "replace_malloc.h" #include "FdPrintf.h" -#include "mozilla/NullPtr.h" #include "base/lock.h" diff --git a/memory/replace/logalloc/replay/Replay.cpp b/memory/replace/logalloc/replay/Replay.cpp index 044bd7b50a0..75db8fb1e76 100644 --- a/memory/replace/logalloc/replay/Replay.cpp +++ b/memory/replace/logalloc/replay/Replay.cpp @@ -23,7 +23,6 @@ typedef int ssize_t; #include #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" #include "FdPrintf.h" static void diff --git a/mfbt/AllocPolicy.h b/mfbt/AllocPolicy.h index 3ef64f0d4d0..71aac91d8e6 100644 --- a/mfbt/AllocPolicy.h +++ b/mfbt/AllocPolicy.h @@ -12,7 +12,6 @@ #ifndef mozilla_AllocPolicy_h #define mozilla_AllocPolicy_h -#include "mozilla/NullPtr.h" #include "mozilla/TemplateLib.h" #include diff --git a/mfbt/AlreadyAddRefed.h b/mfbt/AlreadyAddRefed.h index 6f087ab4eaf..cbbe8d79668 100644 --- a/mfbt/AlreadyAddRefed.h +++ b/mfbt/AlreadyAddRefed.h @@ -12,7 +12,6 @@ #include "mozilla/Assertions.h" #include "mozilla/Attributes.h" #include "mozilla/Move.h" -#include "mozilla/NullPtr.h" namespace mozilla { diff --git a/mfbt/GuardObjects.h b/mfbt/GuardObjects.h index 2cd950f3142..b8841564daa 100644 --- a/mfbt/GuardObjects.h +++ b/mfbt/GuardObjects.h @@ -10,7 +10,6 @@ #define mozilla_GuardObjects_h #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" #include "mozilla/Types.h" #ifdef __cplusplus diff --git a/mfbt/LinkedList.h b/mfbt/LinkedList.h index 6f30800c124..48f45f11bb8 100644 --- a/mfbt/LinkedList.h +++ b/mfbt/LinkedList.h @@ -64,7 +64,6 @@ #include "mozilla/Attributes.h" #include "mozilla/MemoryReporting.h" #include "mozilla/Move.h" -#include "mozilla/NullPtr.h" #ifdef __cplusplus diff --git a/mfbt/Range.h b/mfbt/Range.h index 814a2821ad6..0ffaf3021b1 100644 --- a/mfbt/Range.h +++ b/mfbt/Range.h @@ -7,7 +7,6 @@ #ifndef mozilla_Range_h #define mozilla_Range_h -#include "mozilla/NullPtr.h" #include "mozilla/RangedPtr.h" #include diff --git a/mfbt/RangedPtr.h b/mfbt/RangedPtr.h index 5a8b569a678..0110e842715 100644 --- a/mfbt/RangedPtr.h +++ b/mfbt/RangedPtr.h @@ -15,7 +15,6 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/Assertions.h" #include "mozilla/Attributes.h" -#include "mozilla/NullPtr.h" #include diff --git a/mfbt/RefPtr.h b/mfbt/RefPtr.h index 2a79072f1c8..b185e786539 100644 --- a/mfbt/RefPtr.h +++ b/mfbt/RefPtr.h @@ -12,7 +12,6 @@ #include "mozilla/Assertions.h" #include "mozilla/Atomics.h" #include "mozilla/Attributes.h" -#include "mozilla/NullPtr.h" #include "mozilla/RefCountType.h" #include "mozilla/TypeTraits.h" #if defined(MOZILLA_INTERNAL_API) diff --git a/mfbt/Scoped.h b/mfbt/Scoped.h index 45218d70760..fea5da21c21 100644 --- a/mfbt/Scoped.h +++ b/mfbt/Scoped.h @@ -58,7 +58,6 @@ #include "mozilla/Attributes.h" #include "mozilla/GuardObjects.h" #include "mozilla/Move.h" -#include "mozilla/NullPtr.h" namespace mozilla { diff --git a/mfbt/SplayTree.h b/mfbt/SplayTree.h index 498108b5840..45e119b7f4e 100644 --- a/mfbt/SplayTree.h +++ b/mfbt/SplayTree.h @@ -13,7 +13,6 @@ #define mozilla_SplayTree_h #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" namespace mozilla { diff --git a/mfbt/TaggedAnonymousMemory.cpp b/mfbt/TaggedAnonymousMemory.cpp index a5f97900495..a2ba9ee4b6c 100644 --- a/mfbt/TaggedAnonymousMemory.cpp +++ b/mfbt/TaggedAnonymousMemory.cpp @@ -15,7 +15,6 @@ #include #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" // These constants are copied from , because the headers // used for building may not have them even though the running kernel diff --git a/mfbt/ThreadLocal.h b/mfbt/ThreadLocal.h index 99bc5e05fe3..79da298f55d 100644 --- a/mfbt/ThreadLocal.h +++ b/mfbt/ThreadLocal.h @@ -29,7 +29,6 @@ __declspec(dllimport) unsigned long __stdcall TlsAlloc(); #include "mozilla/Assertions.h" #include "mozilla/Attributes.h" -#include "mozilla/NullPtr.h" #include "mozilla/TypeTraits.h" namespace mozilla { diff --git a/mfbt/Vector.h b/mfbt/Vector.h index 6b840b9d0ca..5d89acf0069 100644 --- a/mfbt/Vector.h +++ b/mfbt/Vector.h @@ -17,7 +17,6 @@ #include "mozilla/MathAlgorithms.h" #include "mozilla/MemoryReporting.h" #include "mozilla/Move.h" -#include "mozilla/NullPtr.h" #include "mozilla/ReentrancyGuard.h" #include "mozilla/TemplateLib.h" #include "mozilla/TypeTraits.h" diff --git a/mfbt/WeakPtr.h b/mfbt/WeakPtr.h index 40e4afcf44d..3d881e0057f 100644 --- a/mfbt/WeakPtr.h +++ b/mfbt/WeakPtr.h @@ -70,7 +70,6 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/Assertions.h" #include "mozilla/Attributes.h" -#include "mozilla/NullPtr.h" #include "mozilla/RefPtr.h" #include "mozilla/TypeTraits.h" diff --git a/mfbt/decimal/moz-decimal-utils.h b/mfbt/decimal/moz-decimal-utils.h index 230155bb6f0..a13152d5e72 100644 --- a/mfbt/decimal/moz-decimal-utils.h +++ b/mfbt/decimal/moz-decimal-utils.h @@ -14,7 +14,6 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/Casting.h" #include "mozilla/FloatingPoint.h" -#include "mozilla/NullPtr.h" #include #include diff --git a/mfbt/tests/TestArrayUtils.cpp b/mfbt/tests/TestArrayUtils.cpp index 5cfeb63e55e..6566a3cd8f0 100644 --- a/mfbt/tests/TestArrayUtils.cpp +++ b/mfbt/tests/TestArrayUtils.cpp @@ -6,7 +6,6 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" using mozilla::IsInRange; diff --git a/mfbt/tests/TestPoisonArea.cpp b/mfbt/tests/TestPoisonArea.cpp index ea4daf1528a..43a2f51c4b3 100644 --- a/mfbt/tests/TestPoisonArea.cpp +++ b/mfbt/tests/TestPoisonArea.cpp @@ -80,7 +80,6 @@ */ #include "mozilla/IntegerPrintfMacros.h" -#include "mozilla/NullPtr.h" // MAP_ANON(YMOUS) is not in any standard. Add defines as necessary. #define _GNU_SOURCE 1 diff --git a/mozglue/build/arm.cpp b/mozglue/build/arm.cpp index 6dd5e54cd27..dff466a16e8 100644 --- a/mozglue/build/arm.cpp +++ b/mozglue/build/arm.cpp @@ -4,8 +4,6 @@ /* compile-time and runtime tests for whether to use various ARM extensions */ -#include "mozilla/NullPtr.h" - #include "arm.h" #if defined(MOZILLA_ARM_HAVE_CPUID_DETECTION) diff --git a/netwerk/protocol/rtsp/rtsp/ARTPConnection.cpp b/netwerk/protocol/rtsp/rtsp/ARTPConnection.cpp index e36d071e748..e4ce82ffb18 100644 --- a/netwerk/protocol/rtsp/rtsp/ARTPConnection.cpp +++ b/netwerk/protocol/rtsp/rtsp/ARTPConnection.cpp @@ -30,7 +30,6 @@ #include -#include "mozilla/NullPtr.h" #include "mozilla/mozalloc.h" #include "nsTArray.h" #include "prnetdb.h" diff --git a/netwerk/protocol/rtsp/rtsp/ARTPWriter.cpp b/netwerk/protocol/rtsp/rtsp/ARTPWriter.cpp index 6ee688390f4..c075d90d6f5 100644 --- a/netwerk/protocol/rtsp/rtsp/ARTPWriter.cpp +++ b/netwerk/protocol/rtsp/rtsp/ARTPWriter.cpp @@ -31,7 +31,6 @@ #include #include -#include "mozilla/NullPtr.h" #include "NetworkActivityMonitor.h" using namespace mozilla::net; diff --git a/netwerk/protocol/rtsp/rtsp/RTSPTransmitter.h b/netwerk/protocol/rtsp/rtsp/RTSPTransmitter.h index 3d70e27f108..c8a9c486f8d 100644 --- a/netwerk/protocol/rtsp/rtsp/RTSPTransmitter.h +++ b/netwerk/protocol/rtsp/rtsp/RTSPTransmitter.h @@ -36,7 +36,6 @@ #include #endif -#include "mozilla/NullPtr.h" #include "prnetdb.h" #include "prerr.h" diff --git a/netwerk/protocol/rtsp/rtsp/UDPPusher.cpp b/netwerk/protocol/rtsp/rtsp/UDPPusher.cpp index a5c3eb8f4d6..1f3350894c2 100644 --- a/netwerk/protocol/rtsp/rtsp/UDPPusher.cpp +++ b/netwerk/protocol/rtsp/rtsp/UDPPusher.cpp @@ -24,7 +24,6 @@ #include #include -#include "mozilla/NullPtr.h" #include "prnetdb.h" #include "prerr.h" #include "NetworkActivityMonitor.h" diff --git a/parser/html/jArray.h b/parser/html/jArray.h index ff74c94367f..f6f78522194 100644 --- a/parser/html/jArray.h +++ b/parser/html/jArray.h @@ -25,7 +25,6 @@ #include "mozilla/Attributes.h" #include "mozilla/BinarySearch.h" -#include "mozilla/NullPtr.h" #include "nsDebug.h" template @@ -92,7 +91,7 @@ class autoJArray { arr = other.arr; length = other.length; } - void operator=(mozilla::NullptrT n) { + void operator=(decltype(nullptr) n) { // Make assigning null to an array in Java delete the buffer in C++ MOZ_ASSERT(n == nullptr); delete[] arr; diff --git a/security/sandbox/linux/Sandbox.cpp b/security/sandbox/linux/Sandbox.cpp index 0bf1b05db86..ee1a1381dfa 100644 --- a/security/sandbox/linux/Sandbox.cpp +++ b/security/sandbox/linux/Sandbox.cpp @@ -25,7 +25,6 @@ #include #include "mozilla/Atomics.h" -#include "mozilla/NullPtr.h" #include "mozilla/SandboxInfo.h" #include "mozilla/unused.h" #include "sandbox/linux/seccomp-bpf/linux_seccomp.h" diff --git a/security/sandbox/linux/SandboxAssembler.cpp b/security/sandbox/linux/SandboxAssembler.cpp index f090780a405..2bcf7626c94 100644 --- a/security/sandbox/linux/SandboxAssembler.cpp +++ b/security/sandbox/linux/SandboxAssembler.cpp @@ -9,7 +9,6 @@ #include #include -#include "mozilla/NullPtr.h" #include "sandbox/linux/seccomp-bpf/codegen.h" #include "sandbox/linux/seccomp-bpf/linux_seccomp.h" diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp index 2afcdb8f0dc..db4fa755cf1 100644 --- a/security/sandbox/linux/SandboxFilter.cpp +++ b/security/sandbox/linux/SandboxFilter.cpp @@ -17,7 +17,6 @@ #include #include "mozilla/ArrayUtils.h" -#include "mozilla/NullPtr.h" #include "sandbox/linux/seccomp-bpf/linux_seccomp.h" #include "sandbox/linux/services/linux_syscalls.h" diff --git a/security/sandbox/linux/common/SandboxInfo.cpp b/security/sandbox/linux/common/SandboxInfo.cpp index 1344478253b..6cf89982f7a 100644 --- a/security/sandbox/linux/common/SandboxInfo.cpp +++ b/security/sandbox/linux/common/SandboxInfo.cpp @@ -12,7 +12,6 @@ #include "sandbox/linux/seccomp-bpf/linux_seccomp.h" #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" namespace mozilla { diff --git a/security/sandbox/linux/glue/SandboxCrash.cpp b/security/sandbox/linux/glue/SandboxCrash.cpp index ad6818d146f..c35e35f733e 100644 --- a/security/sandbox/linux/glue/SandboxCrash.cpp +++ b/security/sandbox/linux/glue/SandboxCrash.cpp @@ -15,7 +15,6 @@ #include #include -#include "mozilla/NullPtr.h" #include "mozilla/unused.h" #include "mozilla/dom/Exceptions.h" #include "nsContentUtils.h" diff --git a/testing/gtest/mozilla/GTestRunner.cpp b/testing/gtest/mozilla/GTestRunner.cpp index 30d8d30351d..1ac97e29c55 100644 --- a/testing/gtest/mozilla/GTestRunner.cpp +++ b/testing/gtest/mozilla/GTestRunner.cpp @@ -6,7 +6,6 @@ #include "GTestRunner.h" #include "gtest/gtest.h" #include "mozilla/Attributes.h" -#include "mozilla/NullPtr.h" #ifdef MOZ_CRASHREPORTER #include "nsICrashReporter.h" #endif diff --git a/testing/tools/screenshot/gdk-screenshot.cpp b/testing/tools/screenshot/gdk-screenshot.cpp index 9e944bf2269..c42d9a3173e 100644 --- a/testing/tools/screenshot/gdk-screenshot.cpp +++ b/testing/tools/screenshot/gdk-screenshot.cpp @@ -42,7 +42,6 @@ #include #include -#include "mozilla/NullPtr.h" gboolean save_to_stdout(const gchar *buf, gsize count, GError **error, gpointer data) diff --git a/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp b/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp index 53237f0f5aa..a2ea4f90b54 100644 --- a/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp +++ b/toolkit/components/finalizationwitness/FinalizationWitnessService.cpp @@ -12,7 +12,6 @@ #include "mozilla/Scoped.h" #include "mozilla/Services.h" -#include "mozilla/NullPtr.h" #include "nsIObserverService.h" #include "nsThreadUtils.h" diff --git a/toolkit/crashreporter/client/crashreporter.cpp b/toolkit/crashreporter/client/crashreporter.cpp index 1d93a715182..8c4d522e59c 100644 --- a/toolkit/crashreporter/client/crashreporter.cpp +++ b/toolkit/crashreporter/client/crashreporter.cpp @@ -16,7 +16,6 @@ #include #include #include -#include "mozilla/NullPtr.h" using std::string; using std::istream; diff --git a/toolkit/crashreporter/client/crashreporter_gtk_common.cpp b/toolkit/crashreporter/client/crashreporter_gtk_common.cpp index 7f9c30700a1..d68fc255f33 100644 --- a/toolkit/crashreporter/client/crashreporter_gtk_common.cpp +++ b/toolkit/crashreporter/client/crashreporter_gtk_common.cpp @@ -23,7 +23,6 @@ #include #include -#include "mozilla/NullPtr.h" #include "common/linux/http_upload.h" #include "crashreporter.h" #include "crashreporter_gtk_common.h" diff --git a/toolkit/crashreporter/client/crashreporter_linux.cpp b/toolkit/crashreporter/client/crashreporter_linux.cpp index fa54bd2ab8a..c7a7bb356dc 100644 --- a/toolkit/crashreporter/client/crashreporter_linux.cpp +++ b/toolkit/crashreporter/client/crashreporter_linux.cpp @@ -11,7 +11,6 @@ #include -#include "mozilla/NullPtr.h" #include "crashreporter.h" #include "crashreporter_gtk_common.h" diff --git a/toolkit/crashreporter/client/crashreporter_win.cpp b/toolkit/crashreporter/client/crashreporter_win.cpp index b682bdb7bf1..fd864f921c4 100644 --- a/toolkit/crashreporter/client/crashreporter_win.cpp +++ b/toolkit/crashreporter/client/crashreporter_win.cpp @@ -23,7 +23,6 @@ #include "resource.h" #include "client/windows/sender/crash_report_sender.h" #include "common/windows/string_utils-inl.h" -#include "mozilla/NullPtr.h" #define CRASH_REPORTER_VALUE L"Enabled" #define SUBMIT_REPORT_VALUE L"SubmitCrashReport" diff --git a/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp b/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp index 7aa2dbac830..28fd9d484c3 100644 --- a/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp +++ b/toolkit/library/StaticXULComponentsEnd/StaticXULComponentsEnd.cpp @@ -1,5 +1,4 @@ #include "mozilla/Module.h" -#include "mozilla/NullPtr.h" /* Ensure end_kPStaticModules is at the end of the .kPStaticModules section * on Windows. Somehow, placing the object last is not enough with PGO/LTCG. */ diff --git a/toolkit/library/StaticXULComponentsStart.cpp b/toolkit/library/StaticXULComponentsStart.cpp index dc24b589459..1738aa810d5 100644 --- a/toolkit/library/StaticXULComponentsStart.cpp +++ b/toolkit/library/StaticXULComponentsStart.cpp @@ -1,4 +1,3 @@ #include "mozilla/Module.h" -#include "mozilla/NullPtr.h" NSMODULE_DEFN(start_kPStaticModules) = nullptr; diff --git a/toolkit/mozapps/update/common/readstrings.h b/toolkit/mozapps/update/common/readstrings.h index 4be79873055..cd1909fc999 100644 --- a/toolkit/mozapps/update/common/readstrings.h +++ b/toolkit/mozapps/update/common/readstrings.h @@ -7,8 +7,6 @@ #ifndef READSTRINGS_H__ #define READSTRINGS_H__ -#include "mozilla/NullPtr.h" - #define MAX_TEXT_LEN 600 #ifdef XP_WIN diff --git a/toolkit/mozapps/update/tests/TestAUSHelper.cpp b/toolkit/mozapps/update/tests/TestAUSHelper.cpp index 01aa644eeeb..cfa96f172e4 100644 --- a/toolkit/mozapps/update/tests/TestAUSHelper.cpp +++ b/toolkit/mozapps/update/tests/TestAUSHelper.cpp @@ -50,7 +50,6 @@ # define LOG_S "%s" #endif -#include "mozilla/NullPtr.h" #include #include #include diff --git a/toolkit/mozapps/update/updater/archivereader.h b/toolkit/mozapps/update/updater/archivereader.h index e3b82f452c3..a9d78aab11a 100644 --- a/toolkit/mozapps/update/updater/archivereader.h +++ b/toolkit/mozapps/update/updater/archivereader.h @@ -7,7 +7,6 @@ #ifndef ArchiveReader_h__ #define ArchiveReader_h__ -#include "mozilla/NullPtr.h" #include #include "mar.h" diff --git a/tools/profiler/AutoObjectMapper.cpp b/tools/profiler/AutoObjectMapper.cpp index 2a6b575a962..b95fa19f029 100644 --- a/tools/profiler/AutoObjectMapper.cpp +++ b/tools/profiler/AutoObjectMapper.cpp @@ -11,7 +11,6 @@ #include #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" #include "PlatformMacros.h" #include "AutoObjectMapper.h" diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h index 6408cdf6b34..35112769bcf 100644 --- a/tools/profiler/GeckoProfiler.h +++ b/tools/profiler/GeckoProfiler.h @@ -49,7 +49,6 @@ #ifndef SAMPLER_H #define SAMPLER_H -#include "mozilla/NullPtr.h" #include "js/TypeDecls.h" namespace mozilla { diff --git a/tools/profiler/GeckoProfilerFunc.h b/tools/profiler/GeckoProfilerFunc.h index bdea46fe2c5..02aed23f64e 100644 --- a/tools/profiler/GeckoProfilerFunc.h +++ b/tools/profiler/GeckoProfilerFunc.h @@ -6,7 +6,6 @@ #ifndef PROFILER_FUNCS_H #define PROFILER_FUNCS_H -#include "mozilla/NullPtr.h" #include "js/TypeDecls.h" #include "js/ProfilingStack.h" #include diff --git a/tools/profiler/LulCommonExt.h b/tools/profiler/LulCommonExt.h index 67f08d631a9..58d9ec181c2 100644 --- a/tools/profiler/LulCommonExt.h +++ b/tools/profiler/LulCommonExt.h @@ -70,7 +70,6 @@ #include // for std::ptrdiff_t #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" namespace lul { diff --git a/tools/profiler/LulExidx.cpp b/tools/profiler/LulExidx.cpp index fbe18968912..846e662a476 100644 --- a/tools/profiler/LulExidx.cpp +++ b/tools/profiler/LulExidx.cpp @@ -95,7 +95,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ // src/common/arm_ex_reader.cc #include "mozilla/Assertions.h" -#include "mozilla/NullPtr.h" #include "LulExidxExt.h" diff --git a/tools/profiler/LulRWLock.cpp b/tools/profiler/LulRWLock.cpp index 820ab2c9eee..02c7391a2bc 100644 --- a/tools/profiler/LulRWLock.cpp +++ b/tools/profiler/LulRWLock.cpp @@ -6,7 +6,6 @@ #include "mozilla/Assertions.h" #include "mozilla/DebugOnly.h" -#include "mozilla/NullPtr.h" #include "LulRWLock.h" diff --git a/tools/profiler/PseudoStack.h b/tools/profiler/PseudoStack.h index 0aa200aaf59..6beaf4efce8 100644 --- a/tools/profiler/PseudoStack.h +++ b/tools/profiler/PseudoStack.h @@ -7,7 +7,6 @@ #define PROFILER_PSEUDO_STACK_H_ #include "mozilla/ArrayUtils.h" -#include "mozilla/NullPtr.h" #include #include "js/ProfilingStack.h" #include diff --git a/widget/gonk/libdisplay/BootAnimation.cpp b/widget/gonk/libdisplay/BootAnimation.cpp index c57e441f316..90c6bee35cb 100644 --- a/widget/gonk/libdisplay/BootAnimation.cpp +++ b/widget/gonk/libdisplay/BootAnimation.cpp @@ -21,7 +21,6 @@ #include #include #include "mozilla/FileUtils.h" -#include "mozilla/NullPtr.h" #include "png.h" #include "android/log.h" diff --git a/widget/gonk/libdisplay/GonkDisplayICS.cpp b/widget/gonk/libdisplay/GonkDisplayICS.cpp index b3479bef037..5a302662fa5 100644 --- a/widget/gonk/libdisplay/GonkDisplayICS.cpp +++ b/widget/gonk/libdisplay/GonkDisplayICS.cpp @@ -24,7 +24,6 @@ #include #include "mozilla/FileUtils.h" -#include "mozilla/NullPtr.h" #include "mozilla/FileUtils.h" #include "BootAnimation.h" diff --git a/xpcom/base/StaticPtr.h b/xpcom/base/StaticPtr.h index f01590d0e3e..21109e709d1 100644 --- a/xpcom/base/StaticPtr.h +++ b/xpcom/base/StaticPtr.h @@ -9,7 +9,6 @@ #include "mozilla/Assertions.h" #include "mozilla/Attributes.h" -#include "mozilla/NullPtr.h" namespace mozilla { diff --git a/xpcom/base/nscore.h b/xpcom/base/nscore.h index 1140392dc73..bf662f91903 100644 --- a/xpcom/base/nscore.h +++ b/xpcom/base/nscore.h @@ -26,10 +26,6 @@ #include #include -#ifdef __cplusplus -# include "mozilla/NullPtr.h" -#endif - #include "mozilla/RefCountType.h" /* Core XPCOM declarations. */ diff --git a/xpcom/glue/nsCOMPtr.h b/xpcom/glue/nsCOMPtr.h index 5a61fcfd335..31e7a0233fb 100644 --- a/xpcom/glue/nsCOMPtr.h +++ b/xpcom/glue/nsCOMPtr.h @@ -24,7 +24,6 @@ #include "mozilla/Assertions.h" #include "mozilla/Attributes.h" #include "mozilla/Move.h" -#include "mozilla/NullPtr.h" #include "mozilla/TypeTraits.h" #include "nsDebug.h" // for |NS_ABORT_IF_FALSE|, |NS_ASSERTION|