793468 - SeaMonkey build is broken after Bug 777292 (error: invalid conversion from ‘unsigned int’ to ‘nsresult’)

Status: RESOLVED FIXED

(SeaMonkey :: General, defect)

Description

[Philip Chee]

http://tinderbox.mozilla.org/showlog.cgi?log=SeaMonkey/1348308651.1348312311.21267.gz#err0

/usr/bin/ccache /tools/gcc-4.5/bin/g++ -o nsGNOMEShellService.o -c -I../../../mozilla/dist/stl_wrappers -I../../../mozilla/dist/system_wrappers -include /builds/slave/comm-cen-trunk-lnx-dbg/build/mozilla/config/gcc_hidden.h -DMOZ_APP_NAME=\"seamonkey\"  -DMOZ_GLUE_IN_PROGRAM -DMOZ_SUITE=1 -DOSTYPE=\"Linux2.6.18-53.1.19\" -DOSARCH=Linux  -I/builds/slave/comm-cen-trunk-lnx-dbg/build/suite/shell/src -I. -I../../../mozilla/dist/include -I../../../mozilla/dist/include/nsprpub  `/builds/slave/comm-cen-trunk-lnx-dbg/build/objdir/mozilla/dist/sdk/bin/nspr-config --prefix=/builds/slave/comm-cen-trunk-lnx-dbg/build/objdir/mozilla/dist --includedir=/builds/slave/comm-cen-trunk-lnx-dbg/build/objdir/mozilla/dist/include/nspr --cflags` -I/builds/slave/comm-cen-trunk-lnx-dbg/build/objdir/mozilla/dist/include/nss      -fPIC  -pedantic -Wall -Wpointer-arith -Woverloaded-virtual -Werror=return-type -Wtype-limits -Wempty-body -Wno-ctor-dtor-privacy -Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros -Wcast-align -Wno-long-long -gdwarf-2 -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -std=gnu++0x -pthread -pipe  -DDEBUG -D_DEBUG -DTRACING -gdwarf-2 -Os -freorder-blocks -finline-limit=50 -fno-omit-frame-pointer  -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gtk-unix-print-2.0     -DMOZILLA_CLIENT -include ../../../comm-config.h -MD -MF .deps/nsGNOMEShellService.pp /builds/slave/comm-cen-trunk-lnx-dbg/build/suite/shell/src/nsGNOMEShellService.cpp
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp: In member function ‘virtual nsresult nsThunderbirdProfileMigrator::Migrate(uint16_t, nsIProfileStartup*, const PRUnichar*)’:
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp:96:46: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp:97:50: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp: In member function ‘nsresult nsThunderbirdProfileMigrator::CopyPreferences(bool)’:
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp:589:52: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp:590:38: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp:593:40: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp:594:38: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp:595:42: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp:598:50: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp:599:48: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp:600:50: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
../../../../../suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp:602:46: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
NEXT ERROR make[6]: *** [nsThunderbirdProfileMigrator.o] Error 1

../../../../../suite/profile/migration/src/nsNetscapeProfileMigratorBase.cpp: In member function ‘nsresult nsNetscapeProfileMigratorBase::CopyOtherData(bool)’:
../../../../../suite/profile/migration/src/nsNetscapeProfileMigratorBase.cpp:780:59: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
../../../../../suite/profile/migration/src/nsNetscapeProfileMigratorBase.cpp:782:56: error: invalid conversion from ‘unsigned int’ to ‘nsresult’
make[6]: Leaving directory `/builds/slave/comm-cen-trunk-lnx-dbg/build/objdir/suite/profile/migration/src'
NEXT ERROR make[6]: *** [nsNetscapeProfileMigratorBase.o] Error 1

Comment 1

[[e-mail]]

Attachment: Proposed patch

I based the changes on the COPY_DATA macro in nsSuiteProfileMigratorUtils.cpp which only copies if the previous copies were successful, although in one case I thought it looked better to use early returns instead.

Comment 2

[Philip Chee]

Comment on attachment 663810 [details] [diff] [review]
Proposed patch

Build succeeds. Not sure how to test this but f+ anyway.

Comment 3

[Stefan [:stefanh]]

Neil just landed this: http://hg.mozilla.org/comm-central/rev/6b3067a3b8fc

Comment 4

[[e-mail]]

I don't think there's anything more to do here.