From 31d5296eb34f59ee4576c775653544bf3b3807c7 Mon Sep 17 00:00:00 2001 From: dhinton Date: Mon, 6 May 2002 15:59:06 +0000 Subject: ChangeLogTag:Mon May 6 15:53:39 UTC 2002 Don Hinton --- ChangeLog | 10 +++ ChangeLogs/ChangeLog-02a | 10 +++ ChangeLogs/ChangeLog-03a | 10 +++ TAO/ChangeLogs/ChangeLog-02a | 86 ++++++++++++++++++++++++++ TAO/tao/Asynch_Queued_Message.cpp | 10 ++- TAO/tao/CORBA_String.cpp | 1 + TAO/tao/CORBA_String.h | 1 + TAO/tao/Cleanup_Func_Registry.cpp | 2 + TAO/tao/Cleanup_Func_Registry.h | 1 + TAO/tao/Endpoint.h | 2 + TAO/tao/Environment.h | 2 + TAO/tao/Flushing_Strategy.h | 1 + TAO/tao/ORBInitInfo.h | 1 + TAO/tao/Parser_Registry.h | 2 + TAO/tao/Principal.h | 1 + TAO/tao/Queued_Message.h | 1 + TAO/tao/RTCORBA/Private_Transport_Descriptor.h | 1 + TAO/tao/Sequence.h | 1 + TAO/tao/Sequence.i | 5 +- TAO/tao/Sequence_T.cpp | 2 + TAO/tao/Sequence_T.i | 2 + TAO/tao/Synch_Queued_Message.cpp | 2 + TAO/tao/TAO_Singleton.h | 1 + TAO/tao/TAO_Singleton_Manager.h | 1 + TAO/tao/Thread_Lane_Resources.h | 1 + TAO/tao/ValueBase.h | 3 +- TAO/tao/ValueFactory.h | 1 + TAO/tao/Wait_Strategy.h | 1 + TAO/tao/corbafwd.cpp | 10 +-- TAO/tao/corbafwd.i | 2 + ace/Array_Base.cpp | 1 + ace/Unbounded_Set.cpp | 1 + 32 files changed, 167 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff5db63f3f1..e7d7fb9556e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon May 6 15:53:39 UTC 2002 Don Hinton + + * ace/Array_Base.cpp: + + Added include of OS_Errno.h. + + * ace/Unbounded_Set.cpp: + + Added include of Global_Macros.h to pick up the ACE_DES* macros. + Mon May 6 09:33:00 UTC 2002 Don Hinton * ace/TLI_Acceptor.cpp: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index ff5db63f3f1..e7d7fb9556e 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Mon May 6 15:53:39 UTC 2002 Don Hinton + + * ace/Array_Base.cpp: + + Added include of OS_Errno.h. + + * ace/Unbounded_Set.cpp: + + Added include of Global_Macros.h to pick up the ACE_DES* macros. + Mon May 6 09:33:00 UTC 2002 Don Hinton * ace/TLI_Acceptor.cpp: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index ff5db63f3f1..e7d7fb9556e 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,13 @@ +Mon May 6 15:53:39 UTC 2002 Don Hinton + + * ace/Array_Base.cpp: + + Added include of OS_Errno.h. + + * ace/Unbounded_Set.cpp: + + Added include of Global_Macros.h to pick up the ACE_DES* macros. + Mon May 6 09:33:00 UTC 2002 Don Hinton * ace/TLI_Acceptor.cpp: diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 88b85b79c13..18e42aa506d 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,89 @@ +Mon May 6 15:53:39 UTC 2002 Don Hinton + + * tao/RTCORBA/Private_Transport_Descriptor.h: + + Added include of ace/Global_Macros.h. + + * tao/Thread_Lan_Resources.h: + + Added include of ace/Synch_T.h. + + * tao/Asynch_Queued_Message.cpp: + + Added include of ace/Message_Block.h, OS_Errno.h, and OS_String.h + and changed ACE_OS to ACE_OS_String. + + * tao/Synch_Queued_Message.cpp: + + Added include of ace/Message_Block.h and ace/Log_Msg.h. + + * tao/Queued_Message.h: + + Added include oface/ace_sys_uio.h. + + * tao/Parser_Registry.h: + + Added include of Global_Macros.h. + + * tao/Flushing_Strategy.h: + * tao/Wait_Strategy.h: + + Added forward declaration of ACE_Time_Value. + + * tao/corbafwd.{cpp,i}: + + cpp: Added include of ace/OS_String.h, and changed ACE_OS + to ACE_OS_String. + + i: Added include of ace/OS_Errno.h. Also, the alloc/free functions + are inlined, thus probably have the windows heap problem. + + * tao/CORBA_String.cpp: + + Added include of ace/OS.h. + + * tao/Sequence_T.{cpp,i}: + + cpp: Added include of ace/OS_Errno.h. + i: Added include of ace/Log_Msg.h. + + * tao/Environment.h: + + Added include of ace_stdio.h to get FILE, but need to remove + FILE parameter from these functions. + + * tao/Sequence.{h,i}: + + h: Added include of ace/Global_Macros.h. + i: Added include of ace/Message_Block.h and ace/OS_String.h and + changed ACE_OS to ACE_OS_String as needed. + + * tao/CORBA_String.h: + + Added include of ace/streams.h. + + * tao/ValueBase.h: + + Removed include of ace/OS.h. + + * tao/EndPoint.h: + * tao/Principal.h: + * tao/ValueFactory.h: + * tao/ValueBase.h: + + Added include of ace/Synch_T.h. to get *_SYNCH_MUTEX defs. + + * tao/Cleanup_Func_Registry.cpp: + + Added Log_Msg.h to get ACE_ASSERT. + + * tao/TAO_Singleton_Manager.h: + * tao/TAO_Singleton.h: + * tao/ORBInitInfo.h: + * tao/Cleanup_Func_Registry.h: + + Added include of ace/Object_Manager_Base.h. + Thu Apr 11 22:07:40 UTC 2002 Don Hinton * tao/TAO_IDL/driver/drv_preproc.cpp: diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index e33e3a97ccd..58ff6caa7d5 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -2,6 +2,10 @@ // $Id$ #include "Asynch_Queued_Message.h" +#include "ace/Message_Block.h" +#include "ace/OS_Errno.h" +#include "ace/OS_String.h" +#include "ace/Log_Msg.h" ACE_RCSID(tao, Asynch_Queued_Message, "$Id$") @@ -18,9 +22,9 @@ TAO_Asynch_Queued_Message:: i != 0; i = i->cont ()) { - ACE_OS::memcpy (this->buffer_ + copy_offset, - i->rd_ptr (), - i->length ()); + ACE_OS_String::memcpy (this->buffer_ + copy_offset, + i->rd_ptr (), + i->length ()); copy_offset += i->length (); } } diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp index 5e1e3181700..cea7fa13d12 100644 --- a/TAO/tao/CORBA_String.cpp +++ b/TAO/tao/CORBA_String.cpp @@ -9,6 +9,7 @@ # include "tao/CORBA_String.inl" #endif /* ! __ACE_INLINE__ */ +#include "ace/OS.h" ACE_RCSID(tao, CORBA_String, "$Id$") diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h index 2b384b952b6..4bcad1aedfa 100644 --- a/TAO/tao/CORBA_String.h +++ b/TAO/tao/CORBA_String.h @@ -254,6 +254,7 @@ private: }; # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) +# include "ace/streams.h" TAO_Export ostream & operator<< (ostream &, const CORBA::String_var &); diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp index d4bb023988e..50a08bbe4c5 100644 --- a/TAO/tao/Cleanup_Func_Registry.cpp +++ b/TAO/tao/Cleanup_Func_Registry.cpp @@ -8,6 +8,8 @@ # include "Cleanup_Func_Registry.inl" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" + ACE_RCSID (tao, Cleanup_Func_Registry, "$Id$") TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void) diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h index e0359acea7c..936b7c839b8 100644 --- a/TAO/tao/Cleanup_Func_Registry.h +++ b/TAO/tao/Cleanup_Func_Registry.h @@ -16,6 +16,7 @@ #include "corbafwd.h" #include "ace/Array_Base.h" +#include "ace/Object_Manager_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h index 4e4adfa7a96..f078853d593 100644 --- a/TAO/tao/Endpoint.h +++ b/TAO/tao/Endpoint.h @@ -24,6 +24,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Synch_T.h" // for *_SYNCH_MUTEX definitions. + /** * @class TAO_Endpoint * diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index 1779f5b6687..8700ebf17f7 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -28,6 +28,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/ace_stdio.h" + class TAO_ORB_Core; /** diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h index 0873936ccf4..6cb1d089698 100644 --- a/TAO/tao/Flushing_Strategy.h +++ b/TAO/tao/Flushing_Strategy.h @@ -22,6 +22,7 @@ class TAO_Transport; class TAO_Queued_Message; +class ACE_Time_Value; /** * @class TAO_Flushing_Strategy diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h index 31cddd57891..25c6379582e 100644 --- a/TAO/tao/ORBInitInfo.h +++ b/TAO/tao/ORBInitInfo.h @@ -24,6 +24,7 @@ #include "PortableInterceptorC.h" #include "LocalObject.h" #include "StringSeqC.h" +#include "ace/Object_Manager_Base.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h index cf78deaabbd..1363a0638a6 100644 --- a/TAO/tao/Parser_Registry.h +++ b/TAO/tao/Parser_Registry.h @@ -23,6 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Global_Macros.h" + // Forward declarations. class TAO_ORB_Core; diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index 9213e247775..0e318fd15b8 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -25,6 +25,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "OctetSeqC.h" +#include "ace/Synch_T.h" /** * @class CORBA_Principal diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h index 591aeb01b11..4161692586c 100644 --- a/TAO/tao/Queued_Message.h +++ b/TAO/tao/Queued_Message.h @@ -16,6 +16,7 @@ #include "corbafwd.h" #include "LF_Event.h" +#include "ace/ace_sys_uio.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTCORBA/Private_Transport_Descriptor.h b/TAO/tao/RTCORBA/Private_Transport_Descriptor.h index c98faf0a822..9ed23a89cde 100644 --- a/TAO/tao/RTCORBA/Private_Transport_Descriptor.h +++ b/TAO/tao/RTCORBA/Private_Transport_Descriptor.h @@ -23,6 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Transport_Descriptor_Interface.h" +#include "ace/Global_Macros.h" class TAO_RTCORBA_Export TAO_Private_Transport_Descriptor: public TAO_Transport_Descriptor_Interface diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h index 93b574f2a01..6566070f4e4 100644 --- a/TAO/tao/Sequence.h +++ b/TAO/tao/Sequence.h @@ -22,6 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Managed_Types.h" +#include "ace/Global_Macros.h" class CORBA_Object; class CORBA_Environment; diff --git a/TAO/tao/Sequence.i b/TAO/tao/Sequence.i index b8de5ad0e10..7581a881801 100644 --- a/TAO/tao/Sequence.i +++ b/TAO/tao/Sequence.i @@ -3,6 +3,9 @@ // Operations on the unbounded sequence class. +#include "ace/OS_String.h" +#include "ace/Message_Block.h" + ACE_INLINE TAO_Base_Sequence::TAO_Base_Sequence (void) : maximum_ (0), @@ -288,7 +291,7 @@ TAO_Unbounded_Sequence::get_buffer (CORBA::Boolean orphan) // buffer comes from a CDR stream. // result = TAO_Unbounded_Sequence::allocbuf (this->length_); - ACE_OS::memcpy (result, this->buffer_, this->length_); + ACE_OS_String::memcpy (result, this->buffer_, this->length_); } else if (this->release_ != 0) { diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp index f22c7350642..80e11a46498 100644 --- a/TAO/tao/Sequence_T.cpp +++ b/TAO/tao/Sequence_T.cpp @@ -10,6 +10,8 @@ #include "tao/Sequence_T.i" #endif /* __ACE_INLINE__ */ +#include "ace/OS_Errno.h" + ACE_RCSID (tao, Sequence_T, "$Id$") diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i index 7ecf78b9478..23d795189ca 100644 --- a/TAO/tao/Sequence_T.i +++ b/TAO/tao/Sequence_T.i @@ -5,6 +5,8 @@ // Operations on the generic unbounded sequence class. // *************************************************** +#include "ace/Log_Msg.h" + template ACE_INLINE T * TAO_Unbounded_Sequence::allocbuf (CORBA::ULong size) { diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp index 8381449928d..452932e37bf 100644 --- a/TAO/tao/Synch_Queued_Message.cpp +++ b/TAO/tao/Synch_Queued_Message.cpp @@ -2,6 +2,8 @@ // $Id$ #include "Synch_Queued_Message.h" +#include "ace/Message_Block.h" +#include "ace/Log_Msg.h" ACE_RCSID(tao, Synch_Queued_Message, "$Id$") diff --git a/TAO/tao/TAO_Singleton.h b/TAO/tao/TAO_Singleton.h index 3069d80edb6..cab9b965f05 100644 --- a/TAO/tao/TAO_Singleton.h +++ b/TAO/tao/TAO_Singleton.h @@ -20,6 +20,7 @@ #include "ace/pre.h" #include "ace/Synch.h" +#include "ace/Object_Manager_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index 3cb90214779..9ce6518a164 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -28,6 +28,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/OS.h" +#include "ace/Object_Manager_Base.h" // Adapter for cleanup, used to register cleanup function with the // ACE_Object_Manager. diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index bc038346759..e6f6f03fabd 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -19,6 +19,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/corbafwd.h" +#include "ace/Synch_T.h" class TAO_ORB_Core; class TAO_Acceptor_Registry; diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h index 4944dac56ea..7522ccc4bde 100644 --- a/TAO/tao/ValueBase.h +++ b/TAO/tao/ValueBase.h @@ -24,7 +24,8 @@ #ifdef TAO_HAS_VALUETYPE -#include "ace/OS.h" /* for ptr_arith_t */ +//#include "ace/OS.h" /* for ptr_arith_t */ +#include "ace/Synch_T.h" #include "tao/corbafwd.h" /** diff --git a/TAO/tao/ValueFactory.h b/TAO/tao/ValueFactory.h index 62499a07911..014db27bfc0 100644 --- a/TAO/tao/ValueFactory.h +++ b/TAO/tao/ValueFactory.h @@ -23,6 +23,7 @@ #ifdef TAO_HAS_VALUETYPE +#include "ace/Synch_T.h" class TAO_Export CORBA_ValueFactoryBase { diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h index a9bf3d29618..5a27a62b590 100644 --- a/TAO/tao/Wait_Strategy.h +++ b/TAO/tao/Wait_Strategy.h @@ -24,6 +24,7 @@ class TAO_ORB_Core; class TAO_Transport; class TAO_Synch_Reply_Dispatcher; +class ACE_Time_Value; /** * @class TAO_Wait_Strategy diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp index 426e29710a3..f63a0e22f03 100644 --- a/TAO/tao/corbafwd.cpp +++ b/TAO/tao/corbafwd.cpp @@ -6,6 +6,8 @@ # include "tao/corbafwd.i" #endif /* ! __ACE_INLINE__ */ +#include "ace/OS_String.h" + char * CORBA::string_dup (const char *str) { @@ -15,7 +17,7 @@ CORBA::string_dup (const char *str) return 0; } - size_t len = ACE_OS::strlen (str); + size_t len = ACE_OS_String::strlen (str); // This allocates an extra byte for the '\0'; char * copy = CORBA::string_alloc (len); @@ -24,7 +26,7 @@ CORBA::string_dup (const char *str) return 0; // The below memcpy() assumes that the destination is // a valid buffer. - ACE_OS::memcpy (copy, str, len + 1); + ACE_OS_String::memcpy (copy, str, len + 1); return copy; } @@ -41,13 +43,13 @@ CORBA::wstring_dup (const WChar *const str) return 0; } - CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS::wslen (str)); + CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS_String::wslen (str)); if (retval == 0) return 0; // The below wscpy() assumes that the destination is // a valid buffer. - return ACE_OS::wscpy (retval, str); + return ACE_OS_String::wscpy (retval, str); } // **************************************************************** diff --git a/TAO/tao/corbafwd.i b/TAO/tao/corbafwd.i index 60b8773438a..7fba063003e 100644 --- a/TAO/tao/corbafwd.i +++ b/TAO/tao/corbafwd.i @@ -1,6 +1,8 @@ // -*- C++ -*- // $Id$ +#include "ace/OS_Errno.h" + ACE_INLINE char * CORBA::string_alloc (CORBA::ULong len) { diff --git a/ace/Array_Base.cpp b/ace/Array_Base.cpp index dcee8e2864e..53565eaa898 100644 --- a/ace/Array_Base.cpp +++ b/ace/Array_Base.cpp @@ -14,6 +14,7 @@ #endif /* __ACE_INLINE__ */ #include "ace/Malloc_Base.h" +#include "ace/OS_Errno.h" ACE_RCSID(ace, Array_Base, "$Id$") diff --git a/ace/Unbounded_Set.cpp b/ace/Unbounded_Set.cpp index 7ba794a7564..46fcee5d71f 100644 --- a/ace/Unbounded_Set.cpp +++ b/ace/Unbounded_Set.cpp @@ -8,6 +8,7 @@ #include "ace/Log_Msg.h" #include "ace/OS_Errno.h" #include "ace/Trace.h" +#include "ace/Global_Macros.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once -- cgit v1.2.1