dbertoni 2002/11/14 15:55:02
Modified: c/src/PlatformSupport DOMStringHelper.cpp
DOMStringHelper.hpp StdBinInputStream.cpp
StdBinInputStream.hpp XalanStdOutputStream.cpp
XalanStdOutputStream.hpp
Log:
Straightened out iostreams #defines.
Revision Changes Path
1.79 +1 -1 xml-xalan/c/src/PlatformSupport/DOMStringHelper.cpp
Index: DOMStringHelper.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringHelper.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- DOMStringHelper.cpp 14 Nov 2002 01:56:28 -0000 1.78
+++ DOMStringHelper.cpp 14 Nov 2002 23:55:01 -0000 1.79
@@ -72,7 +72,7 @@
-#if defined(XALAN_OLD_STREAM_HEADERS)
+#if defined(XALAN_CLASSIC_IOSTREAMS)
#include <iostream.h>
#else
#include <iostream>
1.64 +1 -1 xml-xalan/c/src/PlatformSupport/DOMStringHelper.hpp
Index: DOMStringHelper.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/DOMStringHelper.hpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- DOMStringHelper.hpp 26 Sep 2002 05:13:21 -0000 1.63
+++ DOMStringHelper.hpp 14 Nov 2002 23:55:01 -0000 1.64
@@ -67,7 +67,7 @@
#include <algorithm>
#include <cassert>
#include <functional>
-#if defined(XALAN_OLD_STREAMS)
+#if defined(XALAN_CLASSIC_IOSTREAMS)
class ostream;
#else
#include <iosfwd>
1.19 +3 -6 xml-xalan/c/src/PlatformSupport/StdBinInputStream.cpp
Index: StdBinInputStream.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/StdBinInputStream.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StdBinInputStream.cpp 3 Oct 2002 05:23:45 -0000 1.18
+++ StdBinInputStream.cpp 14 Nov 2002 23:55:02 -0000 1.19
@@ -65,13 +65,10 @@
#include <cassert>
-#if !defined(XALAN_OLD_STREAMS)
-#if defined(XALAN_OLD_STREAM_HEADERS)
-#include <iostream.h>
-#else
+#if !defined(XALAN_CLASSIC_IOSTREAMS)
#include <iostream>
#endif
-#endif
+
#if !defined(XALAN_NO_NAMESPACES)
@@ -117,7 +114,7 @@
}
else
{
-#if !defined(XALAN_OLD_STREAM_HEADERS)
+#if !defined(XALAN_CLASSIC_IOSTREAMS)
#if defined(XALAN_OLD_STYLE_CASTS)
m_stream.read((char*)toFill, maxToRead);
#else
1.10 +1 -1 xml-xalan/c/src/PlatformSupport/StdBinInputStream.hpp
Index: StdBinInputStream.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/StdBinInputStream.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StdBinInputStream.hpp 3 Oct 2002 05:23:45 -0000 1.9
+++ StdBinInputStream.hpp 14 Nov 2002 23:55:02 -0000 1.10
@@ -68,7 +68,7 @@
-#if defined(XALAN_OLD_STREAMS)
+#if defined(XALAN_CLASSIC_IOSTREAMS)
#include <iostream.h>
#else
#include <iosfwd>
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XalanStdOutputStream.cpp 31 Jul 2002 15:35:03 -0000 1.11
+++ XalanStdOutputStream.cpp 14 Nov 2002 23:55:02 -0000 1.12
@@ -63,7 +63,7 @@
-#if defined(XALAN_OLD_STREAM_HEADERS)
+#if defined(XALAN_CLASSIC_IOSTREAMS)
#include <iostream.h>
#else
#include <iostream>
1.11 +3 -7 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XalanStdOutputStream.hpp 17 Dec 2001 18:17:34 -0000 1.10
+++ XalanStdOutputStream.hpp 14 Nov 2002 23:55:02 -0000 1.11
@@ -64,14 +64,12 @@
-#if defined(XALAN_OLD_STREAMS)
+#if defined(XALAN_CLASSIC_IOSTREAMS)
#include <iostream.h>
#else
#include <iosfwd>
-#if !defined(XALAN_OLD_STREAM_HEADERS)
#include <ios>
#endif
-#endif
@@ -91,7 +89,7 @@
typedef std::ostream StreamType;
#endif
-#if defined(XALAN_OLD_STREAMS)
+#if defined(XALAN_CLASSIC_IOSTREAMS)
typedef int StreamSizeType;
#else
#if defined(XALAN_NO_NAMESPACES)
@@ -116,12 +114,10 @@
{
public:
- XalanStdOutputStreamWriteException(
- int theErrorCode);
+ XalanStdOutputStreamWriteException(int theErrorCode);
virtual
~XalanStdOutputStreamWriteException();
-
};
protected:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
