moz missing this pointers, default constructor

3 files changed, 83 insertions, 1 deletions

diff --git a/moz/makefile.mk b/moz/makefile.mk
index eedae25551ee..7f926e5d84c7 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -86,7 +86,8 @@ PATCH_FILES = \
     patches/libpr0n_build_fix.patch \
     patches/macosx_build_fix.patch \
     patches/nss-linux3.patch \
-
+    patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \
+    patches/clang_missing_this_pointers.patch \
 
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
diff --git a/moz/patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch b/moz/patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch
new file mode 100644
index 000000000000..c2ff5d2cf461
--- /dev/null
+++ b/moz/patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch
@@ -0,0 +1,10 @@
+--- misc/mozilla/intl/unicharutil/util/nsUnicharUtils.h	2008-08-30 00:14:52.000000000 +0100
++++ misc/build/mozilla/intl/unicharutil/util/nsUnicharUtils.h	2012-02-18 20:12:51.590109117 +0000
+@@ -64,6 +64,7 @@
+     : public nsStringComparator
+   {
+     public:
++      nsCaseInsensitiveStringComparator(){};
+       virtual int operator()( const PRUnichar*, const PRUnichar*, PRUint32 aLength ) const;
+       virtual int operator()( PRUnichar, PRUnichar ) const;
+   };
diff --git a/moz/patches/clang_missing_this_pointers.patch b/moz/patches/clang_missing_this_pointers.patch
new file mode 100644
index 000000000000..d92434fe074f
--- /dev/null
+++ b/moz/patches/clang_missing_this_pointers.patch
@@ -0,0 +1,71 @@
+--- misc/mozilla/xpcom/glue/nsBaseHashtable.h	2005-09-27 16:44:20.000000000 +0100
++++ misc/build/mozilla/xpcom/glue/nsBaseHashtable.h	2012-02-18 18:43:55.386109066 +0000
+@@ -123,7 +123,7 @@
+    */
+   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 @@
+    */
+   PRBool Put(KeyType aKey, UserDataType aData)
+   {
+-    EntryType* ent = PutEntry(aKey);
++    EntryType* ent = this->PutEntry(aKey);
+ 
+     if (!ent)
+       return PR_FALSE;
+@@ -156,7 +156,7 @@
+    * 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 20:42:37.000000000 +0100
++++ misc/build/mozilla/xpcom/glue/nsClassHashtable.h	2012-02-18 18:40:32.810109050 +0000
+@@ -98,7 +98,7 @@
+ nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
+ {
+   typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+--- misc/mozilla/xpcom/glue/nsInterfaceHashtable.h	2005-08-11 20:42:48.000000000 +0100
++++ misc/build/mozilla/xpcom/glue/nsInterfaceHashtable.h	2012-02-18 18:43:01.794109091 +0000
+@@ -111,7 +111,7 @@
+   (KeyType aKey, UserDataType* pInterface) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -139,7 +139,7 @@
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+--- misc/mozilla/xpcom/glue/nsRefPtrHashtable.h	2005-08-11 20:42:51.000000000 +0100
++++ misc/build/mozilla/xpcom/glue/nsRefPtrHashtable.h	2012-02-18 19:02:20.634109082 +0000
+@@ -140,7 +140,7 @@
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {