From 01e123053b10b711e4ca4649d94ec20c7657e2a1 Mon Sep 17 00:00:00 2001
From: "waterson%netscape.com" <waterson%netscape.com>
Date: Tue, 4 Apr 2000 07:28:31 +0000
Subject: [PATCH] Fix build bustage on HP-UX. Access to protected classes only
 allowed by 'friends'.

---
 content/xul/templates/src/nsRuleNetwork.h          | 8 ++++++++
 content/xul/templates/src/nsXULTemplateBuilder.cpp | 6 ++++++
 rdf/content/src/nsRuleNetwork.h                    | 8 ++++++++
 rdf/content/src/nsXULTemplateBuilder.cpp           | 6 ++++++
 4 files changed, 28 insertions(+)

diff --git a/content/xul/templates/src/nsRuleNetwork.h b/content/xul/templates/src/nsRuleNetwork.h
index 572d7fbf611..e6b06cef168 100644
--- a/content/xul/templates/src/nsRuleNetwork.h
+++ b/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); }
 
diff --git a/content/xul/templates/src/nsXULTemplateBuilder.cpp b/content/xul/templates/src/nsXULTemplateBuilder.cpp
index 33f61bc31cc..86ec6b74c56 100644
--- a/content/xul/templates/src/nsXULTemplateBuilder.cpp
+++ b/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)); }
 
diff --git a/rdf/content/src/nsRuleNetwork.h b/rdf/content/src/nsRuleNetwork.h
index 572d7fbf611..e6b06cef168 100644
--- a/rdf/content/src/nsRuleNetwork.h
+++ b/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); }
 
diff --git a/rdf/content/src/nsXULTemplateBuilder.cpp b/rdf/content/src/nsXULTemplateBuilder.cpp
index 33f61bc31cc..86ec6b74c56 100644
--- a/rdf/content/src/nsXULTemplateBuilder.cpp
+++ b/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)); }