summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-07-21 16:44:15 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-07-21 16:44:15 +0000
commit6bf25b30dedf36df9cb0489996ccb86f1f16f85a (patch)
treeec07abed38b2f8bc842145244786eaa6da92f816
parentd556d99a494b6acc13beca80762baf21f11d8fd5 (diff)
downloadATCD-6bf25b30dedf36df9cb0489996ccb86f1f16f85a.tar.gz
ChangeLogTag: Mon Jul 21 11:41:17 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog_ref11
-rw-r--r--TAO/TAO_IDL/include/utl_idlist.h7
-rw-r--r--TAO/TAO_IDL/include/utl_indenter.h7
-rw-r--r--TAO/TAO_IDL/include/utl_strlist.h7
4 files changed, 13 insertions, 19 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index af6d041ae42..3f822598d83 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,6 +1,15 @@
+Mon Jul 21 11:41:17 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * TAO_IDL/include/utl_idlist.h:
+ * TAO_IDL/include/utl_indenter.h:
+ * TAO_IDL/include/utl_strlist.h:
+
+ Added include of ace/streams.h to each of these files, necessitated
+ by changes of include structure in ACE.
+
Mon Jul 21 07:19:17 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/CORBA_String.cpp: Include ace/string.h for getting it to
+ * tao/CORBA_String.cpp: Include ace/streams.h for getting it to
compile properly. Thanks to Jeff for reporting this.
Sun Jul 20 14:02:28 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h
index 5b82ae238c1..3c44a2b8b67 100644
--- a/TAO/TAO_IDL/include/utl_idlist.h
+++ b/TAO/TAO_IDL/include/utl_idlist.h
@@ -77,12 +77,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "utl_list.h"
#include "ace/OS.h"
-
-// Needed to recognize ACE_OSTREAM_TYPE, and for BCB it's
-// not included in ace/OS.h, so we include it here.
-#if defined (__BORLANDC__)
-# include "ace/streams.h"
-#endif
+#include "ace/streams.h"
class Identifier;
diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h
index 2b59f95ff1f..e43d5d65e27 100644
--- a/TAO/TAO_IDL/include/utl_indenter.h
+++ b/TAO/TAO_IDL/include/utl_indenter.h
@@ -68,12 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#define _UTL_INDENTER_UTL_INDENTER_HH
#include "ace/OS.h"
-
-// Needed to recognize ACE_OSTREAM_TYPE, and for BCB it's
-// not included in ace/OS.h, so we include it here.
-#if defined (__BORLANDC__)
-# include "ace/streams.h"
-#endif
+#include "ace/streams.h"
// Utility class for control of indentation level during dumping
diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h
index 75450839ad1..deb2c8cee01 100644
--- a/TAO/TAO_IDL/include/utl_strlist.h
+++ b/TAO/TAO_IDL/include/utl_strlist.h
@@ -69,12 +69,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "utl_list.h"
#include "ace/OS.h"
-
-// Needed to recognize ACE_OSTREAM_TYPE, and for BCB it's
-// not included in ace/OS.h, so we include it here.
-#if defined (__BORLANDC__)
-# include "ace/streams.h"
-#endif
+#include "ace/streams.h"
class UTL_String;