Bug 677641 - Fix c++0x initializer list error found by clang; r=ted
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Thu, 11 Aug 2011 19:31:11 -0400
changeset 74293 2a1b24abac0dc26aa732099b55e81271ba135623
parent 74292 d6c7336a2e2905ccade446e982dc5deefe53d754
child 74294 5f27c21fe7f036418e32379713a47d4772ce65ae
push id20972
push usermbrubeck@mozilla.com
push dateFri, 12 Aug 2011 13:47:23 +0000
treeherdermozilla-central@c2213f8c76dd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs677641, 136181
milestone8.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 677641 - Fix c++0x initializer list error found by clang; r=ted The first field in a MDLocationDescriptor is a u_int32_t, so change this cast to the correct type. This fixes an error newer clang versions find in c++ 0x mode. See http://llvm.org/viewvc/llvm-project/?view=rev&revision=136181 for more information.
toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.h
--- a/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.h
+++ b/toolkit/crashreporter/google-breakpad/src/client/minidump_file_writer.h
@@ -146,17 +146,17 @@ class UntypedMDRVA {
   // Returns the current position or kInvalidMDRVA if allocation failed
   inline MDRVA position() const { return position_; }
 
   // Number of bytes allocated
   inline size_t size() const { return size_; }
 
   // Return size and position
   inline MDLocationDescriptor location() const {
-    MDLocationDescriptor location = { static_cast<int>(size_), position_ };
+    MDLocationDescriptor location = { static_cast<u_int32_t>(size_), position_ };
     return location;
   }
 
   // Copy |size| bytes starting at |src| into the minidump at |position|
   // Return true on success, or false on failure
   bool Copy(MDRVA position, const void *src, size_t size);
 
   // Copy |size| bytes from |src| to the current position