dbertoni 2003/07/14 22:14:12
Modified: c/src/xalanc/XMLSupport FormatterToXML_UTF8.hpp
FormatterToXML_UTF8.cpp FormatterToXML_UTF16.hpp
FormatterToXML_UTF16.cpp
Log:
Cleaned up conflicts between DOMString::size_type and
FormatterListener::size_type.
Revision Changes Path
1.3 +42 -44 xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF8.hpp
Index: FormatterToXML_UTF8.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF8.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FormatterToXML_UTF8.hpp 15 Jul 2003 04:53:43 -0000 1.2
+++ FormatterToXML_UTF8.hpp 15 Jul 2003 05:14:12 -0000 1.3
@@ -316,7 +316,7 @@
* @param start the start offset into the string.
* @param length the length of the string.
*/
- size_type
+ XalanDOMString::size_type
writeNormalizedChar(
XalanDOMChar ch,
const XalanDOMChar chars[],
@@ -404,13 +404,13 @@
void
safeWriteContent(
- const XalanDOMChar* theChars,
- size_type theLength);
+ const XalanDOMChar* theChars,
+ XalanDOMString::size_type theLength);
void
write(
- const XalanDOMChar* theChars,
- size_type theLength);
+ const XalanDOMChar* theChars,
+ XalanDOMString::size_type theLength);
void
writeName1_0(const XalanDOMChar* theChars);
@@ -444,8 +444,8 @@
void
write(
- const char* theChars,
- size_type theLength);
+ const char*
theChars,
+ XalanDOMString::size_type theLength);
void
write(const char* theChars)
@@ -505,8 +505,6 @@
*/
const XalanDOMString m_mediaType;
- typedef XalanDOMString::size_type size_type;
-
/**
* The string "UTF-8".
*/
@@ -515,114 +513,114 @@
/**
* The string "<!DOCTYPE ".
*/
- static const char s_doctypeHeaderStartString[];
+ static const char
s_doctypeHeaderStartString[];
- static const size_type s_doctypeHeaderStartStringLength;
+ static const XalanDOMString::size_type
s_doctypeHeaderStartStringLength;
/**
* The string " PUBLIC \"".
*/
- static const char s_doctypeHeaderPublicString[];
+ static const char
s_doctypeHeaderPublicString[];
- static const size_type s_doctypeHeaderPublicStringLength;
+ static const XalanDOMString::size_type
s_doctypeHeaderPublicStringLength;
/**
* The string " SYSTEM \"".
*/
- static const char s_doctypeHeaderSystemString[];
+ static const char
s_doctypeHeaderSystemString[];
- static const size_type s_doctypeHeaderSystemStringLength;
+ static const XalanDOMString::size_type
s_doctypeHeaderSystemStringLength;
/**
* The string "<?xml version=\"".
*/
- static const char s_xmlHeaderStartString[];
+ static const char
s_xmlHeaderStartString[];
- static const size_type s_xmlHeaderStartStringLength;
+ static const XalanDOMString::size_type s_xmlHeaderStartStringLength;
/**
* The string "\" encoding=\"".
*/
- static const char s_xmlHeaderEncodingString[];
+ static const char
s_xmlHeaderEncodingString[];
- static const size_type s_xmlHeaderEncodingStringLength;
+ static const XalanDOMString::size_type s_xmlHeaderEncodingStringLength;
/**
* The string "\" standalone=\"".
*/
- static const char s_xmlHeaderStandaloneString[];
+ static const char
s_xmlHeaderStandaloneString[];
- static const size_type s_xmlHeaderStandaloneStringLength;
+ static const XalanDOMString::size_type
s_xmlHeaderStandaloneStringLength;
/**
* The string "\"?>".
*/
- static const char s_xmlHeaderEndString[];
+ static const char
s_xmlHeaderEndString[];
- static const size_type s_xmlHeaderEndStringLength;
+ static const XalanDOMString::size_type s_xmlHeaderEndStringLength;
/**
* The string "1.0".
*/
- static const char s_defaultVersionString[];
+ static const char
s_defaultVersionString[];
- static const size_type s_defaultVersionStringLength;
+ static const XalanDOMString::size_type s_defaultVersionStringLength;
/**
* The string "-//W3C//DTD XHTML".
*/
- static const char s_xhtmlDocTypeString[];
+ static const char
s_xhtmlDocTypeString[];
- static const size_type s_xhtmlDocTypeStringLength;
+ static const XalanDOMString::size_type s_xhtmlDocTypeStringLength;
/**
* The string "<![CDATA[".
*/
- static const char s_cdataOpenString[];
+ static const char
s_cdataOpenString[];
- static const size_type s_cdataOpenStringLength;
+ static const XalanDOMString::size_type s_cdataOpenStringLength;
/**
* The string "]]>".
*/
- static const char s_cdataCloseString[];
+ static const char
s_cdataCloseString[];
- static const size_type s_cdataCloseStringLength;
+ static const XalanDOMString::size_type s_cdataCloseStringLength;
/**
* The string "<".
*/
- static const char s_lessThanEntityString[];
+ static const char
s_lessThanEntityString[];
- static const size_type s_lessThanEntityStringLength;
+ static const XalanDOMString::size_type s_lessThanEntityStringLength;
/**
* The string ">".
*/
- static const char s_greaterThanEntityString[];
+ static const char
s_greaterThanEntityString[];
- static const size_type s_greaterThanEntityStringLength;
+ static const XalanDOMString::size_type s_greaterThanEntityStringLength;
/**
* The string "&".
*/
- static const char s_ampersandEntityString[];
+ static const char
s_ampersandEntityString[];
- static const size_type s_ampersandEntityStringLength;
+ static const XalanDOMString::size_type s_ampersandEntityStringLength;
/**
* The string """.
*/
- static const char s_quoteEntityString[];
+ static const char
s_quoteEntityString[];
- static const size_type s_quoteEntityStringLength;
+ static const XalanDOMString::size_type s_quoteEntityStringLength;
/**
* The string " ".
*/
- static const char s_linefeedNCRString[];
+ static const char
s_linefeedNCRString[];
- static const size_type s_linefeedNCRStringLength;
+ static const XalanDOMString::size_type s_linefeedNCRStringLength;
/**
* A stack of Boolean objects that tell if the given element
@@ -633,7 +631,7 @@
/**
* The string of characters that represents the newline
*/
- const XalanDOMChar* m_newlineString;
+ const XalanDOMChar* m_newlineString;
/**
* The length of the the string of characters that represents the
newline
@@ -642,7 +640,7 @@
typedef void (FormatterToXML_UTF8::*NameFunctionType)(const
XalanDOMChar*);
- NameFunctionType m_nameFunction;
+ NameFunctionType m_nameFunction;
void
writeName(const XalanDOMChar* theChars)
@@ -709,7 +707,7 @@
char* m_bufferPosition;
- size_type m_bufferRemaining;
+ XalanDOMString::size_type m_bufferRemaining;
static const XalanDOMChar s_specialChars[];
};
1.2 +24 -24 xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF8.cpp
Index: FormatterToXML_UTF8.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF8.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormatterToXML_UTF8.cpp 15 Jul 2003 01:02:17 -0000 1.1
+++ FormatterToXML_UTF8.cpp 15 Jul 2003 05:14:12 -0000 1.2
@@ -408,8 +408,8 @@
inline void
FormatterToXML_UTF8::safeWriteContent(
- const XalanDOMChar* theChars,
- size_type theLength)
+ const XalanDOMChar* theChars,
+ XalanDOMString::size_type theLength)
{
for(size_type i = 0; i < theLength; ++i)
{
@@ -423,8 +423,8 @@
inline void
FormatterToXML_UTF8::write(
- const XalanDOMChar* theChars,
- size_type theLength)
+ const XalanDOMChar* theChars,
+ XalanDOMString::size_type theLength)
{
for(size_type i = 0; i < theLength; ++i)
{
@@ -498,8 +498,8 @@
inline void
FormatterToXML_UTF8::write(
- const char* theChars,
- size_type theLength)
+ const char*
theChars,
+ XalanDOMString::size_type theLength)
{
#if defined(NDEBUG)
if (theLength > sizeof(m_buffer))
@@ -525,7 +525,7 @@
m_bufferRemaining -= theLength;
}
#else
- for(size_type i = 0; i < theLength; ++i)
+ for(XalanDOMString::size_type i = 0; i < theLength; ++i)
{
write(theChars[i]);
}
@@ -1006,7 +1006,7 @@
-FormatterToXML_UTF8::size_type
+XalanDOMString::size_type
FormatterToXML_UTF8::writeNormalizedChar(
XalanDOMChar ch,
const XalanDOMChar chars[],
@@ -1303,7 +1303,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_doctypeHeaderStartStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_doctypeHeaderStartStringLength =
FXML_SIZE(s_doctypeHeaderStartString);
const char FormatterToXML_UTF8::s_doctypeHeaderPublicString[] =
@@ -1320,7 +1320,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_doctypeHeaderPublicStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_doctypeHeaderPublicStringLength =
FXML_SIZE(s_doctypeHeaderPublicString);
const char FormatterToXML_UTF8::s_doctypeHeaderSystemString[] =
@@ -1337,7 +1337,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_doctypeHeaderSystemStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_doctypeHeaderSystemStringLength =
FXML_SIZE(s_doctypeHeaderSystemString);
const char FormatterToXML_UTF8::s_xmlHeaderStartString[] =
@@ -1360,7 +1360,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_xmlHeaderStartStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_xmlHeaderStartStringLength =
FXML_SIZE(s_xmlHeaderStartString);
const char FormatterToXML_UTF8::s_xmlHeaderEncodingString[] =
@@ -1380,7 +1380,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_xmlHeaderEncodingStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_xmlHeaderEncodingStringLength =
FXML_SIZE(s_xmlHeaderEncodingString);
const char FormatterToXML_UTF8::s_xmlHeaderStandaloneString[] =
@@ -1402,7 +1402,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_xmlHeaderStandaloneStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_xmlHeaderStandaloneStringLength =
FXML_SIZE(s_xmlHeaderStandaloneString);
const char FormatterToXML_UTF8::s_xmlHeaderEndString[] =
@@ -1413,7 +1413,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_xmlHeaderEndStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_xmlHeaderEndStringLength =
FXML_SIZE(s_xmlHeaderEndString);
const char FormatterToXML_UTF8::s_defaultVersionString[] =
@@ -1424,7 +1424,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_defaultVersionStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_defaultVersionStringLength =
FXML_SIZE(s_defaultVersionString);
const char FormatterToXML_UTF8::s_cdataOpenString[] =
@@ -1441,7 +1441,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_cdataOpenStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_cdataOpenStringLength =
FXML_SIZE(s_cdataOpenString);
const char FormatterToXML_UTF8::s_cdataCloseString[] =
@@ -1452,7 +1452,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_cdataCloseStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_cdataCloseStringLength =
FXML_SIZE(s_cdataCloseString);
@@ -1478,7 +1478,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_xhtmlDocTypeStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_xhtmlDocTypeStringLength =
FXML_SIZE(s_xhtmlDocTypeString);
const char FormatterToXML_UTF8::s_lessThanEntityString[] =
@@ -1490,7 +1490,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_lessThanEntityStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_lessThanEntityStringLength =
FXML_SIZE(s_lessThanEntityString);
const char FormatterToXML_UTF8::s_greaterThanEntityString[] =
@@ -1502,7 +1502,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_greaterThanEntityStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_greaterThanEntityStringLength =
FXML_SIZE(s_greaterThanEntityString);
const char FormatterToXML_UTF8::s_ampersandEntityString[] =
@@ -1515,7 +1515,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_ampersandEntityStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_ampersandEntityStringLength =
FXML_SIZE(s_ampersandEntityString);
const char FormatterToXML_UTF8::s_quoteEntityString[] =
@@ -1529,7 +1529,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_quoteEntityStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_quoteEntityStringLength =
FXML_SIZE(s_quoteEntityString);
const char FormatterToXML_UTF8::s_linefeedNCRString[] =
@@ -1542,7 +1542,7 @@
char(0)
};
-const FormatterToXML_UTF8::size_type
FormatterToXML_UTF8::s_linefeedNCRStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF8::s_linefeedNCRStringLength =
FXML_SIZE(s_linefeedNCRString);
1.3 +36 -37
xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF16.hpp
Index: FormatterToXML_UTF16.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF16.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FormatterToXML_UTF16.hpp 15 Jul 2003 04:53:43 -0000 1.2
+++ FormatterToXML_UTF16.hpp 15 Jul 2003 05:14:12 -0000 1.3
@@ -390,8 +390,8 @@
void
write(
- const XalanDOMChar* theChars,
- size_type theLength);
+ const XalanDOMChar* theChars,
+ XalanDOMString::size_type theLength);
void
writeName(const XalanDOMChar* theChars);
@@ -466,7 +466,6 @@
*/
const XalanDOMString m_mediaType;
- typedef XalanDOMString::size_type size_type;
/**
* The string "UTF-16".
@@ -476,114 +475,114 @@
/**
* The string "<!DOCTYPE ".
*/
- static const XalanDOMChar s_doctypeHeaderStartString[];
+ static const XalanDOMChar
s_doctypeHeaderStartString[];
- static const size_type s_doctypeHeaderStartStringLength;
+ static const XalanDOMString::size_type
s_doctypeHeaderStartStringLength;
/**
* The string " PUBLIC \"".
*/
- static const XalanDOMChar s_doctypeHeaderPublicString[];
+ static const XalanDOMChar
s_doctypeHeaderPublicString[];
- static const size_type s_doctypeHeaderPublicStringLength;
+ static const XalanDOMString::size_type
s_doctypeHeaderPublicStringLength;
/**
* The string " SYSTEM \"".
*/
- static const XalanDOMChar s_doctypeHeaderSystemString[];
+ static const XalanDOMChar
s_doctypeHeaderSystemString[];
- static const size_type s_doctypeHeaderSystemStringLength;
+ static const XalanDOMString::size_type
s_doctypeHeaderSystemStringLength;
/**
* The string "<?xml version=\"".
*/
- static const XalanDOMChar s_xmlHeaderStartString[];
+ static const XalanDOMChar
s_xmlHeaderStartString[];
- static const size_type s_xmlHeaderStartStringLength;
+ static const XalanDOMString::size_type s_xmlHeaderStartStringLength;
/**
* The string "\" encoding=\"".
*/
- static const XalanDOMChar s_xmlHeaderEncodingString[];
+ static const XalanDOMChar
s_xmlHeaderEncodingString[];
- static const size_type s_xmlHeaderEncodingStringLength;
+ static const XalanDOMString::size_type s_xmlHeaderEncodingStringLength;
/**
* The string "\" standalone=\"".
*/
- static const XalanDOMChar s_xmlHeaderStandaloneString[];
+ static const XalanDOMChar
s_xmlHeaderStandaloneString[];
- static const size_type s_xmlHeaderStandaloneStringLength;
+ static const XalanDOMString::size_type
s_xmlHeaderStandaloneStringLength;
/**
* The string "\"?>".
*/
- static const XalanDOMChar s_xmlHeaderEndString[];
+ static const XalanDOMChar
s_xmlHeaderEndString[];
- static const size_type s_xmlHeaderEndStringLength;
+ static const XalanDOMString::size_type s_xmlHeaderEndStringLength;
/**
* The string "1.0".
*/
- static const XalanDOMChar s_defaultVersionString[];
+ static const XalanDOMChar
s_defaultVersionString[];
- static const size_type s_defaultVersionStringLength;
+ static const XalanDOMString::size_type s_defaultVersionStringLength;
/**
* The string "-//W3C//DTD XHTML".
*/
- static const XalanDOMChar s_xhtmlDocTypeString[];
+ static const XalanDOMChar
s_xhtmlDocTypeString[];
- static const size_type s_xhtmlDocTypeStringLength;
+ static const XalanDOMString::size_type s_xhtmlDocTypeStringLength;
/**
* The string "<![CDATA[".
*/
- static const XalanDOMChar s_cdataOpenString[];
+ static const XalanDOMChar
s_cdataOpenString[];
- static const size_type s_cdataOpenStringLength;
+ static const XalanDOMString::size_type s_cdataOpenStringLength;
/**
* The string "]]>".
*/
- static const XalanDOMChar s_cdataCloseString[];
+ static const XalanDOMChar
s_cdataCloseString[];
- static const size_type s_cdataCloseStringLength;
+ static const XalanDOMString::size_type s_cdataCloseStringLength;
/**
* The string "<".
*/
- static const XalanDOMChar s_lessThanEntityString[];
+ static const XalanDOMChar
s_lessThanEntityString[];
- static const size_type s_lessThanEntityStringLength;
+ static const XalanDOMString::size_type s_lessThanEntityStringLength;
/**
* The string ">".
*/
- static const XalanDOMChar s_greaterThanEntityString[];
+ static const XalanDOMChar
s_greaterThanEntityString[];
- static const size_type s_greaterThanEntityStringLength;
+ static const XalanDOMString::size_type s_greaterThanEntityStringLength;
/**
* The string "&".
*/
- static const XalanDOMChar s_ampersandEntityString[];
+ static const XalanDOMChar
s_ampersandEntityString[];
- static const size_type s_ampersandEntityStringLength;
+ static const XalanDOMString::size_type s_ampersandEntityStringLength;
/**
* The string """.
*/
- static const XalanDOMChar s_quoteEntityString[];
+ static const XalanDOMChar
s_quoteEntityString[];
- static const size_type s_quoteEntityStringLength;
+ static const XalanDOMString::size_type s_quoteEntityStringLength;
/**
* The string " ".
*/
- static const XalanDOMChar s_linefeedNCRString[];
+ static const XalanDOMChar
s_linefeedNCRString[];
- static const size_type s_linefeedNCRStringLength;
+ static const XalanDOMString::size_type s_linefeedNCRStringLength;
/**
* A stack of Boolean objects that tell if the given element
@@ -594,7 +593,7 @@
/**
* The string of characters that represents the newline
*/
- const XalanDOMChar* m_newlineString;
+ const XalanDOMChar* m_newlineString;
/**
* The length of the the string of characters that represents the
newline
@@ -654,7 +653,7 @@
XalanDOMChar* m_bufferPosition;
- size_type m_bufferRemaining;
+ XalanDOMString::size_type
m_bufferRemaining;
static const XalanDOMChar s_specialChars[];
};
1.2 +19 -19
xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF16.cpp
Index: FormatterToXML_UTF16.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML_UTF16.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormatterToXML_UTF16.cpp 15 Jul 2003 01:02:17 -0000 1.1
+++ FormatterToXML_UTF16.cpp 15 Jul 2003 05:14:12 -0000 1.2
@@ -239,8 +239,8 @@
inline void
FormatterToXML_UTF16::write(
- const XalanDOMChar* theChars,
- size_type theLength)
+ const XalanDOMChar* theChars,
+ XalanDOMString::size_type theLength)
{
if (theLength > sizeof(m_buffer))
{
@@ -255,7 +255,7 @@
flushBuffer();
}
- for(size_type i = 0; i < theLength; ++i)
+ for(XalanDOMString::size_type i = 0; i < theLength; ++i)
{
*m_bufferPosition = theChars[i];
@@ -983,7 +983,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_doctypeHeaderStartStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_doctypeHeaderStartStringLength =
FXML_SIZE(s_doctypeHeaderStartString);
const XalanDOMChar FormatterToXML_UTF16::s_doctypeHeaderPublicString[] =
@@ -1000,7 +1000,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_doctypeHeaderPublicStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_doctypeHeaderPublicStringLength =
FXML_SIZE(s_doctypeHeaderPublicString);
const XalanDOMChar FormatterToXML_UTF16::s_doctypeHeaderSystemString[] =
@@ -1017,7 +1017,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_doctypeHeaderSystemStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_doctypeHeaderSystemStringLength =
FXML_SIZE(s_doctypeHeaderSystemString);
const XalanDOMChar FormatterToXML_UTF16::s_xmlHeaderStartString[] =
@@ -1040,7 +1040,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_xmlHeaderStartStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_xmlHeaderStartStringLength =
FXML_SIZE(s_xmlHeaderStartString);
const XalanDOMChar FormatterToXML_UTF16::s_xmlHeaderEncodingString[] =
@@ -1060,7 +1060,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_xmlHeaderEncodingStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_xmlHeaderEncodingStringLength =
FXML_SIZE(s_xmlHeaderEncodingString);
const XalanDOMChar FormatterToXML_UTF16::s_xmlHeaderStandaloneString[] =
@@ -1082,7 +1082,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_xmlHeaderStandaloneStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_xmlHeaderStandaloneStringLength =
FXML_SIZE(s_xmlHeaderStandaloneString);
const XalanDOMChar FormatterToXML_UTF16::s_xmlHeaderEndString[] =
@@ -1093,7 +1093,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_xmlHeaderEndStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_xmlHeaderEndStringLength =
FXML_SIZE(s_xmlHeaderEndString);
const XalanDOMChar FormatterToXML_UTF16::s_defaultVersionString[] =
@@ -1104,7 +1104,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_defaultVersionStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_defaultVersionStringLength =
FXML_SIZE(s_defaultVersionString);
const XalanDOMChar FormatterToXML_UTF16::s_cdataOpenString[] =
@@ -1121,7 +1121,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_cdataOpenStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_cdataOpenStringLength =
FXML_SIZE(s_cdataOpenString);
const XalanDOMChar FormatterToXML_UTF16::s_cdataCloseString[] =
@@ -1132,7 +1132,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_cdataCloseStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_cdataCloseStringLength =
FXML_SIZE(s_cdataCloseString);
@@ -1158,7 +1158,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_xhtmlDocTypeStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_xhtmlDocTypeStringLength =
FXML_SIZE(s_xhtmlDocTypeString);
const XalanDOMChar FormatterToXML_UTF16::s_lessThanEntityString[] =
@@ -1170,7 +1170,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_lessThanEntityStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_lessThanEntityStringLength =
FXML_SIZE(s_lessThanEntityString);
const XalanDOMChar FormatterToXML_UTF16::s_greaterThanEntityString[] =
@@ -1182,7 +1182,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_greaterThanEntityStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_greaterThanEntityStringLength =
FXML_SIZE(s_greaterThanEntityString);
const XalanDOMChar FormatterToXML_UTF16::s_ampersandEntityString[] =
@@ -1195,7 +1195,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_ampersandEntityStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_ampersandEntityStringLength =
FXML_SIZE(s_ampersandEntityString);
const XalanDOMChar FormatterToXML_UTF16::s_quoteEntityString[] =
@@ -1209,7 +1209,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_quoteEntityStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_quoteEntityStringLength =
FXML_SIZE(s_quoteEntityString);
const XalanDOMChar FormatterToXML_UTF16::s_linefeedNCRString[] =
@@ -1222,7 +1222,7 @@
XalanDOMChar(0)
};
-const FormatterToXML_UTF16::size_type
FormatterToXML_UTF16::s_linefeedNCRStringLength =
+const XalanDOMString::size_type
FormatterToXML_UTF16::s_linefeedNCRStringLength =
FXML_SIZE(s_linefeedNCRString);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
