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

[jdonohue]

jdonohue    00/03/23 08:45:07

  Modified:    c/src/XPath XPathEnvSupportDefault.cpp
                        XPathEnvSupportDefault.hpp
  Log:
  Fixed problem with document map
  
  Revision  Changes    Path
  1.5       +8 -4      xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp
  
  Index: XPathEnvSupportDefault.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupportDefault.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XPathEnvSupportDefault.cpp        2000/02/17 20:29:52     1.4
  +++ XPathEnvSupportDefault.cpp        2000/03/23 16:45:06     1.5
  @@ -74,8 +74,12 @@
   #include "XObjectFactory.hpp"
   #include "XPathExecutionContext.hpp"
   
  +#if !defined(XALAN_NO_NAMESPACES)
  +     using std::cerr;
  +     using std::endl;
  +#endif
  +             
   
  -
   XPathEnvSupportDefault::XPathEnvSupportDefault() :
        XPathEnvSupport(),
        m_extendedSupport(0),
  @@ -291,7 +295,7 @@
                        XPathExecutionContext&                  
executionContext,
                        const DOMString&                                
theNamespace,
                        const DOMString&                                
extensionName,
  -                     const std::vector<XObject*>&    argVec) const
  +                     const XObjectPtrVectorType&     argVec) const
   {
        if (m_extendedSupport != 0)
        {
  @@ -374,12 +378,12 @@
        }
        else
        {
  -             std::cerr << msg
  +             cerr << msg
                                  << ", at line number "
                                  << static_cast<long>(lineNo)
                                  << " at offset "
                                  << static_cast<long>(charOffset)
  -                               << std::endl;
  +                               << endl;
   
                return classification == XPathEnvSupport::eError ? true : false;
        }
  
  
  
  1.5       +9 -2      xml-xalan/c/src/XPath/XPathEnvSupportDefault.hpp
  
  Index: XPathEnvSupportDefault.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathEnvSupportDefault.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XPathEnvSupportDefault.hpp        2000/03/03 19:00:20     1.4
  +++ XPathEnvSupportDefault.hpp        2000/03/23 16:45:06     1.5
  @@ -80,6 +80,15 @@
   {
   public:
   
  +#if defined(XALAN_NO_NAMESPACES)
  +     typedef vector<XObject*> XObjectPtrVectorType;
  +     typedef map<DOMString, DOM_Document>    SourceDocsTableType;
  +#else
  +     typedef std::vector<XObject*> XObjectPtrVectorType;
  +     typedef std::map<DOMString, DOM_Document>       SourceDocsTableType;
  +#endif
  +
  +
        XPathEnvSupportDefault();
   
        virtual
  @@ -199,8 +208,6 @@
   
        // Table for storing source tree documents, which are keyed by
        // URL.
  -     typedef std::map<DOMString, DOM_Document, DOMStringEqualsFunction>      
SourceDocsTableType;
  -
        SourceDocsTableType             m_sourceDocs;
   };