cvs commit: xml-xalan/c/src/xalanc/XSLT XSLTEngineImpl.cpp

[dbertoni]

dbertoni    2004/12/27 18:27:53

  Modified:    c/src/xalanc/XSLT XSLTEngineImpl.cpp
  Log:
  Fixes for GCC 3.4.
  
  Revision  Changes    Path
  1.26      +16 -5     xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp
  
  Index: XSLTEngineImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- XSLTEngineImpl.cpp        16 Nov 2004 00:07:56 -0000      1.25
  +++ XSLTEngineImpl.cpp        28 Dec 2004 02:27:53 -0000      1.26
  @@ -3117,7 +3117,9 @@
   {
        const XalanQNameByValue         qname(theName, 0, m_xpathEnvSupport, 
m_domSupport, getMemoryManager());
   
  -     
m_topLevelParams.push_back(ParamVectorType::value_type(getMemoryManager(), 
qname, expression));
  +    const ParamVectorType::value_type   temp(getMemoryManager(), qname, 
expression);
  +
  +     m_topLevelParams.push_back(temp);
   }
   
   
  @@ -3129,7 +3131,9 @@
   {
        const XalanQNameByValue         qname(theName, 0, m_xpathEnvSupport, 
m_domSupport,  getMemoryManager());
   
  -     
m_topLevelParams.push_back(ParamVectorType::value_type(getMemoryManager(), 
qname, theValue));
  +    const ParamVectorType::value_type   temp(getMemoryManager(), qname, 
theValue);
  +
  +     m_topLevelParams.push_back(temp);
   }
   
   
  @@ -3171,7 +3175,7 @@
                        const XalanNode&        theNode,
                        bool                            isCDATA)
   {
  -    XalanDOMString theBuffer( getMemoryManager());
  +    XalanDOMString  theBuffer(getMemoryManager());
       
       DOMServices::getNodeData(theNode, theBuffer);
   
  @@ -3195,7 +3199,11 @@
                        const XalanDOMString&   theString,
                        bool                                    isCDATA)
   {
  -     fireCharacterGenerateEvent(c_wstr(theString), 0, length(theString), 
isCDATA);
  +     fireCharacterGenerateEvent(
  +        theString.c_str(),
  +        0,
  +        theString.length(),
  +        isCDATA);
   }
   
   
  @@ -3228,7 +3236,10 @@
        XPath::installFunction(XPathFunctionTable::s_formatNumber, 
FunctionFormatNumber());
        XPath::installFunction(XPathFunctionTable::s_generateId, 
FunctionGenerateID());
        XPath::installFunction(XPathFunctionTable::s_key, FunctionKey());
  -     XPath::installFunction(XPathFunctionTable::s_systemProperty, 
FunctionSystemProperty(theManager));
  +
  +    const FunctionSystemProperty    temp(theManager);
  +
  +     XPath::installFunction(XPathFunctionTable::s_systemProperty, temp);
        XPath::installFunction(XPathFunctionTable::s_unparsedEntityUri, 
FunctionUnparsedEntityURI());
   }
   
  
  
  

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