Bug 1108934 - Fix -Wunused-const-variable warning-as-error in non-unified build of memory/mozalloc. r=glandium
authorChris Peterson <cpeterson@mozilla.com>
Mon, 08 Dec 2014 21:26:27 -0800
changeset 219154 b7895b5e52d575b24d8e98c110b35c06ef133119
parent 219153 7525b48b6ed53f21bf75e91c226afd258e3671a1
child 219155 bb081b8d370046d873c8af544c3570da89b6671a
push id52752
push usercpeterson@mozilla.com
push dateThu, 11 Dec 2014 04:08:51 +0000
treeherdermozilla-inbound@b7895b5e52d5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1108934
milestone37.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 1108934 - Fix -Wunused-const-variable warning-as-error in non-unified build of memory/mozalloc. r=glandium
memory/mozalloc/moz.build
memory/mozalloc/mozalloc.cpp
--- a/memory/mozalloc/moz.build
+++ b/memory/mozalloc/moz.build
@@ -67,10 +67,10 @@ else:
 DEFINES['_GNU_SOURCE'] = True
 
 TEST_DIRS += ['tests']
 
 GENERATED_INCLUDES += ['/xpcom']
 
 DISABLE_STL_WRAPPING = True
 
-if CONFIG['_MSC_VER']:
+if CONFIG['CLANG_CXX'] or CONFIG['_MSC_VER']:
     FAIL_ON_WARNINGS = True
--- a/memory/mozalloc/mozalloc.cpp
+++ b/memory/mozalloc/mozalloc.cpp
@@ -216,14 +216,8 @@ moz_malloc_usable_size(void *ptr)
     return 0;
 #endif
 }
 
 size_t moz_malloc_size_of(const void *ptr)
 {
     return moz_malloc_usable_size((void *)ptr);
 }
-
-namespace mozilla {
-
-const fallible_t fallible = fallible_t();
-
-} // namespace mozilla