dbertoni 01/09/28 11:26:46
Modified: c/src/PlatformSupport DOMStringHelper.cpp
DOMStringHelper.hpp StdBinInputStream.cpp
StdBinInputStream.hpp XalanStdOutputStream.hpp
Log:
iostream header cleanup.
Revision Changes Path
1.65 +0 -4 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.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- DOMStringHelper.cpp 2001/09/26 21:41:45 1.64
+++ DOMStringHelper.cpp 2001/09/28 18:26:45 1.65
@@ -71,10 +71,6 @@
-#if !defined(XALAN_NO_IOSFWD)
-#include <iosfwd>
-#endif
-
#if defined(XALAN_OLD_STREAM_HEADERS)
#include <strstream.h>
#else
1.53 +1 -5 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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- DOMStringHelper.hpp 2001/09/26 20:51:39 1.52
+++ DOMStringHelper.hpp 2001/09/28 18:26:45 1.53
@@ -66,12 +66,8 @@
#include <cassert>
#include <functional>
-#if defined(XALAN_NO_IOSFWD)
-#if defined(XALAN_OLD_STREAM_HEADERS)
+#if defined(XALAN_OLD_STREAMS)
#include <iostream.h>
-#else
-#include <ostream>
-#endif
#else
#include <iosfwd>
#endif
1.7 +6 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StdBinInputStream.cpp 2001/02/28 18:52:47 1.6
+++ StdBinInputStream.cpp 2001/09/28 18:26:45 1.7
@@ -63,6 +63,12 @@
+#if !defined(XALAN_OLD_STREAMS)
+#include <istream>
+#endif
+
+
+
#if defined(XALAN_NO_NAMESPACES)
StdBinInputStream::StdBinInputStream(istream& theStream) :
#else
1.4 +1 -7 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StdBinInputStream.hpp 2000/11/30 14:37:28 1.3
+++ StdBinInputStream.hpp 2001/09/28 18:26:45 1.4
@@ -68,15 +68,9 @@
-#if defined(XALAN_OLD_STREAM_HEADERS)
+#if defined(XALAN_OLD_STREAMS)
#include <iostream.h>
#else
-#include <istream>
-#endif
-
-
-
-#if !defined(XALAN_NO_IOSFWD)
#include <iosfwd>
#endif
1.8 +10 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanStdOutputStream.hpp 2001/09/28 16:57:56 1.7
+++ XalanStdOutputStream.hpp 2001/09/28 18:26:45 1.8
@@ -64,16 +64,12 @@
-#if defined(XALAN_OLD_STREAM_HEADERS)
+#if defined(XALAN_OLD_STREAMS)
#include <iostream.h>
#else
-#if defined(XALAN_NO_IOSFWD)
-#include <ostream>
-#else
#include <iosfwd>
#include <ios>
#endif
-#endif
@@ -89,10 +85,18 @@
#if defined (XALAN_NO_NAMESPACES)
typedef ostream StreamType;
- typedef int StreamSizeType;
#else
typedef std::ostream StreamType;
+#endif
+
+#if defined (XALAN_OLD_STREAMS)
+ typedef int StreamSizeType;
+#else
+#if defined (XALAN_NO_NAMESPACES)
+ typedef streamsize StreamSizeType
+#else
typedef std::streamsize StreamSizeType;
+#endif
#endif
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
