diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-04-23 23:18:43 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-04-23 23:18:43 +0000 |
| commit | 5d26fe05670cb1eccf072d71dc0cede173b6ad1e (patch) | |
| tree | 131e7d3aa02eadc85972c0625f4fba548bc9752e | |
| parent | ca7918aa913c6be9e9a8c2df85c48c2aec910aee (diff) | |
| download | ATCD-5d26fe05670cb1eccf072d71dc0cede173b6ad1e.tar.gz | |
ChangeLogTag:Wed Apr 23 18:19:07 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ace/iosfwd.h | 32 |
2 files changed, 22 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog index 30df9fef434..f147f038feb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Apr 23 18:19:07 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + * ace/iosfwd.h: + + Fixed another configuration where forward declarations would not + exist (i.e. ACE_HAS_STANDARD_CPP_LIBRARY && + ACE_USES_OLD_IOSTREAMS). + Wed Apr 23 16:57:45 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * ace/Multihomed_INET_Addr.cpp: Added explicit template diff --git a/ace/iosfwd.h b/ace/iosfwd.h index 38453880249..b2fdd7b76b4 100644 --- a/ace/iosfwd.h +++ b/ace/iosfwd.h @@ -37,6 +37,20 @@ # if !defined (ACE_USES_OLD_IOSTREAMS) || \ defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) # include /**/ <iosfwd> +# else + // NOTE: If these forward declarations don't work (e.g. aren't + // portable), we may have to include "ace/streams.h" as a last + // resort. Doing so would defeat the purpose of this header, + // unfortunately. + class ios; + class streambuf; + class istream; + class ostream; + class iostream; + class filebuf; + class ifstream; + class ofstream; + class fstream; # endif /* ! ACE_USES_OLD_IOSTREAMS || ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ # if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ @@ -55,24 +69,6 @@ using std::fstream; # endif /* ! ACE_USES_OLD_IOSTREAMS */ -# elif defined (ACE_USES_OLD_IOSTREAMS) \ - && !defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) - -// NOTE: If these forward declarations don't work (e.g. aren't -// portable), we may have to include "ace/streams.h" as a last -// resort. Doing so would defeat the purpose of this header, -// unfortunately. - - class ios; - class streambuf; - class istream; - class ostream; - class iostream; - class filebuf; - class ifstream; - class ofstream; - class fstream; - # endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ #else /* ! ACE_HAS_STANDARD_CPP_LIBRARY */ |