diff options
| author | harrison <harrison@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1996-11-18 06:22:27 +0000 |
|---|---|---|
| committer | harrison <harrison@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1996-11-18 06:22:27 +0000 |
| commit | f985ba82b99849013b78dfd2a6857eaf564e19bc (patch) | |
| tree | 2b7cb6915eca277bfe6d461ab4521719086348d0 | |
| parent | 8867e73607bc3ca0e7d0694caa7416fc0464fa69 (diff) | |
| download | ATCD-f985ba82b99849013b78dfd2a6857eaf564e19bc.tar.gz | |
Check ChangeLog
| -rw-r--r-- | ace/Log_Record.h | 6 | ||||
| -rw-r--r-- | ace/OS.h | 2 | ||||
| -rw-r--r-- | ace/stdcpp.h | 48 |
3 files changed, 49 insertions, 7 deletions
diff --git a/ace/Log_Record.h b/ace/Log_Record.h index 48aa06513bf..3d73cdd23a4 100644 --- a/ace/Log_Record.h +++ b/ace/Log_Record.h @@ -21,12 +21,6 @@ #include "ace/ACE.h" #include "ace/Log_Priority.h" -#if defined (ACE_WIN32) && defined (ACE_HAS_STL) -#include <iostream> -#else -#include <iostream.h> -#endif - class ACE_Export ACE_Log_Record { // = TITLE @@ -810,12 +810,12 @@ typedef int ACE_thread_t; typedef int ACE_hthread_t; typedef int ACE_thread_key_t; #endif /* ACE_HAS_THREADS */ - #include <sys/types.h> #include <assert.h> #include <sys/stat.h> #include <limits.h> #include <stdio.h> +#include "ace/stdcpp.h" #include <new.h> #include <ctype.h> #include <signal.h> diff --git a/ace/stdcpp.h b/ace/stdcpp.h new file mode 100644 index 00000000000..35729cf98f1 --- /dev/null +++ b/ace/stdcpp.h @@ -0,0 +1,48 @@ +/* -*- C++ -*- */ +// $Id: stdcpp.h + +// ============================================================================ +// +// = LIBRARY +// ace +// +// = FILENAME +// stdcpp.h +// +// = AUTHOR +// Irfan and Tim +// +// = DESCRIPTION +// This file contains the portability ugliness for the Standard C++ +// Library. As implementations of the "standard" emerge, this file +// will need to be updated. +// +// ============================================================================ + +#include "ace/config.h" + +#if defined (ACE_WIN32) +#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) +// For some reason, The Standard C++ Library has decided to save space +// and ommit the file extensions. +#include <iomanip> +#include <ios> +#include <iostream> +#include <istream> +#include <ostream> +#include <streambuf> +#else /* ACE_HAS_STANDARD_CPP_LIBRARY */ +#include <fstream.h> +#include <iomanip.h> +#include <ios.h> +#include <iostream.h> +#include <istream.h> +#include <ostream.h> +#include <streamb.h> +#include <strstrea.h> +#endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ +#else /* ACE_WIN32 */ +// All platforms except for NT include iostream.h. +#include <iostream.h> +#endif /* ACE_WIN32 */ + |