cvs commit: xml-xalan/c/src/XPath ResultTreeFrag.cpp ResultTreeFrag.hpp ResultTreeFragBase.cpp ResultTreeFragBase.hpp

[dbertoni]

dbertoni    00/04/20 09:29:22

  Modified:    c/src/XPath ResultTreeFrag.cpp ResultTreeFrag.hpp
                        ResultTreeFragBase.cpp ResultTreeFragBase.hpp
  Log:
  Removed Cloneable as a base class.
  
  Revision  Changes    Path
  1.7       +1 -1      xml-xalan/c/src/XPath/ResultTreeFrag.cpp
  
  Index: ResultTreeFrag.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/ResultTreeFrag.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ResultTreeFrag.cpp        2000/04/11 14:46:10     1.6
  +++ ResultTreeFrag.cpp        2000/04/20 16:29:20     1.7
  @@ -337,7 +337,7 @@
   
   
   #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
  -Cloneable*
  +ResultTreeFragBase*
   #else
   ResultTreeFrag*
   #endif
  
  
  
  1.7       +1 -2      xml-xalan/c/src/XPath/ResultTreeFrag.hpp
  
  Index: ResultTreeFrag.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/ResultTreeFrag.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ResultTreeFrag.hpp        2000/04/11 14:46:10     1.6
  +++ ResultTreeFrag.hpp        2000/04/20 16:29:20     1.7
  @@ -206,9 +206,8 @@
        setPrefix(const XalanDOMString&         prefix);
   
   
  -     // These interfaces are inherited from Cloneable...
   #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
  -     virtual Cloneable*
  +     virtual ResultTreeFragBase*
   #else
        virtual ResultTreeFrag*
   #endif
  
  
  
  1.4       +2 -4      xml-xalan/c/src/XPath/ResultTreeFragBase.cpp
  
  Index: ResultTreeFragBase.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/ResultTreeFragBase.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ResultTreeFragBase.cpp    2000/04/11 14:46:11     1.3
  +++ ResultTreeFragBase.cpp    2000/04/20 16:29:20     1.4
  @@ -60,16 +60,14 @@
   
   
   ResultTreeFragBase::ResultTreeFragBase() :
  -     XalanDocumentFragment(),
  -     Cloneable()
  +     XalanDocumentFragment()
   {
   }
   
   
   
   ResultTreeFragBase::ResultTreeFragBase(const ResultTreeFragBase&     
theSource) :
  -     XalanDocumentFragment(theSource),
  -     Cloneable(theSource)
  +     XalanDocumentFragment(theSource)
   {
   }
   
  
  
  
  1.7       +1 -12     xml-xalan/c/src/XPath/ResultTreeFragBase.hpp
  
  Index: ResultTreeFragBase.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/ResultTreeFragBase.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ResultTreeFragBase.hpp    2000/04/11 14:46:11     1.6
  +++ ResultTreeFragBase.hpp    2000/04/20 16:29:20     1.7
  @@ -68,10 +68,6 @@
   
   
   
  -#include <PlatformSupport/Cloneable.hpp>
  -
  -
  -
   class NodeRefListBase;
   class XMLParserLiaison;
   class XalanDocument;
  @@ -81,7 +77,7 @@
   /**
    * The holder of result tree fragments.
    */
  -class XALAN_XPATH_EXPORT ResultTreeFragBase : public XalanDocumentFragment, 
public Cloneable
  +class XALAN_XPATH_EXPORT ResultTreeFragBase : public XalanDocumentFragment
   {
   public:
   
  @@ -186,12 +182,7 @@
        virtual void
        setPrefix(const XalanDOMString&         prefix) = 0;
   
  -
  -#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
  -     virtual Cloneable*
  -#else
        virtual ResultTreeFragBase*
  -#endif
        clone(bool      deep) const = 0;
   
   protected:
  @@ -199,8 +190,6 @@
        ResultTreeFragBase&
        operator=(const ResultTreeFragBase&             theRHS)
        {
  -             Cloneable::operator=(theRHS);
  -
                XalanDocumentFragment::operator=(theRHS);
   
                return *this;