INTEGRATION: CWS sb18 (1.3.4); FILE MERGED

2004/04/08 14:37:14 sb 1.3.4.1: #i21150# Fixed UNOIDL typedef support; initial support for polymorphic struct types.

2 files changed, 15 insertions, 7 deletions

diff --git a/idlc/inc/idlc/astinterface.hxx b/idlc/inc/idlc/astinterface.hxx
index 874a0ce1056c..f2f80c3258dd 100644
--- a/idlc/inc/idlc/astinterface.hxx
+++ b/idlc/inc/idlc/astinterface.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: astinterface.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2004-03-30 16:40:37 $
+ *  last change: $Author: obo $ $Date: 2004-06-03 15:04:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,7 +113,7 @@ public:
         { return m_bForwardedInSameFile; }
 
     void setDefined() { m_bIsDefined = true; }
-    sal_Bool isDefined()
+    sal_Bool isDefined() const
         { return m_bIsDefined; }
 
     bool usesSingleInheritance() const { return m_bSingleInheritance; }
@@ -122,7 +122,7 @@ public:
         AstInterface const * ifc, bool optional) const;
 
     void addInheritedInterface(
-        AstInterface const * ifc, bool optional,
+        AstType const * ifc, bool optional,
         rtl::OUString const & documentation);
 
     DoubleMemberDeclarations checkMemberClashes(
diff --git a/idlc/inc/idlc/fehelper.hxx b/idlc/inc/idlc/fehelper.hxx
index 7922aeca92e3..349da1efd82e 100644
--- a/idlc/inc/idlc/fehelper.hxx
+++ b/idlc/inc/idlc/fehelper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fehelper.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2004-03-30 16:43:22 $
+ *  last change: $Author: obo $ $Date: 2004-06-03 15:06:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,6 +68,8 @@
 #include <idlc/astinterface.hxx>
 #endif
 
+#include <vector>
+
 class FeDeclarator
 {
 public:
@@ -101,7 +103,9 @@ typedef ::std::list< FeDeclarator* > FeDeclList;
 class FeInheritanceHeader
 {
 public:
-    FeInheritanceHeader(NodeType nodeType, ::rtl::OString* pName, ::rtl::OString* pInherits);
+    FeInheritanceHeader(
+        NodeType nodeType, ::rtl::OString* pName, ::rtl::OString* pInherits,
+        std::vector< rtl::OString > * typeParameters);
 
     virtual ~FeInheritanceHeader()
     {
@@ -116,12 +120,16 @@ public:
     AstDeclaration* getInherits()
         { return m_pInherits; }
 
+    std::vector< rtl::OString > const & getTypeParameters() const
+    { return m_typeParameters; }
+
 private:
     void initializeInherits(::rtl::OString* pinherits);
 
     NodeType        m_nodeType;
     ::rtl::OString* m_pName;
     AstDeclaration* m_pInherits;
+    std::vector< rtl::OString > m_typeParameters;
 };
 
 #endif // _IDLC_FEHELPER_HXX_