mhoyt       2004/09/30 15:28:11

  Modified:    c/Projects/Win32/VC6/AllInOne AllInOne.dsp
                        AllInOneWithICU.dsp
               c/Projects/Win32/VC7.1/AllInOne AllInOne.vcproj
                        AllInOneWithICU.vcproj
               c/src/xalanc/Include XalanMap.hpp
               c/src/xalanc/XPath FunctionID.hpp NodeRefList.cpp
                        XObjectFactory.hpp XObjectFactoryDefault.hpp
                        XPathFactoryDefault.hpp
               c/src/xalanc/XSLT ExtensionFunctionHandler.hpp
                        ExtensionNSHandler.hpp FunctionCurrent.hpp
                        FunctionElementAvailable.hpp
                        FunctionFunctionAvailable.hpp FunctionKey.cpp
                        NamespacesHandler.hpp
                        StylesheetExecutionContextDefault.hpp
                        StylesheetHandler.hpp XSLTEngineImpl.hpp
               c/src/xalanc/XalanExtensions FunctionDistinct.cpp
               c/src/xalanc/XercesParserLiaison/Deprecated
                        XercesDocumentBridge.hpp
  Added:       c/src/xalanc/Include XalanSet.hpp
  Log:
  Initial XalanSet implementation and integration to support pluggable memory 
management
  
  Revision  Changes    Path
  1.60      +4 -0      xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOne.dsp
  
  Index: AllInOne.dsp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOne.dsp,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- AllInOne.dsp      17 Sep 2004 22:23:09 -0000      1.59
  +++ AllInOne.dsp      30 Sep 2004 22:28:10 -0000      1.60
  @@ -210,6 +210,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\..\..\..\src\xalanc\Include\XalanSet.hpp
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\..\..\..\src\xalanc\Include\XalanVector.hpp
   # End Source File
   # Begin Source File
  
  
  
  1.56      +12 -0     
xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
  
  Index: AllInOneWithICU.dsp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- AllInOneWithICU.dsp       13 Aug 2004 17:25:20 -0000      1.55
  +++ AllInOneWithICU.dsp       30 Sep 2004 22:28:10 -0000      1.56
  @@ -199,7 +199,19 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\..\..\..\src\xalanc\Include\XalanList.hpp
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\..\..\src\xalanc\Include\XalanMap.hpp
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\..\..\..\src\xalanc\Include\XalanObjectCache.hpp
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\..\..\..\src\xalanc\Include\XalanSet.hpp
   # End Source File
   # Begin Source File
   
  
  
  
  1.6       +3 -0      xml-xalan/c/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj
  
  Index: AllInOne.vcproj
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AllInOne.vcproj   7 Sep 2004 21:52:11 -0000       1.5
  +++ AllInOne.vcproj   30 Sep 2004 22:28:10 -0000      1.6
  @@ -269,6 +269,9 @@
                                
RelativePath="..\..\..\..\src\xalanc\Include\XalanObjectCache.hpp">
                        </File>
                        <File
  +                             
RelativePath="..\..\..\..\src\xalanc\Include\XalanSet.hpp">
  +                     </File>
  +                     <File
                                
RelativePath="..\..\..\..\src\xalanc\Include\XalanVector.hpp">
                        </File>
                        <File
  
  
  
  1.6       +3 -0      
xml-xalan/c/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj
  
  Index: AllInOneWithICU.vcproj
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AllInOneWithICU.vcproj    7 Sep 2004 21:52:11 -0000       1.5
  +++ AllInOneWithICU.vcproj    30 Sep 2004 22:28:10 -0000      1.6
  @@ -263,6 +263,9 @@
                                
RelativePath="..\..\..\..\src\xalanc\Include\XalanObjectCache.hpp">
                        </File>
                        <File
  +                             
RelativePath="..\..\..\..\src\xalanc\Include\XalanSet.hpp">
  +                     </File>
  +                     <File
                                
