You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2008/09/18 20:50:37 UTC
svn commit: r696764 - in /xalan/c/trunk: Projects/Win32/VC6/AllInOne/
Projects/Win32/VC7.1/AllInOne/ Projects/Win32/VC7/AllInOne/
Projects/Win32/VC8/AllInOne/ Projects/Win32/VC9/AllInOne/
src/xalanc/DOMSupport/ src/xalanc/Harness/ src/xalanc/PlatformSu...
Author: dbertoni
Date: Thu Sep 18 11:50:36 2008
New Revision: 696764
URL: http://svn.apache.org/viewvc?rev=696764&view=rev
Log:
Cleaned up a bunch of old DOMStringHelper cruft. Removed obsolete files.
Removed:
xalan/c/trunk/src/xalanc/PlatformSupport/Resettable.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/Resettable.hpp
Modified:
xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp
xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj
xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj
xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj
xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj
xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj
xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj
xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj
xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj
xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp
xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp
xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringPrintWriter.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp
xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp
xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp
xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp
xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp
xalan/c/trunk/src/xalanc/XPath/XNumber.cpp
xalan/c/trunk/src/xalanc/XPath/XObject.cpp
xalan/c/trunk/src/xalanc/XPath/XPath.cpp
xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.cpp
xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp
xalan/c/trunk/src/xalanc/XSLT/AVT.cpp
xalan/c/trunk/src/xalanc/XSLT/AVTPartSimple.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemElement.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp
xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp
xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
xalan/c/trunk/src/xalanc/XSLT/TracerEvent.cpp
xalan/c/trunk/src/xalanc/XSLT/XResultTreeFrag.cpp
xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp
xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp
xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp
xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp
Modified: xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOne.dsp Thu Sep 18 11:50:36 2008
@@ -566,14 +566,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\xalanc\PlatformSupport\Resettable.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp
# End Source File
# Begin Source File
Modified: xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp (original)
+++ xalan/c/trunk/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp Thu Sep 18 11:50:36 2008
@@ -536,14 +536,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\src\xalanc\PlatformSupport\Resettable.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp
# End Source File
# Begin Source File
Modified: xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOne.vcproj Thu Sep 18 11:50:36 2008
@@ -459,12 +459,6 @@
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ProblemListenerBase.hpp">
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.hpp">
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp">
</File>
<File
Modified: xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7.1/AllInOne/AllInOneWithICU.vcproj Thu Sep 18 11:50:36 2008
@@ -523,12 +523,6 @@
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PrintWriter.hpp">
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.hpp">
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp">
</File>
<File
Modified: xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOne.vcproj Thu Sep 18 11:50:36 2008
@@ -513,12 +513,6 @@
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PrintWriter.hpp">
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.hpp">
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp">
</File>
<File
Modified: xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj Thu Sep 18 11:50:36 2008
@@ -510,12 +510,6 @@
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\PrintWriter.hpp">
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp">
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.hpp">
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp">
</File>
<File
Modified: xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOne.vcproj Thu Sep 18 11:50:36 2008
@@ -1140,14 +1140,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp"
>
</File>
Modified: xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC8/AllInOne/AllInOneWithICU.vcproj Thu Sep 18 11:50:36 2008
@@ -774,14 +774,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp"
>
</File>
Modified: xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOne.vcproj Thu Sep 18 11:50:36 2008
@@ -1133,14 +1133,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp"
>
</File>
Modified: xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj (original)
+++ xalan/c/trunk/Projects/Win32/VC9/AllInOne/AllInOneWithICU.vcproj Thu Sep 18 11:50:36 2008
@@ -771,14 +771,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\xalanc\PlatformSupport\Resettable.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\xalanc\PlatformSupport\ReusableArenaAllocator.hpp"
>
</File>
Modified: xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp (original)
+++ xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.cpp Thu Sep 18 11:50:36 2008
@@ -1017,7 +1017,7 @@
if (theColonIndex == theLength)
{
- clear(thePrefix);
+ thePrefix.clear();
if (isAttribute == true)
{
@@ -1031,7 +1031,7 @@
else
{
// Get the prefix from theName...
- assign(thePrefix, theName, theColonIndex);
+ thePrefix.assign(theName, theColonIndex);
assert(thePrefix.empty() == false);
return thePrefixResolver.getNamespaceForPrefix(thePrefix);
Modified: xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp (original)
+++ xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp Thu Sep 18 11:50:36 2008
@@ -139,7 +139,7 @@
const XalanAttr& attribute,
XalanDOMString& data)
{
- append(data, attribute.getNodeValue());
+ data.append(attribute.getNodeValue());
}
@@ -155,7 +155,7 @@
const XalanComment& comment,
XalanDOMString& data)
{
- append(data, comment.getData());
+ data.append(comment.getData());
}
/**
@@ -271,7 +271,7 @@
const XalanProcessingInstruction& pi,
XalanDOMString& data)
{
- append(data, pi.getData());
+ data.append(pi.getData());
}
/**
@@ -285,7 +285,7 @@
const XalanText& text,
XalanDOMString& data)
{
- append(data, text.getData());
+ data.append(text.getData());
}
/**
@@ -820,7 +820,7 @@
if (context.shouldStripSourceNode(text) == false)
{
- append(data, text.getData());
+ data.append(text.getData());
}
}
Modified: xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanFileUtility.cpp Thu Sep 18 11:50:36 2008
@@ -150,11 +150,11 @@
void
XalanFileUtility::reportStruct::reset()
{
- clear(testOrFile);
+ testOrFile.clear();
msg = "";
- clear(currentNode);
- clear(actual);
- clear(expected);
+ currentNode.clear();
+ actual.clear();
+ expected.clear();
}
@@ -264,7 +264,7 @@
{
if (checkDir(XalanDOMString(argv[1], getMemoryManager())))
{
- assign(args.base, XalanDOMString(argv[1], getMemoryManager()));
+ args.base.assign(XalanDOMString(argv[1], getMemoryManager()));
}
else
{
@@ -283,8 +283,8 @@
++i;
if(i < argc && argv[i][0] != '-')
{
- assign(args.output, XalanDOMString(argv[i], getMemoryManager()));
- append(args.output, s_pathSep);
+ args.output.assign(XalanDOMString(argv[i], getMemoryManager()));
+ args.output.append(s_pathSep);
checkAndCreateDir(args.output);
fsetOut = false;
}
@@ -299,7 +299,7 @@
++i;
if(i < argc && argv[i][0] != '-')
{
- assign(args.gold, XalanDOMString(argv[i], getMemoryManager()));
+ args.gold.assign(XalanDOMString(argv[i], getMemoryManager()));
if ( !checkDir(args.gold) )
{
@@ -309,7 +309,7 @@
fSuccess = false;
}
- append(args.gold, s_pathSep);
+ args.gold.append(s_pathSep);
fsetGold = false;
}
else
@@ -350,7 +350,7 @@
++i;
if(i < argc && argv[i][0] != '-')
{
- assign(args.sub, XalanDOMString(argv[i], getMemoryManager()));
+ args.sub.assign(XalanDOMString(argv[i], getMemoryManager()));
}
else
{
@@ -397,9 +397,9 @@
args.output.assign(args.base, 0, ii + 1);
}
- append(args.output,XalanDOMString(outDir, getMemoryManager()));
+ args.output.append(XalanDOMString(outDir, getMemoryManager()));
checkAndCreateDir(args.output);
- append(args.output,s_pathSep);
+ args.output.append(s_pathSep);
}
// Do we need to set the default gold directory??
@@ -407,20 +407,20 @@
if (fsetGold)
{
args.gold = args.base;
- append(args.gold,XalanDOMString("-gold", getMemoryManager()));
+ args.gold.append(XalanDOMString("-gold", getMemoryManager()));
if ( !checkDir(args.gold) )
{
TranscodeToLocalCodePage(args.gold, m_buffer, true);
cout << "Assumed Gold dir - " << &*m_buffer.begin() << " - does not exist" << endl;
fSuccess = false;
}
- append(args.gold,s_pathSep);
+ args.gold.append(s_pathSep);
}
// Add the path seperator to the end of the base directory
// here after we've finished using it for all directory creation.
//
- append(args.base,s_pathSep);
+ args.base.append(s_pathSep);
return fSuccess;
}
@@ -2055,15 +2055,15 @@
// quotes so that it is not considered an expression.
//
#if defined (AIX) || defined(SOLARIS) || defined(LINUX) || defined(HPUX)
- assign(paramValue, XalanDOMString("\'", getMemoryManager()));
+ paramValue.assign(XalanDOMString("\'", getMemoryManager()));
if ( !pathStatus )
- append(paramValue, resultPath);
- append(paramValue, resultsFile);
- append(paramValue, XalanDOMString("\'", getMemoryManager()));
+ paramValue.append(resultPath);
+ paramValue.append(resultsFile);
+ paramValue.append(XalanDOMString("\'", getMemoryManager()));
#else
- assign(paramValue, XalanDOMString("'", getMemoryManager()));
- append(paramValue, resultsFile);
- append(paramValue, XalanDOMString("'", getMemoryManager()));
+ paramValue.assign(XalanDOMString("'", getMemoryManager()));
+ paramValue.append(resultsFile);
+ paramValue.append(XalanDOMString("'", getMemoryManager()));
#endif
// Set the parameter
Modified: xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp (original)
+++ xalan/c/trunk/src/xalanc/Harness/XalanXMLFileReporter.cpp Thu Sep 18 11:50:36 2008
@@ -781,31 +781,31 @@
for (XalanDOMString::size_type i = 0; i < length; i++)
{
- const XalanDOMChar ch = charAt(s, i);
+ const XalanDOMChar ch = s[i];
if (XalanUnicode::charLessThanSign == ch)
{
- append(sb, theLessThanString);
+ sb.append(theLessThanString);
}
else if (XalanUnicode::charGreaterThanSign == ch)
{
- append(sb, theGreaterThanString);
+ sb.append(theGreaterThanString);
}
else if (XalanUnicode::charAmpersand == ch)
{
- append(sb, theAmpersandString);
+ sb.append(theAmpersandString);
}
else if (XalanUnicode::charQuoteMark == ch)
{
- append(sb, theQuoteString);
+ sb.append(theQuoteString);
}
else if (XalanUnicode::charApostrophe == ch)
{
- append(sb, theApostropheString);
+ sb.append(theApostropheString);
}
else
{
- append(sb, ch);
+ sb.append(1, ch);
}
}
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.cpp Thu Sep 18 11:50:36 2008
@@ -393,7 +393,7 @@
if (theStartIndex == theStringLength)
{
// This is allowed, and should return an empty string.
- clear(theSubstring);
+ theSubstring.clear();
}
else
{
@@ -423,7 +423,7 @@
if (theStartIndex == theStringLength)
{
// This is allowed, and should return an empty string.
- clear(theSubstring);
+ theSubstring.clear();
}
else
{
@@ -432,7 +432,7 @@
if (theLength == 0)
{
- clear(theSubstring);
+ theSubstring.clear();
}
else
{
@@ -1167,17 +1167,17 @@
XalanDOMString::size_type leadingSpace = 0;
for (; leadingSpace < strLen; ++leadingSpace)
- if (!isXMLWhitespace(charAt(theString, leadingSpace)))
+ if (!isXMLWhitespace(theString[leadingSpace]))
break;
// index of last non-whitespace character
XalanDOMString::size_type trailingSpace = strLen -1;
for (; trailingSpace > 0; --trailingSpace)
- if (!isXMLWhitespace(charAt(theString, trailingSpace)))
+ if (!isXMLWhitespace(theString[trailingSpace]))
break;
- substring(theString, theResult, leadingSpace, trailingSpace +1);
+ substring(theString, theResult, leadingSpace, trailingSpace + 1);
return theResult;
}
@@ -1584,8 +1584,7 @@
XalanDOMChar* const theBegin = ScalarToDecimalString(theValue, theEnd);
- append(
- theResult,
+ theResult.append(
theBegin,
XalanDOMString::size_type(theEnd - theBegin));
@@ -1651,8 +1650,7 @@
XalanDOMChar* const theBegin = UnsignedScalarToHexadecimalString(theValue, theEnd);
- append(
- theResult,
+ theResult.append(
theBegin,
XalanDOMString::size_type(theEnd - theBegin));
}
@@ -1725,30 +1723,26 @@
{
if (DoubleSupport::isNaN(theValue) == true)
{
- append(
- theResult,
+ theResult.append(
theNaNString,
sizeof(theNaNString) / sizeof(theNaNString[0]) - 1);
}
else if (DoubleSupport::isPositiveInfinity(theValue) == true)
{
- append(
- theResult,
+ theResult.append(
thePositiveInfinityString,
sizeof(thePositiveInfinityString) / sizeof(thePositiveInfinityString[0]) - 1);
}
else if (DoubleSupport::isNegativeInfinity(theValue) == true)
{
- append(
- theResult,
+ theResult.append(
theNegativeInfinityString,
sizeof(theNegativeInfinityString) / sizeof(theNegativeInfinityString[0]) - 1);
}
else if (DoubleSupport::isPositiveZero(theValue) == true ||
DoubleSupport::isNegativeZero(theValue) == true)
{
- append(
- theResult,
+ theResult.append(
theZeroString,
sizeof(theZeroString) / sizeof(theZeroString[0]) - 1);
}
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp Thu Sep 18 11:50:36 2008
@@ -230,6 +230,8 @@
/**
* Get the length of a XalanDOMString
*
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
* @return the length of the target string
*/
@@ -2345,7 +2347,9 @@
/**
* Assign one string to another
- *
+ *
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
* @param theStringToAppend string to assign
* @param theStringToAppendLength length of the string (XalanDOMString::npos implies the string is null-terminated)
@@ -2365,7 +2369,9 @@
/**
* Assign one string to another
- *
+ *
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
* @param theStringToAppend string to assign
* @param theStringToAppendLength length of the string (XalanDOMString::npos implies the string is null-terminated)
@@ -2394,6 +2400,8 @@
/**
* Concatenate two strings
*
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
* @param theStringToAppend string to add to target
* @return a reference to the target string
@@ -2412,7 +2420,9 @@
/**
* Concatenate two strings
- *
+ *
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
* @param theStringToAppend string to add to target
* @param theStringToAppendLength length of the string (XalanDOMString::npos implies the string is null-terminated)
@@ -2442,7 +2452,9 @@
/**
* Concatenate two strings
- *
+ *
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
* @param theStringToAppend string to add to target
* @param theStringToAppendLength length of the string (XalanDOMString::npos implies the string is null-terminated)
@@ -2467,7 +2479,9 @@
/**
* Concatenate a string and a character
- *
+ *
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
* @param theCharToAppend the character to add to the target
* @return string with the character appended
@@ -2487,6 +2501,8 @@
/**
* Concatenate a string and a character
*
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
* @param theCharToAppend the character to add to the target
* @return string with the character appended
@@ -2506,7 +2522,9 @@
/**
* Insert a string into another string.
- *
+ *
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
* @param thePosition The position in the target string to insert
* @param theStringToInsert The string to insert
@@ -2527,7 +2545,9 @@
/**
* Insert a string into another string.
- *
+ *
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
* @param thePosition The position in the target string to insert
* @param theStringToInsert The string to insert
@@ -2547,19 +2567,24 @@
/**
- * Remove trailing whitespace
+ * Remove leading and trailing whitespace.
*
- * @param theString target string
- * @return string with contents of target string less trailing whitespace
+ * @param theString The string to trim.
+ * @param theResult The result string.
+ * @return A reference to theResult.
*/
XALAN_PLATFORMSUPPORT_EXPORT_FUNCTION(XalanDOMString&)
-trim(const XalanDOMString& theString, XalanDOMString& theResult);
+trim(
+ const XalanDOMString& theString,
+ XalanDOMString& theResult);
/**
* Remove all elements from target string
*
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
*/
inline void
@@ -2572,7 +2597,9 @@
/**
* Remove all elements from target string
- *
+ *
+ * @deprecated This function is deprecated.
+ *
* @param theString target string
*/
inline void
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringPrintWriter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringPrintWriter.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringPrintWriter.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringPrintWriter.cpp Thu Sep 18 11:50:36 2008
@@ -93,7 +93,7 @@
{
assert(s != 0);
- append(*m_outputString, (s + theOffset), theLength);
+ m_outputString->append(s + theOffset, theLength);
}
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanNumberFormat.cpp Thu Sep 18 11:50:36 2008
@@ -204,13 +204,13 @@
for (XalanDOMString::size_type i = 0, ix = len - 1; i < len && p > buffer; i++, ix--)
{
- const XalanDOMChar c = charAt(value, ix);
+ const XalanDOMChar c = value[ix];
if (i && !(i% m_groupingSize))
{
// Could be a multiple character separator??
for (long j = long(m_groupingSeparator.length() - 1); j >= 0 && p > buffer; j--)
- *p-- = charAt(m_groupingSeparator, j);
+ *p-- = m_groupingSeparator[j];
}
*p-- = c;
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp Thu Sep 18 11:50:36 2008
@@ -205,7 +205,7 @@
FormatterToHTML::startDocument()
{
// Clear the buffer, just in case...
- clear(m_stringBuffer);
+ m_stringBuffer.clear();
// Reset this, just in case...
m_elementLevel = 0;
@@ -832,7 +832,7 @@
accumContent(XalanUnicode::charNumberSign);
accumContent(NumberToDOMString(next, m_stringBuffer));
- clear(m_stringBuffer);
+ m_stringBuffer.clear();
accumContent(XalanUnicode::charSemicolon);
}
@@ -1052,7 +1052,7 @@
accumContent(XalanUnicode::charNumberSign);
accumContent(NumberToDOMString(ch, m_stringBuffer));
- clear(m_stringBuffer);
+ m_stringBuffer.clear();
accumContent(XalanUnicode::charSemicolon);
}
@@ -1102,7 +1102,7 @@
accumContent(m_stringBuffer);
- clear(m_stringBuffer);
+ m_stringBuffer.clear();
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp Thu Sep 18 11:50:36 2008
@@ -132,7 +132,7 @@
void
FormatterToText::clearEncoding()
{
- clear(m_encoding);
+ m_encoding.clear();
m_maxCharacter = XalanDOMChar(~0);
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp Thu Sep 18 11:50:36 2008
@@ -386,7 +386,7 @@
{
for(XalanDOMString::size_type i = 0; i < nSpecials; ++i)
{
- m_attrCharsMap[charAt(m_attrSpecialChars, i)] = 'S';
+ m_attrCharsMap[m_attrSpecialChars[i]] = 'S';
}
}
@@ -1049,7 +1049,7 @@
FormatterToXML::startDocument()
{
// Clear the buffer, just in case...
- clear(m_stringBuffer);
+ m_stringBuffer.clear();
m_needToOutputDocTypeDecl = true;
m_startNewLine = false;
@@ -1564,7 +1564,7 @@
accumContent(XalanUnicode::charNumberSign);
accumContent(NumberToDOMString(theNumber, m_stringBuffer));
- clear(m_stringBuffer);
+ m_stringBuffer.clear();
accumContent(XalanUnicode::charSemicolon);
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp Thu Sep 18 11:50:36 2008
@@ -670,7 +670,7 @@
m_writer.write(value_type(XalanUnicode::charNumberSign));
m_writer.write(NumberToDOMString(theNumber, m_stringBuffer));
- clear(m_stringBuffer);
+ m_stringBuffer.clear();
m_writer.write(value_type(XalanUnicode::charSemicolon));
}
@@ -681,7 +681,7 @@
size_type start,
size_type length)
{
- assert( start < length);
+ assert(start < length);
const XalanDOMChar ch = chars[start];
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp Thu Sep 18 11:50:36 2008
@@ -342,7 +342,7 @@
const XalanDOMString&
formatNumericCharacterReference(XalanUnicodeChar theChar)
{
- clear(m_stringBuffer);
+ m_stringBuffer.clear();
m_stringBuffer.push_back(XalanDOMChar(XalanUnicode::charAmpersand));
m_stringBuffer.push_back(XalanDOMChar(XalanUnicode::charNumberSign));
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionID.cpp Thu Sep 18 11:50:36 2008
@@ -228,7 +228,7 @@
{
DOMServices::getNodeData(*theValue.item(i), m_executionContext, m_resultString);
- append(m_resultString, XalanDOMChar(XalanUnicode::charSpace));
+ m_resultString.append(1, XalanUnicode::charSpace);
}
}
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionNormalizeSpace.cpp Thu Sep 18 11:50:36 2008
@@ -237,7 +237,7 @@
// space character...
for (XalanDOMString::size_type i = 0; i < theStringLength && fNormalize == false; ++i)
{
- const XalanDOMChar theCurrentChar = charAt(theString, i);
+ const XalanDOMChar theCurrentChar = theString[i];
if (isXMLWhitespace(theCurrentChar) == false)
{
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstring.cpp Thu Sep 18 11:50:36 2008
@@ -269,8 +269,7 @@
XalanDOMString& theString = theResult.get();
- assign(
- theString,
+ theString.assign(
theSourceString.c_str() + theStartIndex,
theSubstringLength);
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionSubstringAfter.cpp Thu Sep 18 11:50:36 2008
@@ -107,10 +107,9 @@
XalanDOMString& theString = theResult.get();
- assign(
- theString,
- theFirstCharacter,
- theSubstringLength);
+ theString.assign(
+ theFirstCharacter,
+ theSubstringLength);
return executionContext.getXObjectFactory().createString(theResult);
}
Modified: xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FunctionTranslate.cpp Thu Sep 18 11:50:36 2008
@@ -79,7 +79,7 @@
for (XalanDOMString::size_type i = 0; i < theFirstStringLength; i++)
{
- const XalanDOMChar theCurrentChar = charAt(theFirstString, i);
+ const XalanDOMChar theCurrentChar = theFirstString[i];
const XalanDOMString::size_type theIndex = indexOf(theSecondString, theCurrentChar);
@@ -87,13 +87,13 @@
{
// Didn't find the character in the second string, so it
// is not translated.
- append(theString, theCurrentChar);
+ theString.append(1, theCurrentChar);
}
else if (theIndex < theThirdStringLength)
{
// OK, there's a corresponding character in the
// third string, so do the translation...
- append(theString, charAt(theThirdString, theIndex));
+ theString.append(1, theThirdString[theIndex]);
}
else
{
Modified: xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XNodeSetBase.cpp Thu Sep 18 11:50:36 2008
@@ -300,7 +300,7 @@
{
m_cachedNumberValue = theBogusNumberValue;
- clear(m_cachedStringValue);
+ m_cachedStringValue.clear();
}
Modified: xalan/c/trunk/src/xalanc/XPath/XNumber.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XNumber.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XNumber.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XNumber.cpp Thu Sep 18 11:50:36 2008
@@ -167,7 +167,7 @@
{
m_value = theValue;
- clear(m_cachedStringValue);
+ m_cachedStringValue.clear();
}
Modified: xalan/c/trunk/src/xalanc/XPath/XObject.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XObject.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XObject.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XObject.cpp Thu Sep 18 11:50:36 2008
@@ -743,10 +743,10 @@
theResult = true;
}
- clear(s2.get());
+ s2.get().clear();
}
- clear(s1.get());
+ s1.get().clear();
}
}
}
@@ -785,7 +785,7 @@
theResult = true;
}
- clear(theLHS);
+ theLHS.clear();
}
return theResult;
Modified: xalan/c/trunk/src/xalanc/XPath/XPath.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPath.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPath.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPath.cpp Thu Sep 18 11:50:36 2008
@@ -2826,7 +2826,7 @@
sum = DoubleSupport::add(sum, DoubleSupport::toDouble(theString, executionContext.getMemoryManager()));
- clear(theString);
+ theString.clear();
}
}
Modified: xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.cpp Thu Sep 18 11:50:36 2008
@@ -224,7 +224,7 @@
for(t_size_type i = 0; i < nChars; i++)
{
- XalanDOMChar c = charAt(pat, i);
+ XalanDOMChar c = pat[i];
switch(c)
{
@@ -246,7 +246,7 @@
startSubstring = i;
- for(++i; i < nChars && (c = charAt(pat, i)) != XalanUnicode::charQuoteMark; ++i);
+ for(++i; i < nChars && (c = pat[i]) != XalanUnicode::charQuoteMark; ++i);
if(c == XalanUnicode::charQuoteMark && i < nChars)
{
@@ -281,7 +281,7 @@
startSubstring = i;
- for(++i; i < nChars && (c = charAt(pat, i)) != XalanUnicode::charApostrophe; ++i);
+ for(++i; i < nChars && (c = pat[i]) != XalanUnicode::charApostrophe; ++i);
if(c == XalanUnicode::charApostrophe && i < nChars)
{
@@ -414,7 +414,7 @@
{
++i;
- const XalanDOMChar currentChar = charAt(pat, i);
+ const XalanDOMChar currentChar = pat[i];
if (currentChar == XalanUnicode::charFullStop)
{
@@ -1510,7 +1510,7 @@
}
else if((tokenIs(XalanUnicode::charFullStop) == true &&
m_token.length() > 1 &&
- XalanXMLChar::isDigit(charAt(m_token, 1)) == true) ||
+ XalanXMLChar::isDigit(m_token[1]) == true) ||
XalanXMLChar::isDigit(m_tokenChar) == true)
{
m_expression->appendOpCode(XPathExpression::eOP_NUMBERLIT);
@@ -2296,7 +2296,7 @@
tokenIs(XalanUnicode::charCommercialAt) ||
tokenIs(XalanUnicode::charSolidus) ||
(tokenIs(XalanUnicode::charLowLine) ||
- XalanXMLChar::isLetter(charAt(m_token, 0))))
+ XalanXMLChar::isLetter(m_token[0])))
{
Basis();
@@ -2948,7 +2948,7 @@
const t_size_type last = theLength - 1;
const XalanDOMChar c0 = m_tokenChar;
- const XalanDOMChar cX = charAt(m_token, last);
+ const XalanDOMChar cX = m_token[last];
if((c0 == XalanUnicode::charQuoteMark && cX == XalanUnicode::charQuoteMark) ||
(c0 == XalanUnicode::charApostrophe && cX == XalanUnicode::charApostrophe))
@@ -2975,7 +2975,7 @@
return false;
}
else if (theLength == 1 &&
- charAt(theToken, 0) == XalanUnicode::charCommercialAt)
+ theToken[0] == XalanUnicode::charCommercialAt)
{
return true;
}
@@ -3012,12 +3012,12 @@
return false;
}
else if (theLength == 1 &&
- charAt(theToken, 0) == XalanUnicode::charAsterisk)
+ theToken[0] == XalanUnicode::charAsterisk)
{
return true;
}
- else if (charAt(theToken, 0) == XalanUnicode::charLowLine ||
- XalanXMLChar::isLetter(charAt(theToken, 0)) == true)
+ else if (theToken[0] == XalanUnicode::charLowLine ||
+ XalanXMLChar::isLetter(theToken[0]) == true)
{
return true;
}
Modified: xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp Thu Sep 18 11:50:36 2008
@@ -733,8 +733,8 @@
/**
* The first char in m_token, the theory being that this
- * is an optimization because we won't have to do charAt(0) as
- * often.
+ * is an optimization because we won't have to do index
+ * into the string as often.
*/
XalanDOMChar m_tokenChar;
Modified: xalan/c/trunk/src/xalanc/XSLT/AVT.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/AVT.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/AVT.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/AVT.cpp Thu Sep 18 11:50:36 2008
@@ -120,7 +120,7 @@
{
t = lookahead;
- clear(lookahead);
+ lookahead.clear();
}
else
{
@@ -141,9 +141,9 @@
if(equals(lookahead, theLeftCurlyBracketString))
{
// Double braces mean escape to show brace
- append(buffer, lookahead);
+ buffer.append(lookahead);
- clear(lookahead);
+ lookahead.clear();
break; // from switch
}
@@ -186,12 +186,12 @@
while(!equals(lookahead, quote))
{
- append(exprBuffer, lookahead);
+ exprBuffer.append(lookahead);
nextToken(constructionContext, locator, tokenizer, lookahead);
}
- append(exprBuffer,lookahead);
+ exprBuffer.append(lookahead);
break;
}
@@ -214,7 +214,7 @@
default:
// part of the template stuff, just add it.
- append(exprBuffer, lookahead);
+ exprBuffer.append(lookahead);
break;
} // end inner switch
@@ -222,7 +222,7 @@
else
{
// part of the template stuff, just add it.
- append(exprBuffer,lookahead);
+ exprBuffer.append(lookahead);
}
nextToken(constructionContext, locator, tokenizer, lookahead);
@@ -231,7 +231,7 @@
// Proper close of attribute template. Evaluate the
// expression.
- clear(buffer);
+ buffer.clear();
assert(m_partsSize + 1 < nTokens);
@@ -242,7 +242,7 @@
exprBuffer.length(),
resolver);
- clear(lookahead); // breaks out of inner while loop
+ lookahead.clear(); // breaks out of inner while loop
}
break;
}
@@ -283,7 +283,7 @@
else
{
// Anything else just add to string.
- append(buffer,t);
+ buffer.append(t);
}
} // end while(tokenizer.hasMoreTokens())
Modified: xalan/c/trunk/src/xalanc/XSLT/AVTPartSimple.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/AVTPartSimple.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/AVTPartSimple.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/AVTPartSimple.cpp Thu Sep 18 11:50:36 2008
@@ -54,7 +54,7 @@
XPathExecutionContext& /* executionContext */) const
{
- append(buf, m_val, m_len);
+ buf.append(m_val, m_len);
}
@@ -66,7 +66,7 @@
XPathExecutionContext& /* executionContext */) const
{
- append(buf, m_val, m_len);
+ buf.append(m_val, m_len);
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemAttribute.cpp Thu Sep 18 11:50:36 2008
@@ -154,7 +154,7 @@
XalanDOMString& origAttrName = origAttrNameGuard.get();
- assign(origAttrName, attrName);
+ origAttrName.assign(attrName);
const XalanDOMString::size_type origAttrNameLength = origAttrName.length();
@@ -211,8 +211,8 @@
attrName.length() + DOMServices::s_XMLNamespaceSeparatorStringLength + prefix->length() + 1);
}
- insert(attrName, 0, DOMServices::s_XMLNamespaceSeparatorString);
- insert(attrName, 0, *prefix);
+ attrName.insert(0, DOMServices::s_XMLNamespaceSeparatorString);
+ attrName.insert(0, *prefix);
}
else
{
@@ -243,7 +243,7 @@
{
// It doesn't, so we'll need to manufacture a
// prefix.
- clear(newPrefix);
+ newPrefix.clear();
// Strip the user-supplied prefix from the name...
substring(origAttrName, attrName, indexOfNSSep + 1);
@@ -266,8 +266,8 @@
attrName.reserve(
attrName.length() + DOMServices::s_XMLNamespaceSeparatorStringLength + newPrefix.length() + 1);
- insert(attrName, 0, DOMServices::s_XMLNamespaceSeparatorString);
- insert(attrName, 0, newPrefix);
+ attrName.insert(0, DOMServices::s_XMLNamespaceSeparatorString);
+ attrName.insert(0, newPrefix);
}
// OK, now we have to generate a namespace declaration...
@@ -277,9 +277,9 @@
nsDecl.reserve(DOMServices::s_XMLNamespaceWithSeparatorLength + newPrefix.length() + 1);
- assign(nsDecl, DOMServices::s_XMLNamespaceWithSeparator);
+ nsDecl.assign(DOMServices::s_XMLNamespaceWithSeparator);
- append(nsDecl, newPrefix);
+ nsDecl.append(newPrefix);
// Add the namespace declaration...
executionContext.addResultAttribute(nsDecl, attrNameSpace);
@@ -316,7 +316,8 @@
if (theNamespace != 0)
{
- assign(attrNameSpace, *theNamespace);
+ attrNameSpace.assign(*theNamespace);
+
const XalanDOMString* const theResultNamespace =
executionContext.getResultNamespaceForPrefix(nsprefix);
@@ -362,9 +363,9 @@
nsDecl.reserve(DOMServices::s_XMLNamespaceWithSeparatorLength + nsprefix.length() + 1);
- assign(nsDecl, DOMServices::s_XMLNamespaceWithSeparator);
+ nsDecl.assign(DOMServices::s_XMLNamespaceWithSeparator);
- append(nsDecl, nsprefix);
+ nsDecl.append(nsprefix);
// Add the namespace declaration...
executionContext.addResultAttribute(nsDecl, attrNameSpace);
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemElement.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemElement.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemElement.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemElement.cpp Thu Sep 18 11:50:36 2008
@@ -262,7 +262,7 @@
if (theNamespace == 0 ||
equals(*theNamespace, elemNameSpace) == false)
{
- insert(prefix, 0, DOMServices::s_XMLNamespaceWithSeparator);
+ prefix.insert(0, DOMServices::s_XMLNamespaceWithSeparator);
executionContext.addResultAttribute(prefix, elemNameSpace);
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemForEach.cpp Thu Sep 18 11:50:36 2008
@@ -422,7 +422,7 @@
}
}
- clear(scratchString);
+ scratchString.clear();
avt = sort->getOrderAVT();
@@ -448,7 +448,7 @@
}
}
- clear(scratchString);
+ scratchString.clear();
avt = sort->getCaseOrderAVT();
@@ -478,7 +478,7 @@
}
}
- clear(scratchString);
+ scratchString.clear();
keys.push_back(
NodeSortKey(
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemNumber.cpp Thu Sep 18 11:50:36 2008
@@ -419,9 +419,9 @@
const GetCachedString theMatchPatternString(executionContext);
- assign(theMatchPatternString.get(), thePrefix.get());
- append(theMatchPatternString.get(), XalanDOMChar(XalanUnicode::charColon));
- append(theMatchPatternString.get(), theNodeName);
+ theMatchPatternString.get().assign(thePrefix.get());
+ theMatchPatternString.get().append(1, XalanUnicode::charColon);
+ theMatchPatternString.get().append(theNodeName);
// Use this class to resolve the synthesized prefix to the
// appropriate namespace URI. We could see if a prefix is
@@ -454,8 +454,8 @@
const GetCachedString theMatchPatternString(executionContext);
- assign(theMatchPatternString.get(), s_atString);
- append(theMatchPatternString.get(), theNodeName);
+ theMatchPatternString.get().assign(s_atString);
+ theMatchPatternString.get().append(theNodeName);
countMatchPattern = executionContext.createMatchPattern(
theMatchPatternString.get(),
@@ -484,8 +484,8 @@
const GetCachedString theMatchPatternString(executionContext);
theMatchPatternString.get() = s_piString;
- append(theMatchPatternString.get(), contextNode->getNodeName());
- append(theMatchPatternString.get(), XalanDOMChar(XalanUnicode::charRightParenthesis));
+ theMatchPatternString.get().append(contextNode->getNodeName());
+ theMatchPatternString.get().append(1, XalanUnicode::charRightParenthesis);
countMatchPattern = executionContext.createMatchPattern(
theMatchPatternString.get(),
@@ -954,7 +954,7 @@
if (theVectorSize > 0)
{
- if (!isXMLLetterOrDigit(charAt(*it, 0)))
+ if (!isXMLLetterOrDigit((*it)[0]))
{
leaderStrIt = it;
@@ -965,7 +965,7 @@
if (theVectorSize > 1)
{
- if (!isXMLLetterOrDigit(charAt(tokenVector.back(), 0)))
+ if (!isXMLLetterOrDigit(tokenVector.back()[0]))
{
// Move the iterator back one, so it's pointing
// at the trailing string...
@@ -991,18 +991,18 @@
{
if (it != trailerStrIt)
{
- assert(isXMLLetterOrDigit(charAt(*it, 0)));
+ assert(isXMLLetterOrDigit((*it)[0]));
numberWidth = it->length();
- numberType = charAt(*it, numberWidth - 1);
+ numberType = (*it)[numberWidth - 1];
++it;
}
if (it != trailerStrIt)
{
- assert(!isXMLLetterOrDigit(charAt(*it, 0)));
+ assert(!isXMLLetterOrDigit((*it)[0]));
sepStringIt = it;
@@ -1030,7 +1030,7 @@
theResult += XalanUnicode::charFullStop;
}
- clear(theIntermediateResult);
+ theIntermediateResult.clear();
}
}
@@ -1049,7 +1049,7 @@
{
if (m_lettervalue_avt == 0)
{
- clear(value);
+ value.clear();
}
else
{
@@ -1321,7 +1321,7 @@
}
else
{
- assign(theResult, buf, charPos);
+ theResult.assign(buf, charPos);
}
}
@@ -1432,7 +1432,7 @@
for (XalanDOMString::size_type i = 0; i < nPadding; i++)
{
- insert(theResult, 0, padString);
+ theResult.insert(0, padString);
}
}
}
@@ -1459,9 +1459,9 @@
}
else
{
- const XalanDOMChar theChar = charAt(table, val - 1);
+ const XalanDOMChar theChar = table[val - 1];
- assign(theResult, &theChar, 1);
+ theResult.assign(1, theChar);
}
}
@@ -1551,7 +1551,7 @@
}
while (val > 0);
- assign(theResult, buf + charPos + 1, buflen - charPos - 1);
+ theResult.assign(buf + charPos + 1, buflen - charPos - 1);
}
@@ -1572,7 +1572,7 @@
}
else
{
- clear(theResult);
+ theResult.clear();
size_t place = 0;
@@ -1636,15 +1636,15 @@
{
if (m_currentPosition >= m_maxPosition)
{
- clear(theToken);
+ theToken.clear();
}
const size_type start = m_currentPosition;
- if (isXMLLetterOrDigit(charAt(*m_string, m_currentPosition)))
+ if (isXMLLetterOrDigit((*m_string)[m_currentPosition]))
{
while (m_currentPosition < m_maxPosition &&
- isXMLLetterOrDigit(charAt(*m_string, m_currentPosition)))
+ isXMLLetterOrDigit((*m_string)[m_currentPosition]))
{
m_currentPosition++;
}
@@ -1652,7 +1652,7 @@
else
{
while (m_currentPosition < m_maxPosition &&
- !isXMLLetterOrDigit(charAt(*m_string, m_currentPosition)))
+ !isXMLLetterOrDigit((*m_string)[m_currentPosition]))
{
m_currentPosition++;
}
@@ -1673,10 +1673,10 @@
// non-alphabetic characters
while (currpos < m_maxPosition)
{
- if (isXMLLetterOrDigit(charAt(*m_string, currpos)))
+ if (isXMLLetterOrDigit((*m_string)[currpos]))
{
while (currpos < m_maxPosition &&
- isXMLLetterOrDigit(charAt(*m_string, currpos)))
+ isXMLLetterOrDigit((*m_string)[currpos]))
{
currpos++;
}
@@ -1684,7 +1684,7 @@
else
{
while (currpos < m_maxPosition &&
- !isXMLLetterOrDigit(charAt(*m_string, currpos)))
+ !isXMLLetterOrDigit((*m_string)[currpos]))
{
currpos++;
}
Modified: xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/ElemTemplateElement.cpp Thu Sep 18 11:50:36 2008
@@ -343,7 +343,7 @@
{
assert(m_textLiteralChild != 0);
- assign(result, m_textLiteralChild->getText(), m_textLiteralChild->getLength());
+ result.assign(m_textLiteralChild->getText(), m_textLiteralChild->getLength());
return 0;
}
Modified: xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/FunctionGenerateID.cpp Thu Sep 18 11:50:36 2008
@@ -66,7 +66,7 @@
// unique address that we can convert into a string...
PointerToDOMString(theNode->getOwnerDocument(), theResult);
- append(theResult, XalanDOMChar(XalanUnicode::charLetter_N));
+ theResult.append(1, XalanUnicode::charLetter_N);
PointerToDOMString(theNode, theResult);
}
Modified: xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/KeyTable.cpp Thu Sep 18 11:50:36 2008
@@ -318,7 +318,7 @@
theKeys[*kd.getQName()][nodeData],
testNode);
- clear(nodeData);
+ nodeData.clear();
}
}
}
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetConstructionContextDefault.cpp Thu Sep 18 11:50:36 2008
@@ -446,7 +446,7 @@
{
assert(str != 0);
- assign(m_tempBuffer, str);
+ m_tempBuffer.assign(str);
return createMatchPattern(
locator,
@@ -501,7 +501,7 @@
{
assert(str != 0);
- assign(m_tempBuffer, str);
+ m_tempBuffer.assign(str);
return createXPath(
locator,
@@ -524,7 +524,7 @@
{
assert(str != 0);
- assign(m_tempBuffer, str, len);
+ m_tempBuffer.assign(str, len);
return createXPath(
locator,
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp Thu Sep 18 11:50:36 2008
@@ -596,7 +596,7 @@
// If we found a ':' before the end of the string, and
// it's by itself (:: would indicate an axis), don't
// try to cache the XPath...
- if (index < len - 1 && (charAt(str, index + 1) != XalanUnicode::charColon))
+ if (index < len - 1 && str[index + 1] != XalanUnicode::charColon)
{
theResult = m_xsltProcessor->createMatchPattern(str, resolver);
}
Modified: xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp Thu Sep 18 11:50:36 2008
@@ -1587,7 +1587,7 @@
}
else
{
- clear(m_accumulateText);
+ m_accumulateText.clear();
}
}
@@ -1612,7 +1612,7 @@
void
StylesheetHandler::resetDocument()
{
- clear(m_accumulateText);
+ m_accumulateText.clear();
}
@@ -1725,7 +1725,7 @@
{
if (m_inTemplate)
{
- append(m_accumulateText, chars, length);
+ m_accumulateText.append(chars, length);
}
}
@@ -1738,7 +1738,7 @@
{
processText(m_accumulateText.c_str(), m_accumulateText.length());
- clear(m_accumulateText);
+ m_accumulateText.clear();
}
}
@@ -1914,7 +1914,7 @@
m_inExtensionElementStack(theHandler.getMemoryManager()),
m_preserveSpaceStack(theHandler.getMemoryManager())
{
- clear(m_handler.m_accumulateText);
+ m_handler.m_accumulateText.clear();
m_handler.m_elemStack.clear();
m_handler.m_pTemplate = 0;
@@ -1938,7 +1938,7 @@
StylesheetHandler::PushPopIncludeState::~PushPopIncludeState()
{
- clear(m_handler.m_accumulateText);
+ m_handler.m_accumulateText.clear();
m_handler.m_elemStack = m_elemStack;
m_handler.m_pTemplate = m_pTemplate;
Modified: xalan/c/trunk/src/xalanc/XSLT/TracerEvent.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/TracerEvent.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/TracerEvent.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/TracerEvent.cpp Thu Sep 18 11:50:36 2008
@@ -56,7 +56,7 @@
PointerToDOMString(&n, r);
- append(r, " ");
+ r.append(" ");
if (n.getNodeType() == XalanNode::ELEMENT_NODE)
{
@@ -115,7 +115,7 @@
PointerToDOMString(&l, r);
- append(r, XalanDOMString("[", r.getMemoryManager()));
+ r.append(XalanDOMString("[", r.getMemoryManager()));
const XalanSize_t len = l.getLength();
XalanSize_t i = 0;
Modified: xalan/c/trunk/src/xalanc/XSLT/XResultTreeFrag.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XResultTreeFrag.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XResultTreeFrag.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XResultTreeFrag.cpp Thu Sep 18 11:50:36 2008
@@ -318,7 +318,7 @@
{
m_singleTextChildValue = 0;
- clear(m_cachedStringValue);
+ m_cachedStringValue.clear();
m_cachedNumberValue = theBogusNumberValue;
Modified: xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp (original)
+++ xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp Thu Sep 18 11:50:36 2008
@@ -2976,12 +2976,12 @@
{
do
{
- assign(m_scratchString, s_uniqueNamespacePrefix);
+ m_scratchString.assign(s_uniqueNamespacePrefix);
NumberToDOMString(m_uniqueNSValue++, m_scratchString);
} while(getResultNamespaceForPrefix(m_scratchString) != 0);
- append(theValue, m_scratchString);
+ theValue.append(m_scratchString);
}
Modified: xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanExtensions/FunctionDistinct.cpp Thu Sep 18 11:50:36 2008
@@ -114,7 +114,7 @@
}
- clear(theCachedString);
+ theCachedString.clear();
}
}
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp Thu Sep 18 11:50:36 2008
@@ -112,7 +112,7 @@
m_lastChildStack.reserve(eDefaultStackSize);
- clear(m_textBuffer);
+ m_textBuffer.clear();
m_textBuffer.reserve(eDefaultTextBufferSize);
@@ -265,7 +265,7 @@
{
if (m_documentFragment != 0)
{
- append(m_textBuffer, chars, length);
+ m_textBuffer.append(chars, length);
}
else if (m_currentElement == 0)
{
@@ -276,7 +276,7 @@
}
else
{
- append(m_textBuffer, chars, length);
+ m_textBuffer.append(chars, length);
}
}
@@ -398,7 +398,7 @@
m_textBuffer.c_str(),
m_textBuffer.length());
- clear(m_textBuffer);
+ m_textBuffer.clear();
}
}
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp Thu Sep 18 11:50:36 2008
@@ -80,7 +80,7 @@
}
else if (m_accumulateText == true)
{
- append(m_textBuffer, chars, length);
+ m_textBuffer.append(chars, length);
}
else
{
@@ -263,7 +263,7 @@
if (m_accumulateText == true)
{
- clear(m_textBuffer);
+ m_textBuffer.clear();
m_textBuffer.reserve(eDefaultTextBufferSize);
}
@@ -493,7 +493,7 @@
m_textBuffer.c_str(),
m_textBuffer.length());
- clear(m_textBuffer);
+ m_textBuffer.clear();
}
}
Modified: xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp (original)
+++ xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeDocument.cpp Thu Sep 18 11:50:36 2008
@@ -875,7 +875,7 @@
if (theColonIndex != theLength)
{
// Get the prefix from theName...
- assign(thePrefix, theName, theColonIndex);
+ thePrefix.assign(theName, theColonIndex);
assert(thePrefix.empty() == false);
if (theLocalName != 0)
@@ -887,7 +887,7 @@
}
else
{
- clear(thePrefix);
+ thePrefix.clear();
if (theLocalName != 0)
{
Modified: xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp?rev=696764&r1=696763&r2=696764&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp (original)
+++ xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp Thu Sep 18 11:50:36 2008
@@ -245,7 +245,7 @@
{
processAccumulatedText();
- assign(m_buffer, chars, length);
+ m_buffer.assign(chars, length);
append(m_doc->createTextNode(m_buffer.c_str()));
}
@@ -309,7 +309,7 @@
{
processAccumulatedText();
- assign(m_buffer, ch, length);
+ m_buffer.assign(ch, length);
append(m_doc->createCDATASection(m_buffer.c_str()));
}
@@ -424,7 +424,7 @@
{
append(m_doc->createTextNode(m_textBuffer.c_str()));
- clear(m_textBuffer);
+ m_textBuffer.clear();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org