resolve ambiguous call of overloaded ‘AppendInt(long unsigned int&)’ b=517133
authorKarl Tomlinson <karlt+@karlt.net>
Wed, 24 Feb 2010 15:40:41 -0800
changeset 38689 9a4b73f92f0e9a3f4bd7aa5be16b14c3551c3bab
parent 38688 a5ba2b43122bfd777ff1180fe5cba661538af2a5
child 38690 a29d44f196a6cd3317737dd31d4aa89084391644
push id11800
push userbsmedberg@mozilla.com
push dateThu, 25 Feb 2010 06:51:28 +0000
treeherderautoland@9a4b73f92f0e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs517133
milestone1.9.3a2pre
resolve ambiguous call of overloaded ‘AppendInt(long unsigned int&)’ b=517133
toolkit/xre/nsX11ErrorHandler.cpp
--- a/toolkit/xre/nsX11ErrorHandler.cpp
+++ b/toolkit/xre/nsX11ErrorHandler.cpp
@@ -134,17 +134,17 @@ X11Error(Display *display, XErrorEvent *
   if (age > 1) {
     // XSynchronize returns the previous "after function".  If a second
     // XSynchronize call returns the same function after an enable call then
     // synchronization must have already been enabled.
     if (XSynchronize(display, True) == XSynchronize(display, False)) {
       notes.Append("; sync");
     } else {
       notes.Append("; ");
-      notes.AppendInt(age);
+      notes.AppendInt(PRUint32(age));
       notes.Append(" requests ago");
     }
   }
 
 #ifdef MOZ_CRASHREPORTER
   switch (XRE_GetProcessType()) {
   case GeckoProcessType_Default:
     CrashReporter::AppendAppNotesToCrashReport(notes);
@@ -163,17 +163,17 @@ X11Error(Display *display, XErrorEvent *
     ; // crash report notes not supported.
   }
 #endif
 
 #ifdef DEBUG
   // The resource id is unlikely to be useful in a crash report without
   // context of other ids, but add it to the debug console output.
   notes.Append("; id=0x");
-  notes.AppendInt(event->resourceid, 16);
+  notes.AppendInt(PRUint32(event->resourceid), 16);
 #ifdef MOZ_WIDGET_GTK2
   // Actually, for requests where Xlib gets the reply synchronously,
   // MOZ_X_SYNC=1 will not be necessary, but we don't have a table to tell us
   // which requests get a synchronous reply.
   if (!PR_GetEnv("MOZ_X_SYNC")) {
     notes.Append("\nRe-running with MOZ_X_SYNC=1 in the environment may give a more helpful backtrace.");
   }
 #endif