diff options
Diffstat (limited to 'xpcom')
| -rw-r--r-- | xpcom/glue/PLDHashTable.cpp | 10 | ||||
| -rw-r--r-- | xpcom/reflect/xptcall/md/unix/Makefile.in | 11 | ||||
| -rw-r--r-- | xpcom/reflect/xptcall/md/unix/moz.build | 17 | ||||
| -rw-r--r-- | xpcom/reflect/xptcall/status.html | 15 |
4 files changed, 5 insertions, 48 deletions
diff --git a/xpcom/glue/PLDHashTable.cpp b/xpcom/glue/PLDHashTable.cpp index 6152e9000..5e932ccb2 100644 --- a/xpcom/glue/PLDHashTable.cpp +++ b/xpcom/glue/PLDHashTable.cpp @@ -216,17 +216,17 @@ PLDHashTable::operator=(PLDHashTable&& aOther) return *this; } - // Destruct |this|. - this->~PLDHashTable(); - - // |mOps| and |mEntrySize| are const so we can't assign them. Instead, we - // require that they are equal. The justification for this is that they're + // |mOps| and |mEntrySize| are required to stay the same, they're // conceptually part of the type -- indeed, if PLDHashTable was a templated // type like nsTHashtable, they *would* be part of the type -- so it only // makes sense to assign in cases where they match. MOZ_RELEASE_ASSERT(mOps == aOther.mOps); MOZ_RELEASE_ASSERT(mEntrySize == aOther.mEntrySize); + // Reconstruct |this|. + this->~PLDHashTable(); + new (KnownNotNull, this) PLDHashTable(aOther.mOps, aOther.mEntrySize, 0); + // Move non-const pieces over. mHashShift = Move(aOther.mHashShift); mEntryCount = Move(aOther.mEntryCount); diff --git a/xpcom/reflect/xptcall/md/unix/Makefile.in b/xpcom/reflect/xptcall/md/unix/Makefile.in index e4cdc389b..716d79623 100644 --- a/xpcom/reflect/xptcall/md/unix/Makefile.in +++ b/xpcom/reflect/xptcall/md/unix/Makefile.in @@ -7,17 +7,6 @@ # HPPA ###################################################################### # -# HP-UX/PA32 -# -# for gas and gcc, check comment in xptcinvoke_asm_pa32.s -ifeq ($(OS_ARCH),HP-UX) -ifneq ($(CC),gcc) -# #18875 Building the CPP's (CXX) optimized causes a crash -CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS)) -endif -endif - -# # Linux/HPPA/gcc # ifeq ($(OS_ARCH),Linux) diff --git a/xpcom/reflect/xptcall/md/unix/moz.build b/xpcom/reflect/xptcall/md/unix/moz.build index 1d182bbd6..148d3bf35 100644 --- a/xpcom/reflect/xptcall/md/unix/moz.build +++ b/xpcom/reflect/xptcall/md/unix/moz.build @@ -108,23 +108,6 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['OS_ARCH'] in ('Bitrig', 'OpenBSD'): 'xptcstubs_arm_openbsd.cpp', ] -if CONFIG['OS_ARCH'] == 'HP-UX': - if CONFIG['CC'] != 'gcc': - if CONFIG['OS_TEST'] == 'ia64': - SOURCES += [ - 'xptcinvoke_asm_ipf32.s', - 'xptcinvoke_ipf32.cpp', - 'xptcstubs_asm_ipf32.s', - 'xptcstubs_ipf32.cpp', - ] - else: - SOURCES += [ - 'xptcinvoke_asm_pa32.s', - 'xptcinvoke_pa32.cpp', - 'xptcstubs_asm_pa32.s', - 'xptcstubs_pa32.cpp' - ] - if CONFIG['OS_ARCH'] == 'Linux': if CONFIG['OS_TEST'] in ('hppa', 'hppa2.0', 'hppa1.1'): if CONFIG['GNU_CXX']: diff --git a/xpcom/reflect/xptcall/status.html b/xpcom/reflect/xptcall/status.html index 65de20596..7f8e54a0c 100644 --- a/xpcom/reflect/xptcall/status.html +++ b/xpcom/reflect/xptcall/status.html @@ -255,21 +255,6 @@ The word I hear is that this is working and done <TR> <TD bgcolor="green"><font color="white"><b>Done</b></font></TD> -<TD>HP-UX</TD> -<TD> -<img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif"> -<a href="mailto:wang@cup.hp.com">Thomas Wang <wang@cup.hp.com></a><BR> -<img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif"> -<a href="mailto:mgleeson1@netscape.com">Mike Gleeson <mgleeson1@netscape.com></a> -</TD> -<TD>I hear that this code is checked in and working. Though, there is some -doubt - see bug -#<a href="http://bugzilla.mozilla.org/show_bug.cgi?id=17997">17997</a> -</TD> -</TR> - -<TR> -<TD bgcolor="green"><font color="white"><b>Done</b></font></TD> <TD>AIX PPC</TD> <TD><img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif"> <a href="mailto:jdunn@netscape.com">Jim Dunn <jdunn@netscape.com></a></TD> |