summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog-99b24
-rw-r--r--ace/iosfwd.h62
-rw-r--r--ace/streams.h176
3 files changed, 142 insertions, 120 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 8863b0501b8..906fa37c593 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,9 +1,25 @@
+Thu Aug 05 14:31:48 1999 David L. Levine <levine@cs.wustl.edu>
+
+ * ace/iosfwd.h: #include iosfwd with
+ ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION as well as without
+ ACE_HAS_OLD_IOSTREAMS. This allows builds to succeed
+ for Tornado II with its egcs. [Bug 206]
+
+ * ace/streams.h: added #includes of istream.h, ostream.h,
+ and iomanip.h with ACE_HAS_STD_CPP_LIBRARY and
+ ACE_USES_OLD_IOSTREAMS. It's necessary for builds for
+ Tornado II, but should be harmless and helpful on other
+ platforms. [Bug 206]
+
+ Thanks to Matthias Schumann <matthias.schumann@xcc.de> for
+ first reporting the solution to the build problem for Tornado II.
+
Thu Aug 5 13:03:28 1999 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
- * ace/Malloc_T.cpp (shared_free): Looks like ACE_reinterpret_cast
- isn't the right thing to do... Let's just use good ol'
- fashioned C-style casts instead. Thanks to Bala for reporting
- this.
+ * ace/Malloc_T.cpp (shared_free): Looks like ACE_reinterpret_cast
+ isn't the right thing to do... Let's just use good ol'
+ fashioned C-style casts instead. Thanks to Bala for reporting
+ this.
Thu Aug 05 12:05:42 1999 David L. Levine <levine@cs.wustl.edu>
diff --git a/ace/iosfwd.h b/ace/iosfwd.h
index a1e8054affa..eac2c9e4ba5 100644
--- a/ace/iosfwd.h
+++ b/ace/iosfwd.h
@@ -33,42 +33,44 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
+#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \
+ (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
-#if !defined (ACE_USES_OLD_IOSTREAMS)
- #include /**/ <iosfwd>
-#endif /* ! ACE_USES_OLD_IOSTREAMS */
+# if !defined (ACE_USES_OLD_IOSTREAMS) || \
+ defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
+# include /**/ <iosfwd>
+# endif /* ! ACE_USES_OLD_IOSTREAMS || ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
- (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)
+# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
+ (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)
-#if !defined (ACE_USES_OLD_IOSTREAMS)
-// Make these available in the global name space
-using std::ios;
-using std::streambuf;
-using std::istream;
-using std::ostream;
-using std::iostream;
-using std::filebuf;
-using std::ifstream;
-using std::ofstream;
-using std::fstream;
-#endif /* ! ACE_USES_OLD_IOSTREAMS */
+# if !defined (ACE_USES_OLD_IOSTREAMS)
+ // Make these available in the global name space
+ using std::ios;
+ using std::streambuf;
+ using std::istream;
+ using std::ostream;
+ using std::iostream;
+ using std::filebuf;
+ using std::ifstream;
+ using std::ofstream;
+ using std::fstream;
+# endif /* ! ACE_USES_OLD_IOSTREAMS */
-#endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
+# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-# else /* ACE_HAS_STANDARD_CPP_LIBRARY */
+#else /* ! ACE_HAS_STANDARD_CPP_LIBRARY */
-class ios;
-class streambuf;
-class istream;
-class ostream;
-class iostream;
-class filebuf;
-class ifstream;
-class ofstream;
-class fstream;
+ class ios;
+ class streambuf;
+ class istream;
+ class ostream;
+ class iostream;
+ class filebuf;
+ class ifstream;
+ class ofstream;
+ class fstream;
-# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
+# endif /* ! ACE_HAS_STANDARD_CPP_LIBRARY */
#endif /* ACE_IOSFWD_H */
diff --git a/ace/streams.h b/ace/streams.h
index 290b17a89ba..81cf896d958 100644
--- a/ace/streams.h
+++ b/ace/streams.h
@@ -22,96 +22,100 @@
// ============================================================================
#ifndef ACE_STREAMS_H
-# define ACE_STREAMS_H
+#define ACE_STREAMS_H
-# include "ace/inc_user_config.h"
+#include "ace/inc_user_config.h"
-# if !defined (ACE_LACKS_PRAGMA_ONCE)
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
-# endif /* ACE_LACKS_PRAGMA_ONCE */
-
-# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
-
-# if defined (_MSC_VER)
-#pragma warning(disable: 4018 4114 4146 4245)
-#pragma warning(disable: 4663 4664 4665 4511 4512)
-# endif /* _MSC_VER */
-
-# if defined (ACE_USES_OLD_IOSTREAMS)
-#include /**/ <iostream.h>
-#include /**/ <fstream.h>
-# else
-#include /**/ <iomanip>
-#include /**/ <ios>
-#include /**/ <iostream>
-#include /**/ <istream>
-#include /**/ <ostream>
-#include /**/ <fstream>
-#include /**/ <streambuf>
-# endif /* ACE_USES_OLD_IOSTREAMS */
-
-# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
- (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)
-
-# if !defined (ACE_USES_OLD_IOSTREAMS)
-// Make these available in the global name space
-using std::ios;
-using std::streambuf;
-using std::istream;
-using std::ostream;
-using std::iostream;
-using std::filebuf;
-using std::ifstream;
-using std::ofstream;
-using std::fstream;
-
-using std::cin;
-using std::cout;
-using std::cerr;
-using std::clog;
-
-using std::endl;
-using std::ends;
-using std::flush;
-
-using std::ws;
-
-using std::resetiosflags;
-using std::setfill;
-using std::setiosflags;
-using std::setprecision;
-using std::setw;
-
-using std::dec;
-using std::hex;
-using std::oct;
-# endif /* ! ACE_USES_OLD_IOSTREAMS */
-
-# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
-
-# if defined (_MSC_VER)
-#pragma warning(4: 4018 4114 4146 4245)
-#pragma warning(4: 4663 4664 4665 4512 4511)
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && \
+ (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
+
+# if defined (_MSC_VER)
+# pragma warning(disable: 4018 4114 4146 4245)
+# pragma warning(disable: 4663 4664 4665 4511 4512)
+# endif /* _MSC_VER */
+
+# if defined (ACE_USES_OLD_IOSTREAMS)
+# include /**/ <iostream.h>
+# include /**/ <fstream.h>
+# include /**/ <istream.h>
+# include /**/ <ostream.h>
+# include /**/ <iomanip.h>
+# else
+# include /**/ <iostream>
+# include /**/ <fstream>
+# include /**/ <istream>
+# include /**/ <ostream>
+# include /**/ <streambuf>
+# include /**/ <iomanip>
+# include /**/ <ios>
+# endif /* ACE_USES_OLD_IOSTREAMS */
+
+# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
+ (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)
+
+# if !defined (ACE_USES_OLD_IOSTREAMS)
+ // Make these available in the global name space
+ using std::ios;
+ using std::streambuf;
+ using std::istream;
+ using std::ostream;
+ using std::iostream;
+ using std::filebuf;
+ using std::ifstream;
+ using std::ofstream;
+ using std::fstream;
+
+ using std::cin;
+ using std::cout;
+ using std::cerr;
+ using std::clog;
+
+ using std::endl;
+ using std::ends;
+ using std::flush;
+
+ using std::ws;
+
+ using std::resetiosflags;
+ using std::setfill;
+ using std::setiosflags;
+ using std::setprecision;
+ using std::setw;
+
+ using std::dec;
+ using std::hex;
+ using std::oct;
+# endif /* ! ACE_USES_OLD_IOSTREAMS */
+
+# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
+
+# if defined (_MSC_VER)
+# pragma warning(4: 4018 4114 4146 4245)
+# pragma warning(4: 4663 4664 4665 4512 4511)
+# endif /* _MSC_VER */
+
+#else /* ! ACE_HAS_STANDARD_CPP_LIBRARY */
+
+# if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
+# include /**/ <fstream.h>
+# include /**/ <iostream.h>
+
+# if defined (ACE_WIN32)
+# if defined(_MSC_VER) // VSB
+# include /**/ <ios.h>
+# include /**/ <streamb.h>
+# include /**/ <istream.h>
+# include /**/ <ostream.h>
+# include /**/ <iomanip.h>
# endif /* _MSC_VER */
+# include /**/ <strstrea.h> // VSB
+# endif /* ACE_WIN32 */
+# endif /* ACE_LACKS_IOSTREAM_TOTALLY */
-# else /* ACE_HAS_STANDARD_CPP_LIBRARY */
-
-# if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-#include /**/ <fstream.h>
-#include /**/ <iostream.h>
-
-# if defined (ACE_WIN32)
-# if defined(_MSC_VER) // VSB
-#include /**/ <ios.h>
-#include /**/ <streamb.h>
-#include /**/ <istream.h>
-#include /**/ <ostream.h>
-#include /**/ <iomanip.h>
-# endif /* _MSC_VER */
-#include /**/ <strstrea.h> // VSB
-# endif /* ACE_WIN32 */
-# endif /* ACE_LACKS_IOSTREAM_TOTALLY */
-
-# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
+#endif /* ! ACE_HAS_STANDARD_CPP_LIBRARY */
#endif /* ACE_STREAMS_H */
View Lorry Controller Status