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 2007/09/04 19:59:31 UTC
svn commit: r572759 [1/2] - in /xalan/c/trunk/src/xalanc: DOMSupport/
Include/ PlatformSupport/ Utils/MsgCreator/ XMLSupport/ XPath/ XSLT/
XalanDOM/ XalanSourceTree/ XercesParserLiaison/
Author: dbertoni
Date: Tue Sep 4 10:59:27 2007
New Revision: 572759
URL: http://svn.apache.org/viewvc?rev=572759&view=rev
Log:
Patch for Jira issue XALANC-652.
Modified:
xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp
xalan/c/trunk/src/xalanc/DOMSupport/DOMSupportDefault.cpp
xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp
xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/FormatterListener.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp
xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanLocator.hpp
xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.cpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.hpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.hpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.cpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.hpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp
xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.hpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.hpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp
xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp
xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp
xalan/c/trunk/src/xalanc/XMLSupport/XalanIndentWriter.hpp
xalan/c/trunk/src/xalanc/XMLSupport/XalanUTF16Writer.hpp
xalan/c/trunk/src/xalanc/XMLSupport/XalanUTF8Writer.hpp
xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp
xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp
xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.cpp
xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.hpp
xalan/c/trunk/src/xalanc/XPath/XObject.hpp
xalan/c/trunk/src/xalanc/XPath/XPath.hpp
xalan/c/trunk/src/xalanc/XPath/XPathConstructionContext.hpp
xalan/c/trunk/src/xalanc/XPath/XPathExecutionContext.hpp
xalan/c/trunk/src/xalanc/XPath/XPathExecutionContextDefault.hpp
xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.cpp
xalan/c/trunk/src/xalanc/XPath/XPathProcessorImpl.hpp
xalan/c/trunk/src/xalanc/XSLT/CountersTable.hpp
xalan/c/trunk/src/xalanc/XSLT/DecimalToRoman.hpp
xalan/c/trunk/src/xalanc/XSLT/ElemCopy.cpp
xalan/c/trunk/src/xalanc/XSLT/ElemValueOf.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContext.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.cpp
xalan/c/trunk/src/xalanc/XSLT/StylesheetHandler.hpp
xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.cpp
xalan/c/trunk/src/xalanc/XSLT/XSLTEngineImpl.hpp
xalan/c/trunk/src/xalanc/XSLT/XSLTProcessor.hpp
xalan/c/trunk/src/xalanc/XalanDOM/XalanDOMString.hpp
xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.cpp
xalan/c/trunk/src/xalanc/XalanSourceTree/FormatterToSourceTree.hpp
xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.cpp
xalan/c/trunk/src/xalanc/XalanSourceTree/XalanSourceTreeContentHandler.hpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.cpp
xalan/c/trunk/src/xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp
Modified: xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp (original)
+++ xalan/c/trunk/src/xalanc/DOMSupport/DOMServices.hpp Tue Sep 4 10:59:27 2007
@@ -205,7 +205,7 @@
append(data, text.getData());
}
- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int);
+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type);
/**
* Sends the data for a node to a FormatterListener
Modified: xalan/c/trunk/src/xalanc/DOMSupport/DOMSupportDefault.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/DOMSupport/DOMSupportDefault.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/DOMSupport/DOMSupportDefault.cpp (original)
+++ xalan/c/trunk/src/xalanc/DOMSupport/DOMSupportDefault.cpp Tue Sep 4 10:59:27 2007
@@ -92,18 +92,14 @@
if (theNode != 0 && theNode->getNodeType() == XalanNode::ENTITY_NODE)
{
- const XalanEntity* theEntity =
+ const XalanEntity* const theEntity =
#if defined(XALAN_OLD_STYLE_CASTS)
(const XalanEntity*)theNode;
#else
static_cast<const XalanEntity*>(theNode);
#endif
- const XalanDOMString theNotationName(
- theEntity->getNotationName(),
- theMemoryManager);
-
- if(isEmpty(theNotationName) == false) // then it's unparsed
+ if(length(theEntity->getNotationName()) != 0) // then it's unparsed
{
// The draft says: "The XSLT processor may use the public
// identifier to generate a URI for the entity instead of the URI
@@ -116,7 +112,7 @@
// So I'm falling a bit short here.
theURI = theEntity->getSystemId();
- if(isEmpty(theURI) == true)
+ if(theURI.length() == 0)
{
theURI = theEntity->getPublicId();
}
Modified: xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/PlatformDefinitions.hpp Tue Sep 4 10:59:27 2007
@@ -119,6 +119,14 @@
XALAN_CPP_NAMESPACE_BEGIN
+#if XERCES_VERSION_MAJOR < 3
+typedef unsigned int XalanSize_t;
+typedef unsigned int XalanFilePos;
+#else
+typedef XMLSize_t XalanSize_t;
+typedef XMLFilePos XalanFilePos;
+#endif
+
typedef XMLCh XalanDOMChar;
template<bool value>
Modified: xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp (original)
+++ xalan/c/trunk/src/xalanc/Include/VCPPDefinitions.hpp Tue Sep 4 10:59:27 2007
@@ -19,7 +19,7 @@
#define VCPPDEFINITIONS_HEADER_GUARD_1357924680
-#pragma warning(disable: 4127 4251 4345 4351 4511 4512 4514 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715)
+#pragma warning(disable: 4127 4251 4345 4351 4511 4512 4514 4521 4702 4710 4711 4786 4097 4503 4786; error: 4150 4172 4238 4239 4715)
// ---------------------------------------------------------------------------
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/DOMStringHelper.hpp Tue Sep 4 10:59:27 2007
@@ -707,7 +707,7 @@
{
public:
- typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const unsigned int);
+ typedef void (FormatterListener::*MemberFunctionPtr)(const XMLCh* const, const FormatterListener::size_type);
static void
DoubleToCharacters(
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/FormatterListener.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/FormatterListener.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/FormatterListener.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/FormatterListener.hpp Tue Sep 4 10:59:27 2007
@@ -60,7 +60,7 @@
typedef XERCES_CPP_NAMESPACE_QUALIFIER DocumentHandler ParentType;
// A handy typedef... Must match DocumentHandler's type for characters(), etc...
- typedef unsigned int size_type;
+ typedef XalanSize_t size_type;
enum eFormat
{
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.cpp Tue Sep 4 10:59:27 2007
@@ -45,7 +45,7 @@
-XMLFilePos
+XalanFilePos
StdBinInputStream::curPos() const
{
return m_stream.tellg();
@@ -53,10 +53,10 @@
-XMLSize_t
+XalanSize_t
StdBinInputStream::readBytes(
XMLByte* const toFill,
- const XMLSize_t maxToRead)
+ const XalanSize_t maxToRead)
{
assert(sizeof(XMLByte) == sizeof(char));
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/StdBinInputStream.hpp Tue Sep 4 10:59:27 2007
@@ -60,13 +60,13 @@
virtual
~StdBinInputStream();
- virtual XMLFilePos
+ virtual XalanFilePos
curPos() const;
- virtual XMLSize_t
+ virtual XalanSize_t
readBytes(
XMLByte* const toFill,
- const XMLSize_t maxToRead);
+ const XalanSize_t maxToRead);
private:
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanLocator.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanLocator.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanLocator.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanLocator.hpp Tue Sep 4 10:59:27 2007
@@ -47,7 +47,11 @@
typedef Locator ParentType;
+#if XERCES_VERSION_MAJOR < 3
+ typedef XMLSSize_t size_type;
+#else
typedef unsigned long size_type;
+#endif
XalanLocator() {}
Modified: xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp (original)
+++ xalan/c/trunk/src/xalanc/PlatformSupport/XalanTranscodingServices.hpp Tue Sep 4 10:59:27 2007
@@ -59,7 +59,7 @@
terminate();
typedef unsigned char XalanXMLByte;
- typedef XMLSize_t size_type;
+ typedef XalanSize_t size_type;
typedef unsigned int UnicodeCharType;
static size_type
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.cpp Tue Sep 4 10:59:27 2007
@@ -30,6 +30,9 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
// -----------------------------------------------------------------------
// Constructors
@@ -64,7 +67,7 @@
void
ICUResHandler::characters(
const XMLCh* const chars,
- const unsigned int length)
+ const XalanSize_t length)
{
if (m_startCollectingCharacters == true)
{
@@ -218,3 +221,7 @@
}
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/ICUResHandler.hpp Tue Sep 4 10:59:27 2007
@@ -26,8 +26,15 @@
#include "SAX2Handler.hpp"
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XERCES_CPP_NAMESPACE_USE
+
+
class ICUResHandler : public SAX2Handler
{
public:
@@ -67,7 +74,7 @@
virtual void
characters(
const XMLCh* const chars,
- const unsigned int length);
+ const XalanSize_t length);
protected:
@@ -100,6 +107,10 @@
bool
operator==(const ICUResHandler&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.cpp Tue Sep 4 10:59:27 2007
@@ -28,6 +28,11 @@
#include "InMemData.hpp"
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// -----------------------------------------------------------------------
// Constructors
// -----------------------------------------------------------------------
@@ -77,8 +82,8 @@
void
InMemHandler::characters(
- const XMLCh* const chars,
- const unsigned int length)
+ const XMLCh* const chars,
+ const XalanSize_t length)
{
if (m_startCollectingCharacters == true)
{
@@ -240,3 +245,7 @@
printToDataFile(szEndDataFile);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/InMemHandler.hpp Tue Sep 4 10:59:27 2007
@@ -26,8 +26,14 @@
#include "SAX2Handler.hpp"
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XERCES_CPP_NAMESPACE_USE
+
class InMemHandler : public SAX2Handler
{
public:
@@ -66,7 +72,7 @@
virtual void
characters(
const XMLCh* const chars,
- const unsigned int length);
+ const XalanSize_t length);
protected:
@@ -103,6 +109,10 @@
bool
operator==(const InMemHandler&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgCreator.cpp Tue Sep 4 10:59:27 2007
@@ -339,7 +339,9 @@
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
#endif
-
+
+ XALAN_CPP_NAMESPACE_USE
+
CmdLineParams theParams;
int iReturnValue = 0;
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.cpp Tue Sep 4 10:59:27 2007
@@ -27,6 +27,11 @@
#include <cstdio>
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
static MsgFileOutputStream::HandleType
openFile(const char* theFileName)
{
@@ -89,7 +94,7 @@
void
MsgFileOutputStream::writeData(
const char* theBuffer,
- unsigned int theBufferLength)
+ XalanSize_t theBufferLength)
{
#if defined(XALAN_STRICT_ANSI_HEADERS)
using std::fwrite;
@@ -179,7 +184,7 @@
void
MsgFileOutputStream::write(
const XMLCh* theString,
- unsigned int theLength)
+ XalanSize_t theLength)
{
assert(theString != 0);
@@ -193,7 +198,7 @@
void
MsgFileOutputStream::write(
const char* theString,
- unsigned int theLength)
+ XalanSize_t theLength)
{
assert (theString != 0);
@@ -212,7 +217,7 @@
void
MsgFileOutputStream::writeAsASCII(
const XMLCh* theString,
- unsigned int theLength)
+ XalanSize_t theLength)
{
char* szString =
XMLString::transcode(theString);
@@ -229,7 +234,7 @@
void
MsgFileOutputStream::writeAsASCII(
const char* theString,
- unsigned int theLength)
+ XalanSize_t theLength)
{
writeData(
theString,
@@ -251,3 +256,7 @@
s_UTF16ByteOrderMark,
1);
}
+
+
+
+XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/MsgFileOutputStream.hpp Tue Sep 4 10:59:27 2007
@@ -29,14 +29,15 @@
-XERCES_CPP_NAMESPACE_USE
+XALAN_CPP_NAMESPACE_BEGIN
+XERCES_CPP_NAMESPACE_USE
-// Class responsible for printing into file with UTF16
+// Class responsible for printing into file with UTF16
class MsgFileOutputStream
{
public :
@@ -102,22 +103,22 @@
void
write(
const XMLCh* theString,
- unsigned int theLength);
+ XalanSize_t theLength);
void
write(
const char* theString,
- unsigned int theLength);
+ XalanSize_t theLength);
void
writeAsASCII(
const char* theString,
- unsigned int theLength);
+ XalanSize_t theLength);
void
writeAsASCII(
const XMLCh* theString,
- unsigned int theLength);
+ XalanSize_t theLength);
void
writeUTFPrefix();
@@ -127,7 +128,7 @@
void
writeData(
const char* theBuffer,
- unsigned int theBufferLength);
+ XalanSize_t theBufferLength);
void
doFlush();
@@ -149,6 +150,11 @@
const HandleType m_handle;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
+
#endif // MSGFILEOUTPUTSTREAM_1357924680
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.cpp Tue Sep 4 10:59:27 2007
@@ -25,6 +25,11 @@
#include <cstdio>
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// -----------------------------------------------------------------------
// Constructors
// -----------------------------------------------------------------------
@@ -59,8 +64,8 @@
void
NLSHandler::characters(
- const XMLCh* const chars,
- const unsigned int length)
+ const XMLCh* const chars,
+ const XalanSize_t length)
{
if (m_startCollectingCharacters == true)
{
@@ -166,3 +171,7 @@
2);
}
}
+
+
+
+XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.hpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/NLSHandler.hpp Tue Sep 4 10:59:27 2007
@@ -24,8 +24,15 @@
#include "ICUResHandler.hpp"
+
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XERCES_CPP_NAMESPACE_USE
+
+
class NLSHandler : public ICUResHandler
{
public:
@@ -52,8 +59,8 @@
void
characters(
- const XMLCh* const chars,
- const unsigned int length);
+ const XMLCh* const chars,
+ const XalanSize_t length);
void
startDocument();
@@ -80,6 +87,10 @@
bool
operator==(const NLSHandler&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.cpp Tue Sep 4 10:59:27 2007
@@ -33,6 +33,10 @@
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
// ---------------------------------------------------------------------------
// SAX2Handler: Constructors and Destructor
// ---------------------------------------------------------------------------
@@ -227,3 +231,7 @@
{
createBottomForIndexFile();
}
+
+
+
+XALAN_CPP_NAMESPACE_END
Modified: xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp (original)
+++ xalan/c/trunk/src/xalanc/Utils/MsgCreator/SAX2Handler.hpp Tue Sep 4 10:59:27 2007
@@ -25,6 +25,10 @@
#include <xercesc/util/XMLUniDefs.hpp>
+XALAN_CPP_NAMESPACE_BEGIN
+
+
+
XERCES_CPP_NAMESPACE_USE
@@ -220,6 +224,11 @@
bool
operator==(const SAX2Handler&) const;
};
+
+
+
+XALAN_CPP_NAMESPACE_END
+
#endif //SAX2HANDLER_1357924680
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.cpp Tue Sep 4 10:59:27 2007
@@ -158,7 +158,7 @@
m_attrCharsMap[XalanUnicode::charLessThanSign] = 0;
m_attrCharsMap[XalanUnicode::charGreaterThanSign] = 0;
- for(XalanDOMString::size_type i = 160; i < SPECIALSSIZE; i++)
+ for(size_type i = 160; i < SPECIALSSIZE; i++)
{
m_attrCharsMap[i] = 'S';
}
@@ -490,7 +490,7 @@
void
FormatterToHTML::characters(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
if(length != 0)
{
@@ -599,7 +599,7 @@
void
FormatterToHTML::cdata(
const XMLCh* const ch,
- const unsigned int length)
+ const size_type length)
{
if(m_isScriptOrStyleElem == true)
{
@@ -641,7 +641,7 @@
const XMLCh* const data)
{
- const XalanDOMString::size_type dataLength = length(data);
+ const size_type dataLength = length(data);
// Use a fairly nasty hack to tell if the next node is supposed to be
// unescaped text.
@@ -698,13 +698,13 @@
void
FormatterToHTML::writeCharacters(
- const XalanDOMChar* theString,
- XalanDOMString::size_type theLength)
+ const XalanDOMChar* theString,
+ size_type theLength)
{
assert(theString != 0);
- XalanDOMString::size_type i = 0;
- XalanDOMString::size_type firstIndex = 0;
+ size_type i = 0;
+ size_type firstIndex = 0;
while(i < theLength)
{
@@ -777,13 +777,13 @@
void
FormatterToHTML::writeAttrString(
- const XalanDOMChar* theString,
- XalanDOMString::size_type theStringLength)
+ const XalanDOMChar* theString,
+ size_type theStringLength)
{
assert(theString != 0);
- XalanDOMString::size_type i = 0;
- XalanDOMString::size_type firstIndex = 0;
+ size_type i = 0;
+ size_type firstIndex = 0;
while(i < theStringLength)
{
@@ -862,8 +862,8 @@
void
FormatterToHTML::copyEntityIntoBuffer(
- const XalanDOMChar* s,
- XalanDOMString::size_type theLength)
+ const XalanDOMChar* s,
+ size_type theLength)
{
assert(s != 0);
@@ -894,11 +894,11 @@
const XalanDOMChar* value,
const XalanHTMLElementsProperties::ElementProperties& elemProperties)
{
- const XalanDOMString::size_type nameLength = length(name);
+ const size_type nameLength = length(name);
accumContent(XalanUnicode::charSpace);
- const XalanDOMString::size_type valueLength = length(value);
+ const size_type valueLength = length(value);
if((valueLength == 0 || equalsIgnoreCaseASCII(name, nameLength, value, valueLength)) &&
elemProperties.isAttribute(name, XalanHTMLElementsProperties::ATTREMPTY) == true)
@@ -928,8 +928,8 @@
void
FormatterToHTML::writeAttrURI(
- const XalanDOMChar* theString,
- XalanDOMString::size_type theStringLength)
+ const XalanDOMChar* theString,
+ size_type theStringLength)
{
assert(theString != 0);
@@ -948,7 +948,7 @@
// causing damage. If the URL is already properly escaped, in theory, this
// function should not change the string value.
- for (XalanDOMString::size_type i = 0; i < theStringLength; ++i)
+ for (size_type i = 0; i < theStringLength; ++i)
{
const XalanDOMChar ch = theString[i];
@@ -1129,10 +1129,10 @@
bool fHasNamespace = false;
- const XalanDOMString::size_type theLength =
+ const size_type theLength =
length(theElementName);
- const XalanDOMString::size_type theColonIndex =
+ const size_type theColonIndex =
indexOf(
theElementName,
XalanUnicode::charColon);
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToHTML.hpp Tue Sep 4 10:59:27 2007
@@ -120,7 +120,7 @@
virtual void
characters(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
// These methods are inherited from FormatterToXML...
@@ -137,7 +137,7 @@
virtual void
cdata(
const XMLCh* const ch,
- const unsigned int length);
+ const size_type length);
virtual void
processingInstruction(
@@ -161,19 +161,19 @@
{
enum { eMaxLength = 8 };
- XalanDOMChar m_char;
+ XalanDOMChar m_char;
- XalanDOMString::size_type m_length;
+ size_type m_length;
- XalanDOMChar m_string[eMaxLength + 1];
+ XalanDOMChar m_string[eMaxLength + 1];
};
protected:
virtual void
writeAttrString(
- const XalanDOMChar* theString,
- XalanDOMString::size_type theStringLength);
+ const XalanDOMChar* theString,
+ size_type theStringLength);
virtual void
accumCommentData(const XalanDOMChar* data);
@@ -183,13 +183,11 @@
void
writeCharacters(
- const XalanDOMChar* theString,
- XalanDOMString::size_type theLength);
+ const XalanDOMChar* theString,
+ size_type theLength);
private:
- typedef XalanDOMString::size_type size_type;
-
/**
* The string "<!DOCTYPE HTML".
*/
@@ -232,8 +230,8 @@
void
copyEntityIntoBuffer(
- const XalanDOMChar* s,
- XalanDOMString::size_type theLength);
+ const XalanDOMChar* s,
+ size_type theLength);
void
copyEntityIntoBuffer(const XalanDOMString& s);
@@ -258,8 +256,8 @@
*/
void
writeAttrURI(
- const XalanDOMChar* theString,
- XalanDOMString::size_type theStringLength);
+ const XalanDOMChar* theString,
+ size_type theStringLength);
/**
* Accumulate the specified character by converting its numeric value to
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.cpp Tue Sep 4 10:59:27 2007
@@ -78,7 +78,7 @@
void
FormatterToNull::characters(
const XMLCh* const /* chars */,
- const unsigned int /* length */)
+ const size_type /* length */)
{
}
@@ -87,7 +87,7 @@
void
FormatterToNull::charactersRaw(
const XMLCh* const /* chars */,
- const unsigned int /*length */)
+ const size_type /*length */)
{
}
@@ -102,7 +102,7 @@
void
FormatterToNull::ignorableWhitespace(
const XMLCh* const /* chars */,
- const unsigned int /* length */)
+ const size_type /* length */)
{
}
@@ -133,8 +133,8 @@
void
FormatterToNull::cdata(
- const XMLCh* const /* ch */,
- const unsigned int /* length */)
+ const XMLCh* const /* ch */,
+ const size_type /* length */)
{
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToNull.hpp Tue Sep 4 10:59:27 2007
@@ -76,12 +76,12 @@
virtual void
characters(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
charactersRaw(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
entityReference(const XMLCh* const name);
@@ -89,7 +89,7 @@
virtual void
ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
processingInstruction(
@@ -106,7 +106,7 @@
virtual void
cdata(
const XMLCh* const ch,
- const unsigned int length);
+ const size_type length);
private:
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.cpp Tue Sep 4 10:59:27 2007
@@ -189,7 +189,7 @@
void
FormatterToText::characters(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
assert(m_writer != 0);
@@ -247,7 +247,7 @@
void
FormatterToText::charactersRaw(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
characters(chars, length);
}
@@ -264,7 +264,7 @@
void
FormatterToText::ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
if (m_handleIgnorableWhitespace == true)
{
@@ -303,7 +303,7 @@
void
FormatterToText::cdata(
const XMLCh* const ch,
- const unsigned int length)
+ const size_type length)
{
characters(ch, length);
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToText.hpp Tue Sep 4 10:59:27 2007
@@ -189,12 +189,12 @@
virtual void
characters(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
charactersRaw(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
entityReference(const XMLCh* const name);
@@ -202,7 +202,7 @@
virtual void
ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
processingInstruction(
@@ -218,7 +218,7 @@
virtual void
cdata(
const XMLCh* const ch,
- const unsigned int length);
+ const size_type length);
private:
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.cpp Tue Sep 4 10:59:27 2007
@@ -696,13 +696,13 @@
void
FormatterToXML::accumNameArray(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length)
{
- const XalanDOMString::size_type n = start + length;
+ const size_type n = start + length;
- for(XalanDOMString::size_type i = start; i < n; ++i)
+ for(size_type i = start; i < n; ++i)
{
accumName(chars[i]);
}
@@ -712,13 +712,13 @@
void
FormatterToXML::accumContentArray(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length)
{
- const XalanDOMString::size_type n = start + length;
+ const size_type n = start + length;
- for(XalanDOMString::size_type i = start; i < n; ++i)
+ for(size_type i = start; i < n; ++i)
{
accumContent(chars[i]);
}
@@ -728,13 +728,13 @@
void
FormatterToXML::accumArrayUTF(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length)
{
- const XalanDOMString::size_type n = start + length;
+ const size_type n = start + length;
- for(XalanDOMString::size_type i = start; i < n; ++i)
+ for(size_type i = start; i < n; ++i)
{
accumCharUTF(chars[i]);
}
@@ -744,9 +744,9 @@
void
FormatterToXML::accumArrayUTFDirect(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length)
{
assert(m_maxCharacter >= 65535);
assert(m_stream != 0);
@@ -855,13 +855,13 @@
-XalanDOMString::size_type
+FormatterToXML::size_type
FormatterToXML::accumDefaultEscape(
- XalanDOMChar ch,
- XalanDOMString::size_type i,
- const XalanDOMChar chars[],
- XalanDOMString::size_type len,
- bool escLF)
+ XalanDOMChar ch,
+ size_type i,
+ const XalanDOMChar chars[],
+ size_type len,
+ bool escLF)
{
if(!accumDefaultEntity(ch, escLF))
{
@@ -1252,7 +1252,7 @@
void
FormatterToXML::characters(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
if(length != 0)
{
@@ -1272,8 +1272,8 @@
m_ispreserve = true;
- unsigned int i = 0;
- unsigned int firstIndex = 0;
+ size_type i = 0;
+ size_type firstIndex = 0;
while(i < length)
{
@@ -1312,7 +1312,7 @@
void
FormatterToXML::charactersRaw(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
writeParentTagEnd();
@@ -1372,13 +1372,13 @@
void
FormatterToXML::writeAttrString(
- const XalanDOMChar* theString,
- XalanDOMString::size_type theStringLength)
+ const XalanDOMChar* theString,
+ size_type theStringLength)
{
assert(theString != 0);
- XalanDOMString::size_type i = 0;
- XalanDOMString::size_type firstIndex = 0;
+ size_type i = 0;
+ size_type firstIndex = 0;
while(i < theStringLength)
{
@@ -1417,14 +1417,14 @@
void
FormatterToXML::writeNormalizedChars(
- const XalanDOMChar ch[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length,
- bool isCData)
+ const XalanDOMChar ch[],
+ size_type start,
+ size_type length,
+ bool isCData)
{
- XalanDOMString::size_type end = start + length;
+ size_type end = start + length;
- for(XalanDOMString::size_type i = start; i < end; i++)
+ for(size_type i = start; i < end; ++i)
{
const XalanDOMChar c = ch[i];
@@ -1589,7 +1589,7 @@
void
FormatterToXML::ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
#if 1
// We need to do normalization, which is slower,
@@ -1672,7 +1672,7 @@
void
FormatterToXML::cdata(
const XMLCh* const ch,
- const unsigned int length)
+ const size_type length)
{
if(m_nextIsRaw == true)
{
@@ -1833,10 +1833,10 @@
void
FormatterToXML::accumNormalizedPIData(
- const XalanDOMChar* theData,
- XalanDOMString::size_type theLength)
+ const XalanDOMChar* theData,
+ size_type theLength)
{
- for (XalanDOMString::size_type i = 0; i < theLength; ++i)
+ for (size_type i = 0; i < theLength; ++i)
{
accumContent(theData[i]);
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXML.hpp Tue Sep 4 10:59:27 2007
@@ -148,12 +148,12 @@
virtual void
characters(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
charactersRaw(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
entityReference(const XMLCh* const name);
@@ -161,7 +161,7 @@
virtual void
ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
processingInstruction(
@@ -178,7 +178,7 @@
virtual void
cdata(
const XMLCh* const ch,
- const unsigned int length);
+ const size_type length);
virtual Writer*
getWriter() const;
@@ -296,8 +296,8 @@
typedef void (FormatterToXML::*AccumArrayFunctionType)(
const XalanDOMChar[],
- XalanDOMString::size_type,
- XalanDOMString::size_type);
+ size_type,
+ size_type);
typedef void (FormatterToXML::*FlushFunctionType)();
@@ -376,9 +376,9 @@
*/
void
accumName(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length)
{
assert(m_accumNameArrayFunction != 0);
@@ -394,9 +394,9 @@
*/
void
accumContent(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length)
{
assert(m_accumContentArrayFunction != 0);
@@ -436,13 +436,13 @@
/**
* Escape and accum a character.
*/
- XalanDOMString::size_type
+ size_type
accumDefaultEscape(
- XalanDOMChar ch,
- XalanDOMString::size_type i,
- const XalanDOMChar chars[],
- XalanDOMString::size_type len,
- bool escLF);
+ XalanDOMChar ch,
+ size_type i,
+ const XalanDOMChar chars[],
+ size_type len,
+ bool escLF);
/**
* Handle one of the default entities, return false if it
@@ -515,10 +515,10 @@
*/
virtual void
writeNormalizedChars(
- const XalanDOMChar ch[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length,
- bool isCData);
+ const XalanDOMChar ch[],
+ size_type start,
+ size_type length,
+ bool isCData);
/**
* Write a number into the buffer as an entity
@@ -536,8 +536,8 @@
*/
virtual void
writeAttrString(
- const XalanDOMChar* theString,
- XalanDOMString::size_type theStringLength);
+ const XalanDOMChar* theString,
+ size_type theStringLength);
/**
* Write the data for a comment
@@ -855,9 +855,9 @@
*/
void
accumNameArray(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length);
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length);
/**
* Append an array of wide character to the buffer.
@@ -870,9 +870,9 @@
*/
void
accumContentArray(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length);
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length);
/**
* Append an array of wide character to the buffer.
@@ -885,9 +885,9 @@
*/
void
accumArrayUTF(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length);
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length);
/**
* Append an array of wide character to the output.
@@ -900,9 +900,9 @@
*/
void
accumArrayUTFDirect(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length);
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length);
/**
* Append a string to the buffer.
@@ -976,8 +976,8 @@
*/
void
accumNormalizedPIData(
- const XalanDOMChar* theData,
- XalanDOMString::size_type theLength);
+ const XalanDOMChar* theData,
+ size_type theLength);
// Data members...
@@ -1020,7 +1020,7 @@
*/
const XalanDOMString m_attrSpecialChars;
- typedef XalanDOMString::size_type size_type;
+ //typedef XalanDOMString::size_type size_type;
/**
* The string "<!DOCTYPE ".
Modified: xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/FormatterToXMLUnicode.hpp Tue Sep 4 10:59:27 2007
@@ -237,7 +237,7 @@
virtual void
charactersRaw(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
writeParentTagEnd();
@@ -395,7 +395,7 @@
m_writer.write(value_type(XalanUnicode::charQuestionMark));
writeName(target);
- const XalanDOMString::size_type len = length(data);
+ const size_type len = length(data);
// We need to make sure there is a least one whitespace character
// between the target and the data.
@@ -413,7 +413,7 @@
void
writeCharacters(
const XMLCh* chars,
- unsigned int length)
+ size_type length)
{
assert(length != 0);
@@ -421,8 +421,8 @@
m_indentHandler.setPreserve(true);
- unsigned int i = 0;
- unsigned int firstIndex = 0;
+ size_type i = 0;
+ size_type firstIndex = 0;
while(i < length)
{
@@ -463,7 +463,7 @@
void
writeCDATA(
const XMLCh* chars,
- unsigned int length)
+ size_type length)
{
assert(length != 0);
@@ -635,12 +635,12 @@
* @param start the start offset into the string.
* @param length the length of the string.
*/
- XalanDOMString::size_type
+ size_type
writeNormalizedChar(
- XalanDOMChar ch,
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ XalanDOMChar ch,
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length)
{
if (XalanUnicode::charLF == ch)
{
@@ -676,11 +676,11 @@
m_writer.write(value_type(XalanUnicode::charSemicolon));
}
- XalanDOMString::size_type
+ size_type
writeNormalizedCharBig(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length)
{
assert( start < length);
@@ -709,11 +709,11 @@
*/
void
writeCDATAChars(
- const XalanDOMChar chars[],
- XalanDOMString::size_type length,
- bool& outsideCDATA)
+ const XalanDOMChar chars[],
+ size_type length,
+ bool& outsideCDATA)
{
- XalanDOMString::size_type i = 0;
+ size_type i = 0;
while(i < length)
{
@@ -792,13 +792,13 @@
*/
void
writeAttrString(
- const XalanDOMChar* theString,
- XalanDOMString::size_type theStringLength)
+ const XalanDOMChar* theString,
+ size_type theStringLength)
{
assert(theString != 0);
- XalanDOMString::size_type i = 0;
- XalanDOMString::size_type firstIndex = 0;
+ size_type i = 0;
+ size_type firstIndex = 0;
while(i < theStringLength)
{
@@ -860,10 +860,10 @@
*/
void
writeNormalizedData(
- const XalanDOMChar* theData,
- XalanDOMString::size_type theLength)
+ const XalanDOMChar* theData,
+ size_type theLength)
{
- for (XalanDOMString::size_type i = 0; i < theLength; ++i)
+ for (size_type i = 0; i < theLength; ++i)
{
const XalanDOMChar theChar = theData[i];
@@ -873,8 +873,8 @@
void
safeWriteContent(
- const XalanDOMChar* theChars,
- XalanDOMString::size_type theLength)
+ const XalanDOMChar* theChars,
+ size_type theLength)
{
for(size_type i = 0; i < theLength; ++i)
{
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanFormatterWriter.hpp Tue Sep 4 10:59:27 2007
@@ -26,6 +26,7 @@
#include <xercesc/sax/SAXException.hpp>
#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
+#include <xalanc/PlatformSupport/FormatterListener.hpp>
#include <xalanc/PlatformSupport/Writer.hpp>
#include <xalanc/PlatformSupport/XalanMessageLoader.hpp>
#include <xalanc/PlatformSupport/XalanOutputStream.hpp>
@@ -44,6 +45,9 @@
{
public:
+ typedef FormatterListener::size_type size_type;
+
+
template <class WriterType>
class NewLineWriterFunctor
{
@@ -92,14 +96,14 @@
/**
* The length of the the string of characters that represents the newline
*/
- XalanDOMString::size_type m_newlineStringLength;
+ size_type m_newlineStringLength;
};
template<class WriterType>
class WhiteSpaceWriterFunctor
{
- typedef XalanDOMString::size_type size_type;
typedef typename WriterType::value_type value_type;
+
public:
typedef WriterType writer_type;
@@ -152,9 +156,6 @@
public:
- typedef XalanDOMString::size_type size_type;
-
-
XalanFormatterWriter(
Writer& theWriter,
MemoryManager& theMemoryManager) :
@@ -315,7 +316,7 @@
/**
* The length of the the string of characters that represents the newline
*/
- XalanDOMString::size_type m_newlineStringLength;
+ size_type m_newlineStringLength;
/**
* Format a code point as a numeric character reference.
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanIndentWriter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanIndentWriter.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanIndentWriter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanIndentWriter.hpp Tue Sep 4 10:59:27 2007
@@ -24,18 +24,21 @@
#include <xalanc/Include/XalanVector.hpp>
+#include <xalanc/PlatformSupport/FormatterListener.hpp>
#include <xalanc/PlatformSupport/Writer.hpp>
XALAN_CPP_NAMESPACE_BEGIN
-template<class WhiteSpaceWriter,
- class NewLineWriter>
+template<
+ class WhiteSpaceWriter,
+ class NewLineWriter>
class XalanIndentWriter
{
public:
- typedef typename XalanDOMString::size_type size_type;
+
+ typedef FormatterListener::size_type size_type;
typedef XalanVector<bool> BoolStackType;
typedef typename WhiteSpaceWriter::writer_type writer_type;
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanUTF16Writer.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanUTF16Writer.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanUTF16Writer.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanUTF16Writer.hpp Tue Sep 4 10:59:27 2007
@@ -58,10 +58,10 @@
size_type
writeCDATAChar(
- const XalanDOMChar chars[],
- size_type start,
- size_type /*length*/,
- bool& /* outsideCDATA */)
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type /*length*/,
+ bool& /* outsideCDATA */)
{
assert( chars != 0 );
@@ -71,28 +71,34 @@
}
/**
- * Writes name chars , if not presentable, throws
+ * Writes name chars, if not representable, throws
*/
- void writeNameChar(const XalanDOMChar* data,
- size_type theLength)
+ void
+ writeNameChar(
+ const XalanDOMChar* data,
+ size_type theLength)
{
write(data, theLength);
}
/**
- * Writes name chars , if not presentable, throws
+ * Writes name chars, if not representable, throws
*/
- void writePIChars(const XalanDOMChar* data,
- size_type theLength)
+ void
+ writePIChars(
+ const XalanDOMChar* data,
+ size_type theLength)
{
write(data, theLength);
}
/**
- * Writes name chars , if not presentable, throws
+ * Writes name chars, if not representable, throws
*/
- void writeCommentChars(const XalanDOMChar* data,
- size_type theLength)
+ void
+ writeCommentChars(
+ const XalanDOMChar* data,
+ size_type theLength)
{
write(data, theLength);
}
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanUTF8Writer.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanUTF8Writer.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanUTF8Writer.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanUTF8Writer.hpp Tue Sep 4 10:59:27 2007
@@ -152,34 +152,40 @@
/**
* Writes name chars , if not presentable, throws
*/
- void writeNameChar(const XalanDOMChar* data,
- size_type theLength)
+ void
+ writeNameChar(
+ const XalanDOMChar* data,
+ size_type theLength)
{
write(data, theLength);
}
/**
- * Writes name chars , if not presentable, throws
+ * Writes name chars, if not representable, throws
*/
- void writePIChars(const XalanDOMChar* data,
- size_type theLength)
+ void
+ writePIChars(
+ const XalanDOMChar* data,
+ size_type theLength)
{
write(data, theLength);
}
/**
- * Writes name chars , if not presentable, throws
+ * Writes name chars, if not representable, throws
*/
- void writeCommentChars(const XalanDOMChar* data,
- size_type theLength)
+ void
+ writeCommentChars(
+ const XalanDOMChar* data,
+ size_type theLength)
{
write(data, theLength);
}
void
safeWriteContent(
- const XalanDOMChar* theChars,
- XalanDOMString::size_type theLength)
+ const XalanDOMChar* theChars,
+ size_type theLength)
{
for(size_type i = 0; i < theLength; ++i)
{
@@ -189,8 +195,8 @@
void
write(
- const value_type* theChars,
- XalanDOMString::size_type theLength)
+ const value_type* theChars,
+ size_type theLength)
{
#if defined(NDEBUG)
if (theLength > sizeof(m_buffer))
@@ -216,7 +222,7 @@
m_bufferRemaining -= theLength;
}
#else
- for(XalanDOMString::size_type i = 0; i < theLength; ++i)
+ for(size_type i = 0; i < theLength; ++i)
{
write(theChars[i]);
}
@@ -253,8 +259,8 @@
void
write(
- const XalanDOMChar* theChars,
- XalanDOMString::size_type theLength)
+ const XalanDOMChar* theChars,
+ size_type theLength)
{
for(size_type i = 0; i < theLength; ++i)
{
@@ -264,13 +270,13 @@
size_type
write(
- const XalanDOMChar chars[],
- XalanDOMString::size_type start,
- XalanDOMString::size_type length)
+ const XalanDOMChar chars[],
+ size_type start,
+ size_type length)
{
XalanDOMChar ch = chars[start];
- if (XalanFormatterWriter::isUTF16HighSurrogate(ch) == false)
+ if (isUTF16HighSurrogate(ch) == false)
{
write((unsigned int)ch);
}
@@ -278,7 +284,7 @@
{
if (start + 1 >= length)
{
- XalanFormatterWriter::throwInvalidUTF16SurrogateException(
+ throwInvalidUTF16SurrogateException(
ch,
0,
getMemoryManager());
@@ -286,7 +292,7 @@
else
{
write(
- XalanFormatterWriter::decodeUTF16SurrogatePair(
+ decodeUTF16SurrogatePair(
ch,
chars[++start],
getMemoryManager()));
@@ -298,8 +304,8 @@
void
writeSafe(
- const XalanDOMChar* theChars,
- XalanDOMString::size_type theLength)
+ const XalanDOMChar* theChars,
+ size_type theLength)
{
XalanDOMChar ch = 0;
@@ -307,15 +313,15 @@
{
ch = theChars[i];
- if (XalanFormatterWriter::isUTF16HighSurrogate(ch) == true)
+ if (isUTF16HighSurrogate(ch) == true)
{
if (i + 1 >= theLength)
{
- XalanFormatterWriter::throwInvalidUTF16SurrogateException(ch, 0, getMemoryManager());
+ throwInvalidUTF16SurrogateException(ch, 0, getMemoryManager());
}
else
{
- write(XalanFormatterWriter::decodeUTF16SurrogatePair(ch, theChars[i+1], getMemoryManager()));
+ write(decodeUTF16SurrogatePair(ch, theChars[i + 1], getMemoryManager()));
++i;
}
@@ -412,7 +418,7 @@
}
else
{
- XalanFormatterWriter::throwInvalidCharacterException(theChar, getMemoryManager());
+ throwInvalidCharacterException(theChar, getMemoryManager());
}
}
@@ -423,11 +429,11 @@
// Data members...
- value_type m_buffer[kBufferSize];
+ value_type m_buffer[kBufferSize];
- value_type* m_bufferPosition;
+ value_type* m_bufferPosition;
- XalanDOMString::size_type m_bufferRemaining;
+ size_type m_bufferRemaining;
};
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.cpp Tue Sep 4 10:59:27 2007
@@ -260,7 +260,7 @@
void
XalanXMLSerializerBase::characters(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
if(length != 0)
{
@@ -282,7 +282,7 @@
void
XalanXMLSerializerBase::cdata(
const XMLCh* const ch,
- const unsigned int length)
+ const size_type length)
{
if (length != 0)
{
@@ -324,7 +324,7 @@
void
XalanXMLSerializerBase::ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length)
+ const size_type length)
{
if (length > 0)
{
@@ -390,7 +390,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::s_xhtmlDocTypeStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::s_xhtmlDocTypeStringLength =
FXML_SIZE(s_xhtmlDocTypeString);
@@ -491,7 +491,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderStartStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderStartStringLength =
FXML_SIZE(s_doctypeHeaderStartString);
const char XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicString[] =
@@ -508,7 +508,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderPublicStringLength =
FXML_SIZE(s_doctypeHeaderPublicString);
const char XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemString[] =
@@ -525,7 +525,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_doctypeHeaderSystemStringLength =
FXML_SIZE(s_doctypeHeaderSystemString);
const char XalanXMLSerializerBase::UTF8::s_xmlHeaderStartString[] =
@@ -548,7 +548,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStartStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStartStringLength =
FXML_SIZE(s_xmlHeaderStartString);
const char XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingString[] =
@@ -568,7 +568,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEncodingStringLength =
FXML_SIZE(s_xmlHeaderEncodingString);
const char XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneString[] =
@@ -590,7 +590,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderStandaloneStringLength =
FXML_SIZE(s_xmlHeaderStandaloneString);
const char XalanXMLSerializerBase::UTF8::s_xmlHeaderEndString[] =
@@ -601,7 +601,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEndStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xmlHeaderEndStringLength =
FXML_SIZE(s_xmlHeaderEndString);
const char XalanXMLSerializerBase::UTF8::s_defaultVersionString[] =
@@ -612,7 +612,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_defaultVersionStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_defaultVersionStringLength =
FXML_SIZE(s_defaultVersionString);
const char XalanXMLSerializerBase::UTF8::s_cdataOpenString[] =
@@ -629,7 +629,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_cdataOpenStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_cdataOpenStringLength =
FXML_SIZE(s_cdataOpenString);
const char XalanXMLSerializerBase::UTF8::s_cdataCloseString[] =
@@ -640,7 +640,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_cdataCloseStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_cdataCloseStringLength =
FXML_SIZE(s_cdataCloseString);
@@ -666,7 +666,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_xhtmlDocTypeStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_xhtmlDocTypeStringLength =
FXML_SIZE(s_xhtmlDocTypeString);
const char XalanXMLSerializerBase::UTF8::s_lessThanEntityString[] =
@@ -678,7 +678,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_lessThanEntityStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_lessThanEntityStringLength =
FXML_SIZE(s_lessThanEntityString);
const char XalanXMLSerializerBase::UTF8::s_greaterThanEntityString[] =
@@ -690,7 +690,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_greaterThanEntityStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_greaterThanEntityStringLength =
FXML_SIZE(s_greaterThanEntityString);
const char XalanXMLSerializerBase::UTF8::s_ampersandEntityString[] =
@@ -703,7 +703,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_ampersandEntityStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_ampersandEntityStringLength =
FXML_SIZE(s_ampersandEntityString);
const char XalanXMLSerializerBase::UTF8::s_quoteEntityString[] =
@@ -717,7 +717,7 @@
char(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF8::s_quoteEntityStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF8::s_quoteEntityStringLength =
FXML_SIZE(s_quoteEntityString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartString[] =
@@ -735,7 +735,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderStartStringLength =
FXML_SIZE(s_doctypeHeaderStartString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicString[] =
@@ -752,7 +752,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderPublicStringLength =
FXML_SIZE(s_doctypeHeaderPublicString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemString[] =
@@ -769,7 +769,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_doctypeHeaderSystemStringLength =
FXML_SIZE(s_doctypeHeaderSystemString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderStartString[] =
@@ -792,7 +792,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStartStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStartStringLength =
FXML_SIZE(s_xmlHeaderStartString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingString[] =
@@ -812,7 +812,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEncodingStringLength =
FXML_SIZE(s_xmlHeaderEncodingString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneString[] =
@@ -834,7 +834,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderStandaloneStringLength =
FXML_SIZE(s_xmlHeaderStandaloneString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_xmlHeaderEndString[] =
@@ -845,7 +845,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEndStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xmlHeaderEndStringLength =
FXML_SIZE(s_xmlHeaderEndString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_defaultVersionString[] =
@@ -856,7 +856,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_defaultVersionStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_defaultVersionStringLength =
FXML_SIZE(s_defaultVersionString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_cdataOpenString[] =
@@ -873,7 +873,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_cdataOpenStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_cdataOpenStringLength =
FXML_SIZE(s_cdataOpenString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_cdataCloseString[] =
@@ -884,7 +884,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_cdataCloseStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_cdataCloseStringLength =
FXML_SIZE(s_cdataCloseString);
@@ -910,7 +910,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_xhtmlDocTypeStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_xhtmlDocTypeStringLength =
FXML_SIZE(s_xhtmlDocTypeString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_lessThanEntityString[] =
@@ -922,7 +922,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_lessThanEntityStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_lessThanEntityStringLength =
FXML_SIZE(s_lessThanEntityString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_greaterThanEntityString[] =
@@ -934,7 +934,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_greaterThanEntityStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_greaterThanEntityStringLength =
FXML_SIZE(s_greaterThanEntityString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_ampersandEntityString[] =
@@ -947,7 +947,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_ampersandEntityStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_ampersandEntityStringLength =
FXML_SIZE(s_ampersandEntityString);
const XalanDOMChar XalanXMLSerializerBase::UTF16::s_quoteEntityString[] =
@@ -961,7 +961,7 @@
XalanDOMChar(0)
};
-const XalanDOMString::size_type XalanXMLSerializerBase::UTF16::s_quoteEntityStringLength =
+const XalanXMLSerializerBase::size_type XalanXMLSerializerBase::UTF16::s_quoteEntityStringLength =
FXML_SIZE(s_quoteEntityString);
Modified: xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp (original)
+++ xalan/c/trunk/src/xalanc/XMLSupport/XalanXMLSerializerBase.hpp Tue Sep 4 10:59:27 2007
@@ -124,12 +124,12 @@
virtual void
characters(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
charactersRaw(
const XMLCh* const chars,
- const unsigned int length) = 0;
+ const size_type length) = 0;
virtual void
entityReference(const XMLCh* const name) = 0;
@@ -137,7 +137,7 @@
virtual void
ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
processingInstruction(
@@ -153,7 +153,7 @@
virtual void
cdata(
const XMLCh* const ch,
- const unsigned int length);
+ const size_type length);
virtual const XalanDOMString&
getDoctypeSystem() const;
@@ -209,107 +209,107 @@
/**
* The string "<!DOCTYPE ".
*/
- static const char s_doctypeHeaderStartString[];
+ static const char s_doctypeHeaderStartString[];
- static const XalanDOMString::size_type s_doctypeHeaderStartStringLength;
+ static const size_type s_doctypeHeaderStartStringLength;
/**
* The string " PUBLIC \"".
*/
- static const char s_doctypeHeaderPublicString[];
+ static const char s_doctypeHeaderPublicString[];
- static const XalanDOMString::size_type s_doctypeHeaderPublicStringLength;
+ static const size_type s_doctypeHeaderPublicStringLength;
/**
* The string " SYSTEM \"".
*/
- static const char s_doctypeHeaderSystemString[];
+ static const char s_doctypeHeaderSystemString[];
- static const XalanDOMString::size_type s_doctypeHeaderSystemStringLength;
+ static const size_type s_doctypeHeaderSystemStringLength;
/**
* The string "<?xml version=\"".
*/
- static const char s_xmlHeaderStartString[];
+ static const char s_xmlHeaderStartString[];
- static const XalanDOMString::size_type s_xmlHeaderStartStringLength;
+ static const size_type s_xmlHeaderStartStringLength;
/**
* The string "\" encoding=\"".
*/
- static const char s_xmlHeaderEncodingString[];
+ static const char s_xmlHeaderEncodingString[];
- static const XalanDOMString::size_type s_xmlHeaderEncodingStringLength;
+ static const size_type s_xmlHeaderEncodingStringLength;
/**
* The string "\" standalone=\"".
*/
- static const char s_xmlHeaderStandaloneString[];
+ static const char s_xmlHeaderStandaloneString[];
- static const XalanDOMString::size_type s_xmlHeaderStandaloneStringLength;
+ static const size_type s_xmlHeaderStandaloneStringLength;
/**
* The string "\"?>".
*/
- static const char s_xmlHeaderEndString[];
+ static const char s_xmlHeaderEndString[];
- static const XalanDOMString::size_type s_xmlHeaderEndStringLength;
+ static const size_type s_xmlHeaderEndStringLength;
/**
* The string "1.0".
*/
- static const char s_defaultVersionString[];
+ static const char s_defaultVersionString[];
- static const XalanDOMString::size_type s_defaultVersionStringLength;
+ static const size_type s_defaultVersionStringLength;
/**
* The string "-//W3C//DTD XHTML".
*/
- static const XalanDOMChar s_xhtmlDocTypeString[];
+ static const XalanDOMChar s_xhtmlDocTypeString[];
- static const XalanDOMString::size_type s_xhtmlDocTypeStringLength;
+ static const size_type s_xhtmlDocTypeStringLength;
/**
* The string "<![CDATA[".
*/
- static const char s_cdataOpenString[];
+ static const char s_cdataOpenString[];
- static const XalanDOMString::size_type s_cdataOpenStringLength;
+ static const size_type s_cdataOpenStringLength;
/**
* The string "]]>".
*/
- static const char s_cdataCloseString[];
+ static const char s_cdataCloseString[];
- static const XalanDOMString::size_type s_cdataCloseStringLength;
+ static const size_type s_cdataCloseStringLength;
/**
* The string "<".
*/
- static const char s_lessThanEntityString[];
+ static const char s_lessThanEntityString[];
- static const XalanDOMString::size_type s_lessThanEntityStringLength;
+ static const size_type s_lessThanEntityStringLength;
/**
* The string ">".
*/
- static const char s_greaterThanEntityString[];
+ static const char s_greaterThanEntityString[];
- static const XalanDOMString::size_type s_greaterThanEntityStringLength;
+ static const size_type s_greaterThanEntityStringLength;
/**
* The string "&".
*/
- static const char s_ampersandEntityString[];
+ static const char s_ampersandEntityString[];
- static const XalanDOMString::size_type s_ampersandEntityStringLength;
+ static const size_type s_ampersandEntityStringLength;
/**
* The string """.
*/
- static const char s_quoteEntityString[];
+ static const char s_quoteEntityString[];
- static const XalanDOMString::size_type s_quoteEntityStringLength;
+ static const size_type s_quoteEntityStringLength;
};
class XALAN_XMLSUPPORT_EXPORT UTF16
@@ -324,107 +324,107 @@
/**
* The string "<!DOCTYPE ".
*/
- static const XalanDOMChar s_doctypeHeaderStartString[];
+ static const XalanDOMChar s_doctypeHeaderStartString[];
- static const XalanDOMString::size_type s_doctypeHeaderStartStringLength;
+ static const size_type s_doctypeHeaderStartStringLength;
/**
* The string " PUBLIC \"".
*/
- static const XalanDOMChar s_doctypeHeaderPublicString[];
+ static const XalanDOMChar s_doctypeHeaderPublicString[];
- static const XalanDOMString::size_type s_doctypeHeaderPublicStringLength;
+ static const size_type s_doctypeHeaderPublicStringLength;
/**
* The string " SYSTEM \"".
*/
- static const XalanDOMChar s_doctypeHeaderSystemString[];
+ static const XalanDOMChar s_doctypeHeaderSystemString[];
- static const XalanDOMString::size_type s_doctypeHeaderSystemStringLength;
+ static const size_type s_doctypeHeaderSystemStringLength;
/**
* The string "<?xml version=\"".
*/
- static const XalanDOMChar s_xmlHeaderStartString[];
+ static const XalanDOMChar s_xmlHeaderStartString[];
- static const XalanDOMString::size_type s_xmlHeaderStartStringLength;
+ static const size_type s_xmlHeaderStartStringLength;
/**
* The string "\" encoding=\"".
*/
- static const XalanDOMChar s_xmlHeaderEncodingString[];
+ static const XalanDOMChar s_xmlHeaderEncodingString[];
- static const XalanDOMString::size_type s_xmlHeaderEncodingStringLength;
+ static const size_type s_xmlHeaderEncodingStringLength;
/**
* The string "\" standalone=\"".
*/
- static const XalanDOMChar s_xmlHeaderStandaloneString[];
+ static const XalanDOMChar s_xmlHeaderStandaloneString[];
- static const XalanDOMString::size_type s_xmlHeaderStandaloneStringLength;
+ static const size_type s_xmlHeaderStandaloneStringLength;
/**
* The string "\"?>".
*/
- static const XalanDOMChar s_xmlHeaderEndString[];
+ static const XalanDOMChar s_xmlHeaderEndString[];
- static const XalanDOMString::size_type s_xmlHeaderEndStringLength;
+ static const size_type s_xmlHeaderEndStringLength;
/**
* The string "1.0".
*/
- static const XalanDOMChar s_defaultVersionString[];
+ static const XalanDOMChar s_defaultVersionString[];
- static const XalanDOMString::size_type s_defaultVersionStringLength;
+ static const size_type s_defaultVersionStringLength;
/**
* The string "-//W3C//DTD XHTML".
*/
- static const XalanDOMChar s_xhtmlDocTypeString[];
+ static const XalanDOMChar s_xhtmlDocTypeString[];
- static const XalanDOMString::size_type s_xhtmlDocTypeStringLength;
+ static const size_type s_xhtmlDocTypeStringLength;
/**
* The string "<![CDATA[".
*/
- static const XalanDOMChar s_cdataOpenString[];
+ static const XalanDOMChar s_cdataOpenString[];
- static const XalanDOMString::size_type s_cdataOpenStringLength;
+ static const size_type s_cdataOpenStringLength;
/**
* The string "]]>".
*/
- static const XalanDOMChar s_cdataCloseString[];
+ static const XalanDOMChar s_cdataCloseString[];
- static const XalanDOMString::size_type s_cdataCloseStringLength;
+ static const size_type s_cdataCloseStringLength;
/**
* The string "<".
*/
- static const XalanDOMChar s_lessThanEntityString[];
+ static const XalanDOMChar s_lessThanEntityString[];
- static const XalanDOMString::size_type s_lessThanEntityStringLength;
+ static const size_type s_lessThanEntityStringLength;
/**
* The string ">".
*/
- static const XalanDOMChar s_greaterThanEntityString[];
+ static const XalanDOMChar s_greaterThanEntityString[];
- static const XalanDOMString::size_type s_greaterThanEntityStringLength;
+ static const size_type s_greaterThanEntityStringLength;
/**
* The string "&".
*/
- static const XalanDOMChar s_ampersandEntityString[];
+ static const XalanDOMChar s_ampersandEntityString[];
- static const XalanDOMString::size_type s_ampersandEntityStringLength;
+ static const size_type s_ampersandEntityStringLength;
/**
* The string """.
*/
- static const XalanDOMChar s_quoteEntityString[];
+ static const XalanDOMChar s_quoteEntityString[];
- static const XalanDOMString::size_type s_quoteEntityStringLength;
+ static const size_type s_quoteEntityStringLength;
};
enum
@@ -571,12 +571,12 @@
virtual void
writeCharacters(
const XMLCh* chars,
- unsigned int length) = 0;
+ size_type length) = 0;
virtual void
writeCDATA(
const XMLCh* chars,
- unsigned int length) = 0;
+ size_type length) = 0;
virtual void
outputNewline() = 0;
@@ -694,7 +694,7 @@
*/
const XalanDOMString m_standalone;
- const XalanDOMString m_encoding;
+ const XalanDOMString m_encoding;
static bool
isUTF16HighSurrogate(XalanDOMChar theChar)
@@ -792,9 +792,9 @@
/**
* The string "-//W3C//DTD XHTML".
*/
- static const XalanDOMChar s_xhtmlDocTypeString[];
+ static const XalanDOMChar s_xhtmlDocTypeString[];
- static const XalanDOMString::size_type s_xhtmlDocTypeStringLength;
+ static const size_type s_xhtmlDocTypeStringLength;
};
Modified: xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.cpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.cpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.cpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.cpp Tue Sep 4 10:59:27 2007
@@ -78,8 +78,8 @@
void
FormatterStringLengthCounter::characters(
- const XMLCh* const /* chars */,
- const unsigned int length)
+ const XMLCh* const /* chars */,
+ const size_type length)
{
m_count += length;
}
@@ -88,8 +88,8 @@
void
FormatterStringLengthCounter::charactersRaw(
- const XMLCh* const /* chars */,
- const unsigned int /*length */)
+ const XMLCh* const /* chars */,
+ const size_type /*length */)
{
}
@@ -103,8 +103,8 @@
void
FormatterStringLengthCounter::ignorableWhitespace(
- const XMLCh* const /* chars */,
- const unsigned int /* length */)
+ const XMLCh* const /* chars */,
+ const size_type /* length */)
{
}
@@ -135,8 +135,8 @@
void
FormatterStringLengthCounter::cdata(
- const XMLCh* const /* ch */,
- const unsigned int /* length */)
+ const XMLCh* const /* ch */,
+ const size_type /* length */)
{
}
Modified: xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.hpp
URL: http://svn.apache.org/viewvc/xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.hpp?rev=572759&r1=572758&r2=572759&view=diff
==============================================================================
--- xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.hpp (original)
+++ xalan/c/trunk/src/xalanc/XPath/FormatterStringLengthCounter.hpp Tue Sep 4 10:59:27 2007
@@ -43,8 +43,6 @@
{
public:
- typedef unsigned long size_type;
-
/**
* FormatterStringLengthCounter instance constructor.
*/
@@ -83,12 +81,12 @@
virtual void
characters(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
charactersRaw(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
entityReference(const XMLCh* const name);
@@ -96,7 +94,7 @@
virtual void
ignorableWhitespace(
const XMLCh* const chars,
- const unsigned int length);
+ const size_type length);
virtual void
processingInstruction(
@@ -112,7 +110,7 @@
virtual void
cdata(
const XMLCh* const ch,
- const unsigned int length);
+ const size_type length);
private:
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org