From 03738307d734b91d1a100e40064784335006aa72 Mon Sep 17 00:00:00 2001 From: parsons Date: Wed, 10 Jul 2002 13:41:28 +0000 Subject: ChangeLogTag: Wed Jul 10 08:36:49 2002 Jeff Parsons --- TAO/ChangeLog | 11 +++++++++++ TAO/TAO_IDL/include/ast_decl.h | 6 ------ TAO/TAO_IDL/include/utl_idlist.h | 7 ++++++- TAO/TAO_IDL/include/utl_indenter.h | 7 +++++++ 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7c2cd4183f0..14ddc85884f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Wed Jul 10 08:36:49 2002 Jeff Parsons + + * TAO_IDL/include/ast_decl.h: + * TAO_IDL/include/utl_idlist.h: + * TAO_IDL/include/utl_indenter.h: + + Removed the conditional include of ace/streams.h for BCB + from ast_decl.h and added it to the two other files. Thanks + to Johnny Willemsen and Chris Kohlhoff + for tracking this down. + Tue Jul 9 16:31:58 2002 Jaiganesh Balasubramanian * orbsvcs/tests/Security/Big_Request/Makefile: diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index 40128efa07f..4620d3b3124 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -77,12 +77,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_scoped_name.h" #include "idl_narrow.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 - // This is for AIX w/IBM C++ class Identifier; diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h index 92a38e297cc..5b82ae238c1 100644 --- a/TAO/TAO_IDL/include/utl_idlist.h +++ b/TAO/TAO_IDL/include/utl_idlist.h @@ -75,10 +75,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // will cease to operate correctly if you use either multiple or // public virtual inheritance. -#include "TAO_IDL_FE_Export.h" #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 Identifier; class TAO_IDL_FE_Export UTL_IdList : public UTL_List diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h index 451fffe6417..2b59f95ff1f 100644 --- a/TAO/TAO_IDL/include/utl_indenter.h +++ b/TAO/TAO_IDL/include/utl_indenter.h @@ -69,6 +69,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #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 + + // Utility class for control of indentation level during dumping // May also be useful for BEs that want to produce nicely formatted // output. -- cgit v1.2.1