incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1356173 - in /incubator/ooo/trunk/main/moz: makefile.mk patches/gcc47.patch
Date Mon, 02 Jul 2012 10:46:51 GMT
Author: arielch
Date: Mon Jul  2 10:46:50 2012
New Revision: 1356173

URL: http://svn.apache.org/viewvc?rev=1356173&view=rev
Log:
i120146 - moz gcc 4.7 fixes

Added:
    incubator/ooo/trunk/main/moz/patches/gcc47.patch   (with props)
Modified:
    incubator/ooo/trunk/main/moz/makefile.mk

Modified: incubator/ooo/trunk/main/moz/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/moz/makefile.mk?rev=1356173&r1=1356172&r2=1356173&view=diff
==============================================================================
--- incubator/ooo/trunk/main/moz/makefile.mk (original)
+++ incubator/ooo/trunk/main/moz/makefile.mk Mon Jul  2 10:46:50 2012
@@ -94,6 +94,7 @@ TARFILE_ROOTDIR=mozilla
 PATCH_FILES = \
     seamonkey-source-$(MOZILLA_VERSION).patch \
     patches/gcc46.patch \
+    patches/gcc47.patch \
     patches/dtoa.patch \
     patches/respect_disable_pango.patch \
     patches/arm_build_fix.patch \

Added: incubator/ooo/trunk/main/moz/patches/gcc47.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/moz/patches/gcc47.patch?rev=1356173&view=auto
==============================================================================
--- incubator/ooo/trunk/main/moz/patches/gcc47.patch (added)
+++ incubator/ooo/trunk/main/moz/patches/gcc47.patch Mon Jul  2 10:46:50 2012
@@ -0,0 +1,107 @@
+--- misc/mozilla/xpcom/glue/nsBaseHashtable.h	2005-09-27 12:44:20.000000000 -0300
++++ misc/build/mozilla/xpcom/glue/nsBaseHashtable.h	2012-07-02 07:27:03.872079682 -0300
+@@ -123,7 +123,7 @@ public:
+    */
+   PRBool Get(KeyType aKey, UserDataType* pData) const
+   {
+-    EntryType* ent = GetEntry(aKey);
++    EntryType* ent = this->GetEntry(aKey);
+ 
+     if (!ent)
+       return PR_FALSE;
+@@ -142,7 +142,7 @@ public:
+    */
+   PRBool Put(KeyType aKey, UserDataType aData)
+   {
+-    EntryType* ent = PutEntry(aKey);
++    EntryType* ent = this->PutEntry(aKey);
+ 
+     if (!ent)
+       return PR_FALSE;
+@@ -156,7 +156,7 @@ public:
+    * remove the data for the associated key
+    * @param aKey the key to remove from the hashtable
+    */
+-  void Remove(KeyType aKey) { RemoveEntry(aKey); }
++  void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
+ 
+   /**
+    * function type provided by the application for enumeration.
+--- misc/mozilla/xpcom/glue/nsClassHashtable.h	2005-08-11 16:42:37.000000000 -0300
++++ misc/build/mozilla/xpcom/glue/nsClassHashtable.h	2012-07-02 07:27:24.649081115 -0300
+@@ -98,7 +98,7 @@ PRBool
+ nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
+ {
+   typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -126,7 +126,7 @@ nsClassHashtableMT<KeyClass,T>::Get(KeyT
+   PR_Lock(this->mLock);
+ 
+   typename nsBaseHashtableMT<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+--- misc/mozilla/xpcom/glue/nsInterfaceHashtable.h	2005-08-11 16:42:48.000000000 -0300
++++ misc/build/mozilla/xpcom/glue/nsInterfaceHashtable.h	2012-07-02 07:26:54.023079003 -0300
+@@ -111,7 +111,7 @@ nsInterfaceHashtable<KeyClass,Interface>
+   (KeyType aKey, UserDataType* pInterface) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType*
ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -139,7 +139,7 @@ nsInterfaceHashtable<KeyClass,Interface>
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType*
ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -167,7 +167,7 @@ nsInterfaceHashtableMT<KeyClass,Interfac
+   PR_Lock(this->mLock);
+ 
+   typename nsBaseHashtableMT<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType*
ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+--- misc/mozilla/xpcom/glue/nsRefPtrHashtable.h	2005-08-11 16:42:51.000000000 -0300
++++ misc/build/mozilla/xpcom/glue/nsRefPtrHashtable.h	2012-07-02 07:27:04.145079700 -0300
+@@ -112,7 +112,7 @@ nsRefPtrHashtable<KeyClass,RefPtr>::Get
+   (KeyType aKey, UserDataType* pRefPtr) const
+ {
+   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType*
ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -140,7 +140,7 @@ nsRefPtrHashtable<KeyClass,RefPtr>::GetW
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType*
ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -168,7 +168,7 @@ nsRefPtrHashtableMT<KeyClass,RefPtr>::Ge
+   PR_Lock(this->mLock);
+ 
+   typename nsBaseHashtableMT<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType*
ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {

Propchange: incubator/ooo/trunk/main/moz/patches/gcc47.patch
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message