diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-10 17:21:47 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-10 17:21:47 +0000 |
| commit | 9d770f1b3b4508871123a5b56dfdbf27cc7cfe4c (patch) | |
| tree | 0d446bc590dd85baefcf31840e8956d31579bcfd | |
| parent | 0e53be37e51b7f64f19c2e675df386d88c3306b8 (diff) | |
| download | ATCD-9d770f1b3b4508871123a5b56dfdbf27cc7cfe4c.tar.gz | |
ChangeLogTag: Wed Jul 10 12:19:39 2002 Jeff Parsons <parsons@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/TAO_IDL/include/utl_identifier.h | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/include/utl_string.h | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/include/utl_strlist.h | 6 |
4 files changed, 30 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 259646d907e..4be149f71ab 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Wed Jul 10 12:19:39 2002 Jeff Parsons <parsons@cs.wustl.edu> + + * TAO_IDL/include/utl_identifier.h: + * TAO_IDL/include/utl_string.h: + * TAO_IDL/include/utl_strlist.h: + + More files to which the conditional include of ace/streams.h + is needed for BCB. Thanks again to Johnny Willemsen + <jwillemsen@remedy.nl> for his help in maintaining the + BCB builds. + Wed Jul 10 10:11:30 2002 Mayur Deshpande <mayur@ics.uci.edu> * TAO_IDL/be/be_visitor_valuetype/arglist.cpp (visit_operation): diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h index 5aef90772af..5f3cce7d269 100644 --- a/TAO/TAO_IDL/include/utl_identifier.h +++ b/TAO/TAO_IDL/include/utl_identifier.h @@ -67,9 +67,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #ifndef _UTL_IDENTIFIER_UTL_IDENTIFIER_HH #define _UTL_IDENTIFIER_UTL_IDENTIFIER_HH -#include "ace/OS.h" #include "TAO_IDL_FE_Export.h" #include "idl_bool.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 class TAO_IDL_FE_Export Identifier { diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h index 28a4be6b14b..b07cb92ad83 100644 --- a/TAO/TAO_IDL/include/utl_string.h +++ b/TAO/TAO_IDL/include/utl_string.h @@ -71,6 +71,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "idl_bool.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 + class TAO_IDL_FE_Export UTL_String { // =TITLE diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h index 9a4a02cab9f..75450839ad1 100644 --- a/TAO/TAO_IDL/include/utl_strlist.h +++ b/TAO/TAO_IDL/include/utl_strlist.h @@ -70,6 +70,12 @@ 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 + class UTL_String; // List of String nodes. |