diff options
27 files changed, 79 insertions, 55 deletions
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index 9de8184123b..b95b97d307a 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -16,6 +16,7 @@ #include /**/ "ace/pre.h" #include "tao/Reply_Dispatcher.h" +#include "tao/CDR.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Bounds.pidl b/TAO/tao/Bounds.pidl index 9f15a435d8c..f3898078bdf 100644 --- a/TAO/tao/Bounds.pidl +++ b/TAO/tao/Bounds.pidl @@ -10,7 +10,7 @@ * following command: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GT -GA -Sc + * -o orig -Ge 1 -GT -GA -Sc * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index ef599a9d4cf..68ec03cf4b4 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -1,12 +1,13 @@ // $Id$ -#include "Connector_Registry.h" -#include "ORB_Core.h" -#include "Profile.h" -#include "Transport_Connector.h" -#include "Protocol_Factory.h" -#include "debug.h" -#include "ORB_Constants.h" +#include "tao/Connector_Registry.h" +#include "tao/ORB_Core.h" +#include "tao/Profile.h" +#include "tao/Transport_Connector.h" +#include "tao/Protocol_Factory.h" +#include "tao/debug.h" +#include "tao/ORB_Constants.h" +#include "tao/CDR.h" #if !defined(__ACE_INLINE__) #include "tao/Connector_Registry.i" diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl index dc4b5684fd8..3b7b8e66c61 100644 --- a/TAO/tao/Current.pidl +++ b/TAO/tao/Current.pidl @@ -19,8 +19,9 @@ // command used for this is: // // tao_idl.exe -// -o orig -Gp -Gd -Ge 1 -GT -GA +// -o orig -Gp -Gd -Ge 1 -GT -GA -Sc // -Wb,export_macro=TAO_Export +// -Wb,export_include="tao/TAO_Export.h" // -Wb,pre_include="ace/pre.h" // -Wb,post_include="ace/post.h" // Current.pidl diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl index 55a3c6181a1..e2e3676bf9a 100644 --- a/TAO/tao/Domain.pidl +++ b/TAO/tao/Domain.pidl @@ -14,7 +14,7 @@ * command used for this is: * * tao_idl - * -o orig -St -Gp -Gd -Ge 1 -GT -GA + * -o orig -Gp -Gd -Ge 1 -GT -GA * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index 461673bd359..b67fd33b7cb 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -26,6 +26,7 @@ #include "tao/GIOP_Message_Generator_Parser_Impl.h" #include "tao/GIOP_Utils.h" #include "tao/GIOP_Message_State.h" +#include "tao/CDR.h" class TAO_Pluggable_Reply_Params; class TAO_Queued_Data; diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp index 5ab223e8171..c94101ba183 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp @@ -1,7 +1,10 @@ +// -*- C++ -*- + #include "tao/GIOP_Message_Generator_Parser.h" #include "tao/Pluggable_Messaging_Utils.h" #include "tao/GIOP_Utils.h" #include "tao/debug.h" +#include "tao/CDR.h" #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index 074713c0799..dbb03b131b8 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -1,13 +1,14 @@ // -*- C++ -*- -#include "GIOP_Message_Generator_Parser_10.h" -#include "GIOP_Utils.h" -#include "GIOP_Message_Locate_Header.h" -#include "operation_details.h" -#include "debug.h" -#include "Pluggable_Messaging_Utils.h" -#include "TAO_Server_Request.h" -#include "ORB_Constants.h" +#include "tao/GIOP_Message_Generator_Parser_10.h" +#include "tao/GIOP_Utils.h" +#include "tao/GIOP_Message_Locate_Header.h" +#include "tao/operation_details.h" +#include "tao/debug.h" +#include "tao/Pluggable_Messaging_Utils.h" +#include "tao/TAO_Server_Request.h" +#include "tao/ORB_Constants.h" +#include "tao/CDR.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index fb83f49e386..ecd0146f81f 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -1,14 +1,15 @@ -#include "GIOP_Message_Generator_Parser_12.h" -#include "GIOPC.h" -#include "GIOP_Utils.h" -#include "GIOP_Message_Locate_Header.h" -#include "operation_details.h" -#include "debug.h" -#include "Pluggable_Messaging_Utils.h" -#include "TAO_Server_Request.h" -#include "TAOC.h" -#include "ORB_Core.h" -#include "Transport.h" +#include "tao/GIOP_Message_Generator_Parser_12.h" +#include "tao/GIOPC.h" +#include "tao/GIOP_Utils.h" +#include "tao/GIOP_Message_Locate_Header.h" +#include "tao/operation_details.h" +#include "tao/debug.h" +#include "tao/Pluggable_Messaging_Utils.h" +#include "tao/TAO_Server_Request.h" +#include "tao/TAOC.h" +#include "tao/ORB_Core.h" +#include "tao/Transport.h" +#include "tao/CDR.h" #if !defined (__ACE_INLINE__) # include "GIOP_Message_Generator_Parser_12.inl" diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index b10ef17982c..287ce11008d 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -25,6 +25,7 @@ #include "tao/Pluggable_Messaging_Utils.h" #include "tao/GIOP_Utils.h" #include "tao/Exception.h" +#include "tao/CDR.h" class TAO_Operation_Details; class TAO_Pluggable_Reply_Params; diff --git a/TAO/tao/GIOP_Utils.cpp b/TAO/tao/GIOP_Utils.cpp index cccf8dfb8df..e5cada746e1 100644 --- a/TAO/tao/GIOP_Utils.cpp +++ b/TAO/tao/GIOP_Utils.cpp @@ -2,7 +2,8 @@ #include "tao/GIOP_Utils.h" #include "tao/debug.h" -#include "Transport.h" +#include "tao/Transport.h" +#include "tao/CDR.h" #if !defined (__ACE_INLINE__) # include "tao/GIOP_Utils.i" diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl index bfb88abd2e2..c7d73dba4fd 100644 --- a/TAO/tao/IIOP.pidl +++ b/TAO/tao/IIOP.pidl @@ -8,21 +8,21 @@ // is: // // tao_idl \ -// -o orig -Gp -Gd -Ge 1 -GT -GA +// -o orig -Gp -Gd -Ge 1 -GT -GA -Sc // -Wb,export_macro=TAO_Export \ // -Wb,export_include="tao/TAO_Export.h" \ // -Wb,pre_include="ace/pre.h" \ // -Wb,post_include="ace/post.h" \ // IIOP.pidl // -// Remember to patch the generated files using diff/IIOP.diff +// Remember to patch the generated files using diff/IIOP.diff // This is from the GIOP 1.2 spec for Bi Dir IIOP. #ifndef TAO_IIOP_PIDL #define TAO_IIOP_PIDL // This is a OMG specified IDL. When IIOP modules start getting -// complicated we may want to have them here. +// complicated we may want to have them here. #pragma prefix "omg.org" diff --git a/TAO/tao/IIOP_Endpoints.pidl b/TAO/tao/IIOP_Endpoints.pidl index 57faad77f71..18163b527d2 100644 --- a/TAO/tao/IIOP_Endpoints.pidl +++ b/TAO/tao/IIOP_Endpoints.pidl @@ -23,7 +23,7 @@ // is: // // tao_idl -// -o orig -Ge 1 -GT -GA \ +// -o orig -Ge 1 -GT -GA -Sc \ // -Wb,export_macro=TAO_Export \ // -Wb,export_include="tao/TAO_Export.h" \ // -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index dc80f0bef52..fcdb8699726 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -1,13 +1,13 @@ -#include "IIOP_Profile.h" -#include "Environment.h" -#include "ORB_Core.h" -#include "debug.h" -#include "IIOP_EndpointsC.h" +#include "tao/IIOP_Profile.h" +#include "tao/Environment.h" +#include "tao/ORB_Core.h" +#include "tao/debug.h" +#include "tao/IIOP_EndpointsC.h" +#include "tao/CDR.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdio.h" - ACE_RCSID (tao, IIOP_Profile, "$Id$") diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 494ffd266eb..09378a0ba4d 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -5,12 +5,13 @@ #include "NVList.h" -#include "BoundsC.h" -#include "debug.h" -#include "Typecode.h" -#include "Marshal.h" -#include "CORBA_String.h" -#include "Any_Impl.h" +#include "tao/BoundsC.h" +#include "tao/debug.h" +#include "tao/Typecode.h" +#include "tao/Marshal.h" +#include "tao/CORBA_String.h" +#include "tao/Any_Impl.h" +#include "tao/CDR.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index f3a1e7210fd..8c6e3403f1b 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -26,6 +26,7 @@ ACE_RCSID (tao, #include "CodecFactory_ORBInitializer.h" #include "TypeCodeFactory_Adapter.h" #include "debug.h" +#include "CDR.h" #if TAO_HAS_INTERCEPTORS == 1 # include "PICurrent_ORBInitializer.h" /* @@ This should go away! */ diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index cefc2858b06..78cc2822597 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -16,6 +16,7 @@ #include "Dynamic_Adapter.h" #include "IFR_Client_Adapter.h" #include "Remote_Object_Proxy_Broker.h" +#include "CDR.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 0592aa5460f..a54f817d33f 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -1,12 +1,13 @@ // $Id$ -#include "Profile.h" -#include "Messaging_PolicyValueC.h" -#include "Stub.h" -#include "debug.h" -#include "target_specification.h" -#include "ORB_Core.h" -#include "Client_Strategy_Factory.h" +#include "tao/Profile.h" +#include "tao/Messaging_PolicyValueC.h" +#include "tao/Stub.h" +#include "tao/debug.h" +#include "tao/target_specification.h" +#include "tao/ORB_Core.h" +#include "tao/Client_Strategy_Factory.h" +#include "tao/CDR.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp index 3d24b561d92..a81e7076a56 100644 --- a/TAO/tao/Service_Context.cpp +++ b/TAO/tao/Service_Context.cpp @@ -3,6 +3,7 @@ // #include "tao/Service_Context.h" +#include "tao/CDR.h" #if !defined (__ACE_INLINE__) # include "tao/Service_Context.inl" @@ -11,7 +12,7 @@ #include "ace/OS_NS_string.h" ACE_RCSID (tao, - Service_Context, + Service_Context, "$Id$") void @@ -166,7 +167,7 @@ TAO_Service_Context::get_context (IOP::ServiceContext& context) const } int -TAO_Service_Context::get_context (IOP::ServiceId id, +TAO_Service_Context::get_context (IOP::ServiceId id, const IOP::ServiceContext **context) const { for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i) diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index 9422edf0afe..f8312d1acfe 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "tao/Protocols_Hooks.h" #include "tao/Codeset_Manager.h" +#include "tao/CDR.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 6655a560bfd..5dbdb757fe3 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -11,6 +11,7 @@ #include "tao/Server_Strategy_Factory.h" #include "tao/debug.h" #include "tao/Codeset_Manager.h" +#include "tao/CDR.h" #if !defined(__ACE_INLINE__) #include "SHMIOP_Acceptor.i" diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index 39e6fb3c459..4e6426118b0 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -7,6 +7,7 @@ #include "Pluggable_Messaging.h" #include "GIOP_Utils.h" #include "Transport.h" +#include "CDR.h" #if !defined (__ACE_INLINE__) # include "TAO_Server_Request.i" diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp index 22de8180f7a..5bf66ad180d 100644 --- a/TAO/tao/Tagged_Components.cpp +++ b/TAO/tao/Tagged_Components.cpp @@ -1,6 +1,7 @@ // $Id$ #include "tao/Tagged_Components.h" +#include "tao/CDR.h" #if !defined (__ACE_INLINE__) # include "tao/Tagged_Components.i" diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp index 739d2a0be4d..034badc8d9d 100644 --- a/TAO/tao/UB_String_Argument_T.cpp +++ b/TAO/tao/UB_String_Argument_T.cpp @@ -5,6 +5,7 @@ #include "tao/UB_String_Argument_T.h" #include "tao/Dynamic_ParameterC.h" +#include "tao/CDR.h" #if !defined (__ACE_INLINE__) #include "tao/UB_String_Argument_T.inl" diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index 04743cbe8c2..320ecaa395b 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -7,6 +7,7 @@ #include "tao/ORB_Core.h" #include "tao/Profile.h" #include "tao/debug.h" +#include "tao/CDR.h" #if !defined (__ACE_INLINE__) # include "AbstractBase.inl" diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index 0f5f7c152ea..2a740b7b815 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -7,6 +7,7 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" #include "tao/Typecode.h" +#include "tao/CDR.h" #if !defined (__ACE_INLINE__) # include "ValueBase.inl" diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 08d20666ce7..ec87a233a43 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -25,6 +25,7 @@ #include "ORB_Core.h" #include "Typecode.h" #include "Any.h" +#include "tao/CDR.h" #include "ace/Dynamic_Service.h" ACE_RCSID (tao, |