[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xalan-cvs
Subject:    cvs commit: xml-xalan/c/src/xalanc/XPath XObject.cpp
From:       dbertoni () apache ! org
Date:       2005-09-19 18:23:36
Message-ID: 20050919182336.43122.qmail () minotaur ! apache ! org
[Download RAW message or body]

dbertoni    2005/09/19 11:23:36

  Modified:    c/src/xalanc/XPath XObject.cpp
  Log:
  Added inline or static keyword to remove some Intel compiler warnings.
  
  Revision  Changes    Path
  1.16      +14 -12    xml-xalan/c/src/xalanc/XPath/XObject.cpp
  
  Index: XObject.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XObject.cpp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- XObject.cpp	27 Jul 2005 21:48:54 -0000	1.15
  +++ XObject.cpp	19 Sep 2005 18:23:36 -0000	1.16
  @@ -41,13 +41,15 @@
   XALAN_CPP_NAMESPACE_BEGIN
   
   
  -XalanDOMString  s_localBooleanString(XalanMemMgrs::getDummyMemMgr());
  -XalanDOMString  s_localFalseString(XalanMemMgrs::getDummyMemMgr());
  -XalanDOMString  s_localNodesetString(XalanMemMgrs::getDummyMemMgr());
  -XalanDOMString  s_localNumberString(XalanMemMgrs::getDummyMemMgr());
  -XalanDOMString  s_localResultTreeFragmentString(XalanMemMgrs::getDummyMemMgr());
  -XalanDOMString  s_localStringString(XalanMemMgrs::getDummyMemMgr());
  -XalanDOMString  s_localTrueString(XalanMemMgrs::getDummyMemMgr());
  +static XalanDOMString   s_localBooleanString(XalanMemMgrs::getDummyMemMgr());
  +static XalanDOMString   s_localFalseString(XalanMemMgrs::getDummyMemMgr());
  +static XalanDOMString   s_localNodesetString(XalanMemMgrs::getDummyMemMgr());
  +static XalanDOMString   s_localNumberString(XalanMemMgrs::getDummyMemMgr());
  +static XalanDOMString   s_localResultTreeFragmentString(XalanMemMgrs::getDummyMemMgr());
  +static XalanDOMString   s_localStringString(XalanMemMgrs::getDummyMemMgr());
  +static XalanDOMString   s_localTrueString(XalanMemMgrs::getDummyMemMgr());
  +
  +
   
   const XalanDOMString&   XObject::s_booleanString =
           s_localBooleanString;
  @@ -366,7 +368,7 @@
   
   
   
  -void
  +inline void
   getStringFromNode(
               const XalanNode&    theNode,
               XalanDOMString&     theString)
  @@ -693,7 +695,7 @@
   
   
   template<class CompareFunction, class TypeFunction>
  -bool
  +inline bool
   doCompareNodeSets(
               const NodeRefListBase&  theLHSNodeSet,
               const NodeRefListBase&  theRHSNodeSet,
  @@ -767,7 +769,7 @@
   
   
   template<class CompareFunction, class StringFunction>
  -bool
  +inline bool
   doCompareString(
               const NodeRefListBase&  theLHSNodeSet,
               const StringFunction&   theStringFunction,
  @@ -804,7 +806,7 @@
   
   
   template<class CompareFunction, class NumberFunction>
  -bool
  +inline bool
   doCompareNumber(
               const NodeRefListBase&  theLHSNodeSet,
               const NumberFunction&   theNumberFunction,
  @@ -834,7 +836,7 @@
   
   
   template<class StringCompareFunction, class NumberCompareFunction>
  -bool
  +inline bool
   compareNodeSets(
               const XObject&                  theLHS,
               const XObject&                  theRHS,
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org

[prev in list] [next in list] [prev in thread] [next in thread]