cvs commit: xml-xalan/c/src/XalanSourceTree FormatterToSourceTree.hpp XalanSourceTreeContentHandler.hpp XalanSourceTreeDocument.hpp XalanSourceTreeParserLiaison.cpp XalanSourceTreeParserLiaison.hpp

[dbertoni]

dbertoni    2002/11/22 09:23:29

  Modified:    c/src/XalanSourceTree FormatterToSourceTree.hpp
                        XalanSourceTreeContentHandler.hpp
                        XalanSourceTreeDocument.hpp
                        XalanSourceTreeParserLiaison.cpp
                        XalanSourceTreeParserLiaison.hpp
  Log:
  Updated #ifdefs.
  
  Revision  Changes    Path
  1.12      +1 -1      xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.hpp
  
  Index: FormatterToSourceTree.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.hpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- FormatterToSourceTree.hpp 22 Nov 2002 02:18:32 -0000      1.11
  +++ FormatterToSourceTree.hpp 22 Nov 2002 17:23:29 -0000      1.12
  @@ -97,7 +97,7 @@
   {
   public:
   
  -#if defined(XALAN_NO_NAMESPACES)
  +#if defined(XALAN_NO_STD_NAMESPACE)
        typedef vector<XalanSourceTreeElement*>                 
ElementStackType;
        typedef vector<XalanNode*>                                              
LastChildStackType;
   #else
  
  
  
  1.12      +1 -1      
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.hpp
  
  Index: XalanSourceTreeContentHandler.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.hpp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XalanSourceTreeContentHandler.hpp 22 Nov 2002 16:25:23 -0000      1.11
  +++ XalanSourceTreeContentHandler.hpp 22 Nov 2002 17:23:29 -0000      1.12
  @@ -113,7 +113,7 @@
   {
   public:
   
  -#if defined(XALAN_NO_NAMESPACES)
  +#if defined(XALAN_NO_STD_NAMESPACE)
        typedef vector<XalanSourceTreeElement*>                 
ElementStackType;
        typedef vector<XalanNode*>                                              
LastChildStackType;
   #else
  
  
  
  1.20      +1 -1      
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.hpp
  
  Index: XalanSourceTreeDocument.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.hpp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- XalanSourceTreeDocument.hpp       22 Nov 2002 02:18:32 -0000      1.19
  +++ XalanSourceTreeDocument.hpp       22 Nov 2002 17:23:29 -0000      1.20
  @@ -118,7 +118,7 @@
        typedef XalanSourceTreeElement::AttributesCountType             
AttributesCountType;
        typedef XalanArrayAllocator<XalanSourceTreeAttr*>               
AttributesArrayAllocatorType;
   
  -#if defined (XALAN_NO_NAMESPACES)
  +#if defined(XALAN_NO_STD_NAMESPACE)
        typedef map<
                                const XalanDOMChar*,
                                XalanSourceTreeElement*,
  
  
  
  1.32      +5 -10     
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp
  
  Index: XalanSourceTreeParserLiaison.cpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- XalanSourceTreeParserLiaison.cpp  22 Nov 2002 02:18:32 -0000      1.31
  +++ XalanSourceTreeParserLiaison.cpp  22 Nov 2002 17:23:29 -0000      1.32
  @@ -515,10 +515,6 @@
   XalanSourceTreeParserLiaison::~XalanSourceTreeParserLiaison()
   {
        reset();
  -
  -#if !defined(XALAN_NO_NAMESPACES)
  -     using std::for_each;
  -#endif
   }
   
   
  @@ -526,14 +522,13 @@
   void
   XalanSourceTreeParserLiaison::reset()
   {
  -#if !defined(XALAN_NO_NAMESPACES)
  -     using std::for_each;
  -#endif
  +     XALAN_USING_STD(for_each)
   
        // Delete any documents.
  -     for_each(m_documentMap.begin(),
  -                      m_documentMap.end(),
  -                      makeMapValueDeleteFunctor(m_documentMap));
  +     for_each(
  +                     m_documentMap.begin(),
  +                     m_documentMap.end(),
  +                     makeMapValueDeleteFunctor(m_documentMap));
   
        m_documentMap.clear();
   
  
  
  
  1.22      +1 -1      
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.hpp
  
  Index: XalanSourceTreeParserLiaison.hpp
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.hpp,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- XalanSourceTreeParserLiaison.hpp  22 Nov 2002 02:18:32 -0000      1.21
  +++ XalanSourceTreeParserLiaison.hpp  22 Nov 2002 17:23:29 -0000      1.22
  @@ -386,7 +386,7 @@
        XalanSourceTreeDocument*
        createXalanSourceTreeDocument();
   
  -#if defined(XALAN_NO_NAMESPACES)
  +#if defined(XALAN_NO_STD_NAMESPACE)
        typedef map<const XalanDocument*,
                                XalanSourceTreeDocument*,
                                less<const XalanDocument*> >    DocumentMapType;
  
  
  

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