Fix build bustage on HP-UX. Access to protected classes only allowed by 'friends'.

content/xul/templates/src/nsRuleNetwork.h

@@ -223,6 +223,8 @@ public:
         List* mCurrent;
     };
 
+    friend class ConstIterator;
+
     ConstIterator First() const { return ConstIterator(mElements); }
     ConstIterator Last() const { return ConstIterator(nsnull); }
 
@@ -362,6 +364,8 @@ public:
         List* mCurrent;
     };
 
+    friend class ConstIterator;
+
     ConstIterator First() const { return ConstIterator(mBindings); }
     ConstIterator Last() const { return ConstIterator(nsnull); }
 
@@ -503,6 +507,8 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
+    friend class ConstIterator;
+
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(List*, &mHead)); }
 
@@ -543,6 +549,8 @@ public:
         friend class InstantiationSet;
     };
 
+    friend class Iterator;
+
     Iterator First() { return Iterator(mHead.mNext); }
     Iterator Last() { return Iterator(&mHead); }
 

content/xul/templates/src/nsXULTemplateBuilder.cpp

@@ -458,6 +458,8 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
+    friend class ConstIterator;
+
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(MatchList*, &mHead)); }
 
@@ -498,6 +500,8 @@ public:
         friend class MatchSet;
     };
 
+    friend class Iterator;
+
     Iterator First() { return Iterator(mHead.mNext); }
     Iterator Last() { return Iterator(&mHead); }
 
@@ -794,6 +798,8 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
+    friend class ConstIterator;
+
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(Entry*, &mHead)); }
 

rdf/content/src/nsRuleNetwork.h

@@ -223,6 +223,8 @@ public:
         List* mCurrent;
     };
 
+    friend class ConstIterator;
+
     ConstIterator First() const { return ConstIterator(mElements); }
     ConstIterator Last() const { return ConstIterator(nsnull); }
 
@@ -362,6 +364,8 @@ public:
         List* mCurrent;
     };
 
+    friend class ConstIterator;
+
     ConstIterator First() const { return ConstIterator(mBindings); }
     ConstIterator Last() const { return ConstIterator(nsnull); }
 
@@ -503,6 +507,8 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
+    friend class ConstIterator;
+
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(List*, &mHead)); }
 
@@ -543,6 +549,8 @@ public:
         friend class InstantiationSet;
     };
 
+    friend class Iterator;
+
     Iterator First() { return Iterator(mHead.mNext); }
     Iterator Last() { return Iterator(&mHead); }
 

rdf/content/src/nsXULTemplateBuilder.cpp

@@ -458,6 +458,8 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
+    friend class ConstIterator;
+
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(MatchList*, &mHead)); }
 
@@ -498,6 +500,8 @@ public:
         friend class MatchSet;
     };
 
+    friend class Iterator;
+
     Iterator First() { return Iterator(mHead.mNext); }
     Iterator Last() { return Iterator(&mHead); }
 
@@ -794,6 +798,8 @@ public:
             return mCurrent != aConstIterator.mCurrent; }
     };
 
+    friend class ConstIterator;
+
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
     ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(Entry*, &mHead)); }