dbertoni 01/09/27 09:34:28
Modified: c/src/PlatformSupport DOMStringPrintWriter.cpp
DOMStringPrintWriter.hpp NullPrintWriter.hpp
PrintWriter.hpp Writer.cpp Writer.hpp
XalanOutputStreamPrintWriter.cpp
XalanOutputStreamPrintWriter.hpp
XalanStdOutputStream.cpp XalanStdOutputStream.hpp
Log:
32/64-bit fixes.
Revision Changes Path
1.13 +2 -2 xml-xalan/c/src/PlatformSupport/DOMStringPrintWriter.cpp
Index: DOMStringPrintWriter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringPrintWriter.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DOMStringPrintWriter.cpp 2001/09/25 21:12:51 1.12
+++ DOMStringPrintWriter.cpp 2001/09/27 16:34:27 1.13
@@ -146,9 +146,9 @@
XalanDOMString::size_type theLength)
{
assert(c_wstr(s) != 0);
- assert(theLength == UINT_MAX || length(s) >= theOffset + theLength);
+ assert(theLength == npos || length(s) >= theOffset + theLength);
- if (theOffset == 0 && theLength == UINT_MAX)
+ if (theOffset == 0 && theLength == npos)
{
m_outputString += s;
}
1.10 +3 -3 xml-xalan/c/src/PlatformSupport/DOMStringPrintWriter.hpp
Index: DOMStringPrintWriter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringPrintWriter.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DOMStringPrintWriter.hpp 2001/09/25 21:12:51 1.9
+++ DOMStringPrintWriter.hpp 2001/09/27 16:34:27 1.10
@@ -106,7 +106,7 @@
write(
const char* s,
size_t theOffset = 0,
- size_t theLength = size_t(-1));
+ size_t theLength = npos);
virtual void
write(
@@ -134,7 +134,7 @@
virtual void
print(
const char* s,
- size_t theLength = size_t(-1));
+ size_t theLength = npos);
virtual void
print(
@@ -167,7 +167,7 @@
virtual void
println(
const char* s,
- size_t theLength = size_t(-1));
+ size_t theLength = npos);
virtual void
println(
1.6 +3 -3 xml-xalan/c/src/PlatformSupport/NullPrintWriter.hpp
Index: NullPrintWriter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/NullPrintWriter.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NullPrintWriter.hpp 2001/09/25 21:12:51 1.5
+++ NullPrintWriter.hpp 2001/09/27 16:34:27 1.6
@@ -94,7 +94,7 @@
write(
const char* s,
size_t theOffset = 0,
- size_t theLength = size_t(-1));
+ size_t theLength = npos);
virtual void
write(
@@ -122,7 +122,7 @@
virtual void
print(
const char* s,
- size_t theLength = size_t(-1));
+ size_t theLength = npos);
virtual void
print(
@@ -155,7 +155,7 @@
virtual void
println(
const char* s,
- size_t theLength = size_t(-1));
+ size_t theLength = npos);
virtual void
println(
1.12 +3 -3 xml-xalan/c/src/PlatformSupport/PrintWriter.hpp
Index: PrintWriter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/PrintWriter.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PrintWriter.hpp 2001/09/25 21:12:51 1.11
+++ PrintWriter.hpp 2001/09/27 16:34:27 1.12
@@ -106,7 +106,7 @@
write(
const char* s,
size_t theOffset = 0,
- size_t theLength = size_t(-1)) = 0;
+ size_t theLength = npos) = 0;
virtual void
write(
@@ -136,7 +136,7 @@
virtual void
print(
const char* s,
- size_t theLength = size_t(-1)) = 0;
+ size_t theLength = npos) = 0;
virtual void
print(
@@ -169,7 +169,7 @@
virtual void
println(
const char* s,
- size_t theLength = size_t(-1)) = 0;
+ size_t theLength = npos) = 0;
virtual void
println(
1.4 +6 -0 xml-xalan/c/src/PlatformSupport/Writer.cpp
Index: Writer.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/Writer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Writer.cpp 2000/09/27 16:24:08 1.3
+++ Writer.cpp 2001/09/27 16:34:27 1.4
@@ -59,6 +59,12 @@
+#if !defined(XALAN_INLINE_INITIALIZATION)
+const Writer::size_t npos = ~0u;
+#endif
+
+
+
Writer::Writer()
{
}
1.12 +8 -2 xml-xalan/c/src/PlatformSupport/Writer.hpp
Index: Writer.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/Writer.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Writer.hpp 2001/09/25 21:12:51 1.11
+++ Writer.hpp 2001/09/27 16:34:27 1.12
@@ -108,18 +108,24 @@
// Output functions
+#if defined(XALAN_INLINE_INITIALIZATION)
+ static const size_t npos = ~0u;
+#else
+ static const size_t npos;
+#endif
+
/**
* Writes a string
*
* @param s string to write
* @param theOffset starting offset in string to begin writing,
default 0
- * @param theLength number of characters to write. If the length
is -1, then the array is assumed to be null-terminated.
+ * @param theLength number of characters to write. If the length
is npos, then the array is assumed to be null-terminated.
*/
virtual void
write(
const char* s,
size_t theOffset = 0,
- size_t theLength = size_t(-1)) = 0;
+ size_t theLength = npos) = 0;
/**
* Writes a string
1.8 +2 -2
xml-xalan/c/src/PlatformSupport/XalanOutputStreamPrintWriter.cpp
Index: XalanOutputStreamPrintWriter.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanOutputStreamPrintWriter.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanOutputStreamPrintWriter.cpp 2001/09/27 14:36:57 1.7
+++ XalanOutputStreamPrintWriter.cpp 2001/09/27 16:34:27 1.8
@@ -136,7 +136,7 @@
{
assert(s != 0);
- if (theLength == UINT_MAX)
+ if (theLength == npos)
{
if (theOffset == 0)
{
@@ -163,7 +163,7 @@
{
assert(s != 0);
- if (theLength == UINT_MAX)
+ if (theLength == XalanDOMString::npos)
{
if (theOffset == 0)
{
1.3 +3 -3
xml-xalan/c/src/PlatformSupport/XalanOutputStreamPrintWriter.hpp
Index: XalanOutputStreamPrintWriter.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/PlatformSupport/XalanOutputStreamPrintWriter.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanOutputStreamPrintWriter.hpp 2001/09/25 21:12:51 1.2
+++ XalanOutputStreamPrintWriter.hpp 2001/09/27 16:34:28 1.3
@@ -110,7 +110,7 @@
write(
const char* s,
size_t theOffset = 0,
- size_t theLength = size_t(-1));
+ size_t theLength = npos);
virtual void
write(
@@ -138,7 +138,7 @@
virtual void
print(
const char* s,
- size_t theLength = size_t(-1));
+ size_t theLength = npos);
virtual void
print(
@@ -171,7 +171,7 @@
virtual void
println(
const char* s,
- size_t theLength = size_t(-1));
+ size_t theLength = npos);
virtual void
println(
1.7 +1 -1 xml-xalan/c/src/PlatformSupport/XalanStdOutputStream.cpp
Index: XalanStdOutputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanStdOutputStream.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanStdOutputStream.cpp 2001/09/27 15:09:01 1.6
+++ XalanStdOutputStream.cpp 2001/09/27 16:34:28 1.7
@@ -164,7 +164,7 @@
int theErrorCode) :
XalanOutputStreamException(FormatMessageLocal("Error writing to
standard stream!",
theErrorCode),
-
TranscodeFromLocalCodePage("XercesStdTextOutputStreamWriteException"))
+
TranscodeFromLocalCodePage("XercesStdOutputStreamWriteException"))
{
}
1.5 +3 -6 xml-xalan/c/src/PlatformSupport/XalanStdOutputStream.hpp
Index: XalanStdOutputStream.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/XalanStdOutputStream.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanStdOutputStream.hpp 2001/09/26 22:07:53 1.4
+++ XalanStdOutputStream.hpp 2001/09/27 16:34:28 1.5
@@ -72,6 +72,7 @@
#include <ostream>
#else
#include <iosfwd>
+#include <ios>
#endif
#endif
@@ -88,15 +89,11 @@
public:
#if defined (XALAN_NO_NAMESPACES)
- typedef ostream StreamType;
- typedef long StreamSizeType;
+ typedef ostream StreamType;
+ typedef iosbase::streamsize StreamSizeType;
#else
typedef std::ostream StreamType;
-#if defined(XALAN_NO_STD_STREAMSIZE)
- typedef long StreamSizeType;
-#else
typedef std::streamsize StreamSizeType;
-#endif
#endif
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
