Index: source/ary/inc/sci_impl.hxx
===================================================================
RCS file: /cvs/tools/autodoc/source/ary/inc/sci_impl.hxx,v
retrieving revision 1.2.18.1
diff -u -r1.2.18.1 sci_impl.hxx
--- source/ary/inc/sci_impl.hxx	27 Jun 2003 08:25:02 -0000	1.2.18.1
+++ source/ary/inc/sci_impl.hxx	27 Jun 2003 14:26:40 -0000
@@ -105,7 +105,7 @@
 //*************************     SCI_Map      **********************************//
 
 template <class KEY, class VALUE>
-class SCI_Map : public StdConstIterator< std::map<KEY,VALUE>::value_type >
+class SCI_Map : public StdConstIterator< typename std::map<KEY,VALUE>::value_type >
 {
   public:
     typedef std::map<KEY,VALUE>     source;
@@ -118,7 +118,7 @@
   private:
     // Interface StdConstIterator<>:
     virtual void        do_Advance();
-    virtual const std::map<KEY,VALUE>::value_type *
+    virtual const typename std::map<KEY,VALUE>::value_type *
                         inq_CurElement() const;
     virtual bool        inq_IsSorted() const;
 
@@ -131,11 +131,11 @@
 //*************************     SCI_MultiMap      **********************************//
 
 template <class KEY, class VALUE>
-class SCI_MultiMap : public StdConstIterator< std::multimap<KEY,VALUE>::value_type >
+class SCI_MultiMap : public StdConstIterator< typename std::multimap<KEY,VALUE>::value_type >
 {
   public:
     typedef std::multimap<KEY,VALUE>    source;
-    typedef source::const_iterator      source_iterator;
+    typedef typename source::const_iterator      source_iterator;
 
                         SCI_MultiMap(
                             const source &      i_rSource  );
@@ -147,7 +147,7 @@
   private:
     // Interface StdConstIterator<>:
     virtual void        do_Advance();
-    virtual const std::multimap<KEY,VALUE>::value_type *
+    virtual const typename std::multimap<KEY,VALUE>::value_type *
                         inq_CurElement() const;
     virtual bool        inq_IsSorted() const;
 
@@ -193,7 +193,7 @@
 {
   public:
     typedef std::map<KEY,VALUE>     source;
-    typedef source::const_iterator  source_iterator;
+    typedef typename source::const_iterator  source_iterator;
 
                         SCI_DataInMap(
                             const source &      i_rSource  );
@@ -281,7 +281,7 @@
 }
 
 template <class KEY, class VALUE>
-const std::map<KEY,VALUE>::value_type *
+const typename std::map<KEY,VALUE>::value_type *
 SCI_Map<KEY,VALUE>::inq_CurElement() const
 {
     if (itRun != itEnd)
@@ -332,7 +332,7 @@
 }
 
 template <class KEY, class VALUE>
-const std::multimap<KEY,VALUE>::value_type *
+const typename std::multimap<KEY,VALUE>::value_type *
 SCI_MultiMap<KEY,VALUE>::inq_CurElement() const
 {
     if (itRun != itEnd)
Index: source/ary/inc/store/st_iterator.hxx
===================================================================
RCS file: /cvs/tools/autodoc/source/ary/inc/store/st_iterator.hxx,v
retrieving revision 1.1
diff -u -r1.1 st_iterator.hxx
--- source/ary/inc/store/st_iterator.hxx	1 Nov 2002 17:13:57 -0000	1.1
+++ source/ary/inc/store/st_iterator.hxx	27 Jun 2003 14:26:41 -0000
@@ -308,7 +308,7 @@
 {
   public:
                         RootFilterIterator(
-                            const RootIterator<UNIT> &
+                            const typename RootIterator<UNIT> &
                                                 i_rOther )
                             :    internal::IteratorBase< UNIT, FILTER >(
                                     i_rOther.CurBlock(),
Index: source/display/toolkit/hf_funcdecl.cxx
===================================================================
RCS file: /cvs/tools/autodoc/source/display/toolkit/hf_funcdecl.cxx,v
retrieving revision 1.1
diff -u -r1.1 hf_funcdecl.cxx
--- source/display/toolkit/hf_funcdecl.cxx	1 Nov 2002 17:15:23 -0000	1.1
+++ source/display/toolkit/hf_funcdecl.cxx	27 Jun 2003 14:26:44 -0000
@@ -112,5 +112,3 @@
         << new Xml::XmlCode("( </p>\n");
     return *pNames;
 }
-
- 
\ No newline at end of file
Index: source/parser_i/inc/s2_luidl/pe_excp.hxx
===================================================================
RCS file: /cvs/tools/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx,v
retrieving revision 1.2
diff -u -r1.2 pe_excp.hxx
--- source/parser_i/inc/s2_luidl/pe_excp.hxx	1 Nov 2002 17:15:47 -0000	1.2
+++ source/parser_i/inc/s2_luidl/pe_excp.hxx	27 Jun 2003 14:26:45 -0000
@@ -267,7 +267,7 @@
 
     public: void        store_Exception(); private:
 
-	friend class PE_StructState;
+	// friend class PE_StructState;
 
 	S_Stati &	       	Stati()					{ return *pStati; }
 	S_Work &			Work()					{ return aWork; }
Index: source/parser_i/inc/s2_luidl/pe_struc.hxx
===================================================================
RCS file: /cvs/tools/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx,v
retrieving revision 1.2
diff -u -r1.2 pe_struc.hxx
--- source/parser_i/inc/s2_luidl/pe_struc.hxx	1 Nov 2002 17:15:50 -0000	1.2
+++ source/parser_i/inc/s2_luidl/pe_struc.hxx	27 Jun 2003 14:26:45 -0000
@@ -266,7 +266,7 @@
 
     public: void        store_Struct(); private:
 
-	friend class PE_StructState;
+	//friend class PE_StructState;
 
 	S_Stati &	       	Stati()					{ return *pStati; }
 	S_Work &			Work()					{ return aWork; }