neilg       2003/11/15 13:18:40

  Modified:    c/src/xercesc/framework/psvi XSModel.hpp XSObject.cpp
                        XSObject.hpp XSTypeDefinition.cpp
  Log:
  fixes for compilation under gcc
  
  Revision  Changes    Path
  1.6       +5 -2      xml-xerces/c/src/xercesc/framework/psvi/XSModel.hpp
  
  Index: XSModel.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSModel.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XSModel.hpp       14 Nov 2003 22:47:53 -0000      1.5
  +++ XSModel.hpp       15 Nov 2003 21:18:39 -0000      1.6
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.6  2003/11/15 21:18:39  neilg
  + * fixes for compilation under gcc
  + *
    * Revision 1.5  2003/11/14 22:47:53  neilg
    * fix bogus log message from previous commit...
    *
  @@ -294,7 +297,7 @@
       XSModel & operator=(const XSModel &);
   
   protected:
  -    friend XSObject;
  +    friend class XSObject;
       // -----------------------------------------------------------------------
       //  data members
       // -----------------------------------------------------------------------
  
  
  
  1.7       +4 -6      xml-xerces/c/src/xercesc/framework/psvi/XSObject.cpp
  
  Index: XSObject.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSObject.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XSObject.cpp      14 Nov 2003 22:47:53 -0000      1.6
  +++ XSObject.cpp      15 Nov 2003 21:18:39 -0000      1.7
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.7  2003/11/15 21:18:39  neilg
  + * fixes for compilation under gcc
  + *
    * Revision 1.6  2003/11/14 22:47:53  neilg
    * fix bogus log message from previous commit...
    *
  @@ -103,11 +106,6 @@
   const XMLCh *XSObject::getNamespace() 
   {
       return 0;
  -}
  -
  -inline XSConstants::COMPONENT_TYPE XSObject::getType() const
  -{
  -    return fComponentType;
   }
   
   XSNamespaceItem *XSObject::getNamespaceItem() 
  
  
  
  1.7       +9 -1      xml-xerces/c/src/xercesc/framework/psvi/XSObject.hpp
  
  Index: XSObject.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSObject.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XSObject.hpp      14 Nov 2003 22:47:53 -0000      1.6
  +++ XSObject.hpp      15 Nov 2003 21:18:39 -0000      1.7
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.7  2003/11/15 21:18:39  neilg
  + * fixes for compilation under gcc
  + *
    * Revision 1.6  2003/11/14 22:47:53  neilg
    * fix bogus log message from previous commit...
    *
  @@ -197,6 +200,11 @@
   
   };
   inline XSObject::~XSObject() {}
  +
  +inline XSConstants::COMPONENT_TYPE XSObject::getType() const
  +{
  +    return fComponentType;
  +}
   
   XERCES_CPP_NAMESPACE_END
   
  
  
  
  1.5       +4 -6      xml-xerces/c/src/xercesc/framework/psvi/XSTypeDefinition.cpp
  
  Index: XSTypeDefinition.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/psvi/XSTypeDefinition.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XSTypeDefinition.cpp      14 Nov 2003 22:47:53 -0000      1.4
  +++ XSTypeDefinition.cpp      15 Nov 2003 21:18:39 -0000      1.5
  @@ -56,6 +56,9 @@
   
   /*
    * $Log$
  + * Revision 1.5  2003/11/15 21:18:39  neilg
  + * fixes for compilation under gcc
  + *
    * Revision 1.4  2003/11/14 22:47:53  neilg
    * fix bogus log message from previous commit...
    *
  @@ -90,11 +93,6 @@
   }
   
   // XSTypeDefinition implementation
  -inline XSTypeDefinition::TYPE_CATEGORY XSTypeDefinition::getTypeCategory() const
  -{
  -    return fTypeCategory;
  -}
  -
   
   bool XSTypeDefinition::isFinal(short toTest)
   {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to