RelativePath="..\..\..\..\src\xalanc\Include\XalanVector.hpp">
                        </File>
                        <File
  
  
  
  1.7       +10 -2     xml-xalan/c/src/xalanc/Include/XalanMap.hpp
  
  Index: XalanMap.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/XalanMap.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XalanMap.hpp      17 Sep 2004 22:23:10 -0000      1.6
  +++ XalanMap.hpp      30 Sep 2004 22:28:10 -0000      1.7
  @@ -280,11 +280,19 @@
                }
        }
   
  -     void erase(const key_type& key)
  +     size_type erase(const key_type& key)
        {
                iterator pos = find(key);
   
  -             erase(pos);
  +        if (pos != end())
  +        {
  +                 erase(pos);
  +            return 1;
  +        }
  +        else
  +        {
  +            return 0;
  +        }
        }
   
        void clear() 
  
  
  
  1.1                  xml-xalan/c/src/xalanc/Include/XalanSet.hpp
  
  Index: XalanSet.hpp
  ===================================================================
  /*
   * Copyright 1999-2004 The Apache Software Foundation.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
   *     http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  /**
   * @author Matthew Hoyt ([EMAIL PROTECTED])
   */
  
  #if !defined(XALANSET_HEADER_GUARD_1357924680)
  #define XALANSET_HEADER_GUARD_1357924680
  
  
  
  // Base include file.  Must be first.
  #include <xalanc/Include/PlatformDefinitions.hpp>
  #include <xalanc/Include/XalanMap.hpp>
  
  
  
  #include <xercesc/framework/MemoryManager.hpp>
  
  
  
  XALAN_CPP_NAMESPACE_BEGIN
  
  
  
  template <class MapIterator>
  struct XalanSetIterator
  {
      typedef typename MapIterator::value_type::first_type  value_type;
  
      typedef value_type&     reference;
      typedef value_type*     pointer;
  
      XalanSetIterator(const MapIterator & iter) :
          m_mapIterator(iter)
      {
      }
  
      value_type& operator*() const
      {
          return m_mapIterator->first;
      };
  
      bool operator==(const XalanSetIterator& theRhs) const
      {
          return theRhs.m_mapIterator == m_mapIterator;
      }
  
      bool operator!=(const XalanSetIterator& theRhs) const
      {
          return !(theRhs == *this);
      }
  
      XalanSetIterator operator++()
      {
          ++m_mapIterator;
          return *this;
      }
  
  protected:
      MapIterator m_mapIterator;
  };
  
  
  /**
   * Xalan set implementation.
   *
   * Set relies on the XalanMap hashtable.  Users must ensure the right key
   * traits specialization is aviable to define the proper hash functor.
   */
  template <class Value>
  class XalanSet
  {
  public:
  
      typedef XERCES_CPP_NAMESPACE_QUALIFIER MemoryManager    MemoryManagerType;
  
      typedef Value     value_type;
  
      typedef size_t  size_type;
  
      typedef XalanMap<value_type, bool>  SetMapType;
  
      typedef XalanSetIterator<typename SetMapType::iterator>         iterator;
      typedef XalanSetIterator<typename SetMapType::const_iterator>   
const_iterator;
  
      XalanSet(MemoryManagerType * theMemoryManager = 0) :
          m_map(theMemoryManager)
      {
      }
  
      const_iterator begin() const
      {
          return m_map.begin();
      }
  
      const_iterator end() const
      {
          return m_map.end();
      }
  
      size_type size() const {
          return m_map.size();
      }
  
      size_type count(const value_type & value) const 
      {
          if (find(value) != end())
          {
              return 1;
          }
          else
          {
              return 0;
          }
      }
  
      const_iterator find(const value_type& value) const
      {
          return m_map.find(value);
      }
  
      void insert(const value_type& value)
      {
          m_map.insert(SetMapType::value_type(value,true));
      }
  
      size_type erase(const value_type& value)
      {
          return m_map.erase(value);
      }
  
      void clear()
      {
          m_map.clear();
      }
  
      SetMapType m_map;
  };
  
  
  
  XALAN_CPP_NAMESPACE_END
  
  #endif  // XALANSET_HEADER_GUARD_1357924680
  
  
  
  1.5       +0 -4      xml-xalan/c/src/xalanc/XPath/FunctionID.hpp
  
  Index: FunctionID.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/FunctionID.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FunctionID.hpp    26 Feb 2004 22:40:34 -0000      1.4
  +++ FunctionID.hpp    30 Sep 2004 22:28:10 -0000      1.5
  @@ -23,10 +23,6 @@
   
   
   
  -#include <set>
  -
  -
  -
   #include <xalanc/XalanDOM/XalanElement.hpp>
   #include <xalanc/XalanDOM/XalanNode.hpp>
   #include <xalanc/XalanDOM/XalanDocument.hpp>
  
  
  
  1.6       +2 -6      xml-xalan/c/src/xalanc/XPath/NodeRefList.cpp
  
  Index: NodeRefList.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/NodeRefList.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NodeRefList.cpp   26 Feb 2004 22:40:34 -0000      1.5
  +++ NodeRefList.cpp   30 Sep 2004 22:28:10 -0000      1.6
  @@ -22,7 +22,7 @@
   #include <algorithm>
   
   #if !defined(NDEBUG)
  -#include <set>
  +#include <xalanc/Include/XalanSet.hpp>
   #endif
   
   
  @@ -151,11 +151,7 @@
   bool
   NodeRefList::checkForDuplicates() const
   {
  -#if defined(XALAN_NO_STD_NAMESPACE)
  -     typedef set<const XalanNode*, less<const XalanNode*> >  NodeSetType;
  -#else
  -     typedef std::set<const XalanNode*>      NodeSetType;
  -#endif
  +     typedef XalanSet<const XalanNode*>      NodeSetType;
   
        bool    fResult = false;
   
  
  
  
  1.6       +0 -1      xml-xalan/c/src/xalanc/XPath/XObjectFactory.hpp
  
  Index: XObjectFactory.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XObjectFactory.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XObjectFactory.hpp        26 Feb 2004 22:40:34 -0000      1.5
  +++ XObjectFactory.hpp        30 Sep 2004 22:28:10 -0000      1.6
  @@ -25,7 +25,6 @@
   
   #include <algorithm>
   #include <cassert>
  -#include <set>
   
   
   
  
  
  
  1.7       +0 -4      xml-xalan/c/src/xalanc/XPath/XObjectFactoryDefault.hpp
  
  Index: XObjectFactoryDefault.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XObjectFactoryDefault.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XObjectFactoryDefault.hpp 3 Aug 2004 16:02:24 -0000       1.6
  +++ XObjectFactoryDefault.hpp 30 Sep 2004 22:28:10 -0000      1.7
  @@ -23,10 +23,6 @@
   
   
   
  -#include <set>
  -
  -
  -
   #include <xalanc/Include/XalanVector.hpp>
   
   
  
  
  
  1.5       +2 -7      xml-xalan/c/src/xalanc/XPath/XPathFactoryDefault.hpp
  
  Index: XPathFactoryDefault.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathFactoryDefault.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XPathFactoryDefault.hpp   26 Feb 2004 22:40:35 -0000      1.4
  +++ XPathFactoryDefault.hpp   30 Sep 2004 22:28:10 -0000      1.5
  @@ -23,7 +23,7 @@
   
   
   
  -#include <set>
  +#include <xalanc/Include/XalanSet.hpp>
   
   
   
  @@ -57,12 +57,7 @@
        virtual XPath*
        create();
   
  -
  -#if defined(XALAN_NO_STD_NAMESPACE)
  -     typedef set<const XPath*, less<const XPath*> >  CollectionType;
  -#else
  -     typedef std::set<const XPath*>  CollectionType;
  -#endif
  +    typedef XalanSet<const XPath*>   CollectionType;
   
        CollectionType::size_type
        getInstanceCount() const
  
  
  
  1.6       +3 -10     xml-xalan/c/src/xalanc/XSLT/ExtensionFunctionHandler.hpp
  
  Index: ExtensionFunctionHandler.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ExtensionFunctionHandler.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ExtensionFunctionHandler.hpp      31 Jul 2004 06:05:08 -0000      1.5
  +++ ExtensionFunctionHandler.hpp      30 Sep 2004 22:28:10 -0000      1.6
  @@ -24,11 +24,8 @@
   
   
   
  -#include <set>
  -
  -
  -
   #include <xalanc/Include/XalanVector.hpp>
  +#include <xalanc/Include/XalanSet.hpp>
   
   
   
  @@ -128,13 +125,9 @@
        isFunctionAvailable(const XalanDOMString&       function) const;
   
        /// Vector of pointers to function arguments
  -     typedef XalanVector<void*>                                              
        ArgVectorType;
  +     typedef XalanVector<void*>          ArgVectorType;
   
  -#if defined(XALAN_NO_STD_NAMESPACE)
  -     typedef set<XalanDOMString, less<XalanDOMString> >      StringSetType;
  -#else
  -     typedef std::set<XalanDOMString>        StringSetType;
  -#endif
  +     typedef XalanSet<XalanDOMString>        StringSetType;
   
        /**
         * Process a call to a function.
  
  
  
  1.5       +6 -7      xml-xalan/c/src/xalanc/XSLT/ExtensionNSHandler.hpp
  
  Index: ExtensionNSHandler.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ExtensionNSHandler.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExtensionNSHandler.hpp    26 Feb 2004 22:58:57 -0000      1.4
  +++ ExtensionNSHandler.hpp    30 Sep 2004 22:28:10 -0000      1.5
  @@ -27,7 +27,7 @@
   
   
   
  -#include <set>
  +#include <xalanc/Include/XalanSet.hpp>
   
   
   
  @@ -35,6 +35,10 @@
   
   
   
  +#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
  +
  +
  +
   XALAN_CPP_NAMESPACE_BEGIN
   
   
  @@ -165,12 +169,7 @@
   
   private:
   
  -#if defined(XALAN_NO_STD_NAMESPACE)
  -     typedef set<XalanDOMString,
  -                             less<XalanDOMString> >  ExtensionSetType;
  -#else
  -     typedef std::set<XalanDOMString>        ExtensionSetType;
  -#endif
  +     typedef XalanSet<XalanDOMString>        ExtensionSetType;
   
        // Extension elements of this namespace
        ExtensionSetType        m_elements;
  
  
  
  1.5       +0 -4      xml-xalan/c/src/xalanc/XSLT/FunctionCurrent.hpp
  
  Index: FunctionCurrent.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/FunctionCurrent.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FunctionCurrent.hpp       31 Jul 2004 06:05:08 -0000      1.4
  +++ FunctionCurrent.hpp       30 Sep 2004 22:28:10 -0000      1.5
  @@ -23,10 +23,6 @@
   
   
   
  -#include <set>
  -
  -
  -
   #include <xalanc/XPath/Function.hpp>
   
   
  
  
  
  1.5       +0 -4      xml-xalan/c/src/xalanc/XSLT/FunctionElementAvailable.hpp
  
  Index: FunctionElementAvailable.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/FunctionElementAvailable.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FunctionElementAvailable.hpp      31 Jul 2004 06:05:08 -0000      1.4
  +++ FunctionElementAvailable.hpp      30 Sep 2004 22:28:10 -0000      1.5
  @@ -23,10 +23,6 @@
   
   
   
  -#include <set>
  -
  -
  -
   #include <xalanc/XPath/Function.hpp>
   
   
  
  
  
  1.5       +0 -4      xml-xalan/c/src/xalanc/XSLT/FunctionFunctionAvailable.hpp
  
  Index: FunctionFunctionAvailable.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/xalanc/XSLT/FunctionFunctionAvailable.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FunctionFunctionAvailable.hpp     31 Jul 2004 06:05:08 -0000      1.4
  +++ FunctionFunctionAvailable.hpp     30 Sep 2004 22:28:10 -0000      1.5
  @@ -23,10 +23,6 @@
   
   
   
  -#include <set>
  -
  -
  -
   #include <xalanc/XPath/Function.hpp>
   
   
  
  
  
  1.6       +0 -4      xml-xalan/c/src/xalanc/XSLT/FunctionKey.cpp
  
  Index: FunctionKey.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/FunctionKey.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FunctionKey.cpp   26 Feb 2004 22:58:57 -0000      1.5
  +++ FunctionKey.cpp   30 Sep 2004 22:28:10 -0000      1.6
  @@ -17,10 +17,6 @@
   
   
   
  -#include <set>
  -
  -
  -
   #include <xalanc/XalanDOM/XalanNode.hpp>
   #include <xalanc/XalanDOM/XalanDocument.hpp>
   #include <xalanc/XalanDOM/XalanDOMString.hpp>
  
  
  
  1.10      +0 -4      xml-xalan/c/src/xalanc/XSLT/NamespacesHandler.hpp
  
  Index: NamespacesHandler.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/NamespacesHandler.hpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- NamespacesHandler.hpp     17 Sep 2004 22:23:10 -0000      1.9
  +++ NamespacesHandler.hpp     30 Sep 2004 22:28:10 -0000      1.10
  @@ -24,10 +24,6 @@
   
   
   
  -#include <set>
  -
  -
  -
   #include <xalanc/Include/XalanVector.hpp>
   #include <xalanc/Include/XalanMap.hpp>
   
  
  
  
  1.30      +2 -3      
xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
  
  Index: StylesheetExecutionContextDefault.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- StylesheetExecutionContextDefault.hpp     17 Sep 2004 22:23:10 -0000      
1.29
  +++ StylesheetExecutionContextDefault.hpp     30 Sep 2004 22:28:10 -0000      
1.30
  @@ -26,12 +26,12 @@
   #include <ctime>
   #include <deque>
   #include <memory>
  -#include <set>
   
   
   
   #include <xalanc/Include/XalanVector.hpp>
   #include <xalanc/Include/XalanMap.hpp>
  +#include <xalanc/Include/XalanSet.hpp>
   #include <xalanc/Include/XalanObjectCache.hpp>
   #include <xalanc/Include/XalanObjectStackCache.hpp>
   
  @@ -91,8 +91,7 @@
        typedef XalanVector<XalanOutputStream*>                         
OutputStreamVectorType;
   
        typedef XALAN_STD_QUALIFIER deque<const ElemTemplateElement*>   
ElementTemplateElementStackType;
  -     typedef XALAN_STD_QUALIFIER set<const KeyDeclaration*,
  -                             XALAN_STD_QUALIFIER less<const KeyDeclaration*> 
>       KeyDeclarationSetType;
  +     typedef XalanSet<const KeyDeclaration*> KeyDeclarationSetType;
        typedef XALAN_STD_QUALIFIER pair<const XPath*, ClockType>               
XPathCacheEntry;
        typedef XalanMap <XalanDOMString, XPathCacheEntry>                      
        XPathCacheMapType;
        typedef XALAN_STD_QUALIFIER deque<const ElemTemplate*>                  
CurrentTemplateStackType;
  
  
  
  1.8       +4 -8      xml-xalan/c/src/xalanc/XSLT/StylesheetHandler.hpp
  
  Index: StylesheetHandler.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetHandler.hpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StylesheetHandler.hpp     13 Aug 2004 15:49:47 -0000      1.7
  +++ StylesheetHandler.hpp     30 Sep 2004 22:28:10 -0000      1.8
  @@ -23,10 +23,7 @@
   
   
   #include <xalanc/Include/XalanVector.hpp>
  -
  -
  -
  -#include <set>
  +#include <xalanc/Include/XalanSet.hpp>
   
   
   
  @@ -76,11 +73,10 @@
        typedef XalanVector<ElemTemplateElement*>               
ElemTextLiteralStackType;
   
        typedef XalanVector<bool>                                               
BoolStackType;
  -     typedef XALAN_STD_QUALIFIER set<XalanQNameByReference,
  -                             XALAN_STD_QUALIFIER less<XalanQName> >          
QNameSetType;
  +     typedef XalanSet<XalanQNameByReference>                 QNameSetType;
        typedef XalanVector<QNameSetType>                               
QNameSetVectorType;
  -
  -     /**
  +    
  +    /**
         * Perform static initialization.  See class XMLSupportInit.
         */
        static void
  
  
  
  1.14      +0 -1      xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.hpp
  
  Index: XSLTEngineImpl.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.hpp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- XSLTEngineImpl.hpp        31 Aug 2004 14:20:27 -0000      1.13
  +++ XSLTEngineImpl.hpp        30 Sep 2004 22:28:10 -0000      1.14
  @@ -32,7 +32,6 @@
   // Standard library headers
   #include <cassert>
   #include <ctime>
  -#include <set>
   
   
   
  
  
  
  1.6       +4 -6      
xml-xalan/c/src/xalanc/XalanExtensions/FunctionDistinct.cpp
  
  Index: FunctionDistinct.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/xalanc/XalanExtensions/FunctionDistinct.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FunctionDistinct.cpp      26 Feb 2004 23:02:20 -0000      1.5
  +++ FunctionDistinct.cpp      30 Sep 2004 22:28:10 -0000      1.6
  @@ -17,7 +17,7 @@
   
   
   
  -#include <set>
  +#include <xalanc/Include/XalanSet.hpp>
   
   
   
  @@ -26,6 +26,7 @@
   
   
   #include <xalanc/PlatformSupport/XalanMessageLoader.hpp>
  +#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
   
   
   
  @@ -88,11 +89,8 @@
   
                XalanDOMString&                         theCachedString = 
theGuard.get();
   
  -#if defined(XALAN_NO_STD_NAMESPACE)
  -             typedef set<XalanDOMString, less<XalanDOMString> >      SetType;
  -#else
  -             typedef std::set<XalanDOMString>                                
        SetType;
  -#endif
  +
  +             typedef XalanSet<XalanDOMString>                                
        SetType;
   
                SetType         theStrings;
   
  
  
  
  1.5       +0 -1      
xml-xalan/c/src/xalanc/XercesParserLiaison/Deprecated/XercesDocumentBridge.hpp
  
  Index: XercesDocumentBridge.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/xalanc/XercesParserLiaison/Deprecated/XercesDocumentBridge.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XercesDocumentBridge.hpp  31 Jul 2004 06:05:12 -0000      1.4
  +++ XercesDocumentBridge.hpp  30 Sep 2004 22:28:11 -0000      1.5
  @@ -23,7 +23,6 @@
   
   
   #include <deque>
  -#include <set>
   
   
   
  
  
  

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

Reply via email to