diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-08-23 07:32:14 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-08-23 07:32:14 +0000 |
commit | fe5533b6449f8ea04cdea5a0c92b44316d181b55 (patch) | |
tree | 5e75949adb3f2e7ae98387b032aaf87733a5148e | |
parent | 01a887ac35a85c4af2e09a2987d226f0b6be0fc0 (diff) | |
download | ATCD-fe5533b6449f8ea04cdea5a0c92b44316d181b55.tar.gz |
ChangeLogTag:Mon Aug 22 21:33:37 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
70 files changed, 275 insertions, 164 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e06bef80560..efc991a75a0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -17,7 +17,13 @@ Mon Aug 22 23:03:02 2005 J.T. Conklin <jtc@acorntoolworks.com> Mon Aug 22 21:33:37 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + * TAO_IDL/be/be_codegen.cpp: + + Another round of generated include directive reording to address + template related order of parsing issues in g++ 3.4.x or better. + * tao/Typecode_typesC.h: + * tao/ParameterModeC.h Removed unnecessary include directives. They were causing headers to be included that prematurely caused some templates to @@ -66,7 +72,74 @@ Mon Aug 22 21:33:37 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/AnyTypeCode/WCharSeqA.h: * tao/AnyTypeCode/WStringSeqA.h: * tao/AnyTypeCode/WrongTransactionA.h: - * tao/AnyTypeCode/orb_typesA.h: + * tao/AnyTypeCode/orb_typesA.h + * tao/BiDir_GIOP/BiDirGIOP.cpp: + * tao/CodecFactory/CDR_Encaps_Codec.cpp: + * tao/CodecFactory/CDR_Encaps_Codec.h: + * tao/CodecFactory/CodecFactory.h: + * tao/CodecFactory/CodecFactory_impl.cpp: + * tao/CodecFactory/CodecFactory_impl.h: + * tao/CodecFactory/IOP_CodecC.h: + * tao/CodecFactory/IOP_Codec_includeC.h: + * tao/Domain/DomainS.h: + * tao/DynamicAny/DynamicAny.h: + * tao/DynamicAny/DynamicAnyC.h: + * tao/DynamicInterface/Context.h: + * tao/DynamicInterface/DII_Arguments.cpp: + * tao/DynamicInterface/DII_Invocation.cpp: + * tao/DynamicInterface/ExceptionList.h: + * tao/IFR_Client/IFR_BaseC.h: + * tao/IFR_Client/IFR_BasicC.h: + * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp: + * tao/IFR_Client/IFR_ComponentsC.cpp: + * tao/IFR_Client/IFR_ExtendedC.cpp: + * tao/IFR_Client/IFR_ExtendedC.h: + * tao/Messaging/MessagingA.cpp: + * tao/Messaging/MessagingS.cpp: + * tao/Messaging/Messaging_No_ImplA.cpp: + * tao/Messaging/Messaging_RT_PolicyA.cpp: + * tao/Messaging/Messaging_SyncScope_PolicyA.cpp: + * tao/Messaging/PollableC.cpp: + * tao/Messaging/TAO_ExtA.cpp: + * tao/PI/ClientRequestInfo.h: + * tao/PI/ClientRequestInfoC.h: + * tao/PI/ClientRequestInterceptorA.cpp: + * tao/PI/ClientRequestInterceptor_Adapter_Impl.h: + * tao/PI/InterceptorA.cpp: + * tao/PI/Interceptor_List_T.cpp: + * tao/PI/InvalidSlotA.cpp: + * tao/PI/ORBInitInfoC.h: + * tao/PI/ORBInitializerA.cpp: + * tao/PI/ORBInitializer_Registry_Impl.h: + * tao/PI/PI.h: + * tao/PI/PICurrent.h: + * tao/PI/PICurrentA.cpp: + * tao/PI/PICurrent_Impl.h: + * tao/PI/PIForwardRequestA.cpp: + * tao/PI/PolicyFactoryC.h: + * tao/PI/RequestInfoC.h: + * tao/PI_Server/ServerInterceptorAdapter.h: + * tao/PI_Server/ServerRequestInfoC.h: + * tao/PI_Server/ServerRequestInterceptorC.h: + * tao/PortableServer/AdapterActivatorA.cpp: + * tao/PortableServer/ForwardRequestA.cpp: + * tao/PortableServer/IdAssignmentPolicyA.cpp: + * tao/PortableServer/IdUniquenessPolicyA.cpp: + * tao/PortableServer/ImplicitActivationPolicyA.cpp: + * tao/PortableServer/LifespanPolicyA.cpp: + * tao/PortableServer/POAManagerC.cpp: + * tao/PortableServer/PS_CurrentA.cpp: + * tao/PortableServer/PS_ForwardA.cpp: + * tao/PortableServer/PolicyS.cpp: + * tao/PortableServer/PortableServerA.cpp: + * tao/PortableServer/RequestProcessingPolicyA.cpp: + * tao/PortableServer/ServantActivatorA.cpp: + * tao/PortableServer/ServantLocatorA.cpp: + * tao/PortableServer/ServantManagerA.cpp: + * tao/PortableServer/ServantRetentionPolicyA.cpp: + * tao/PortableServer/ThreadPolicyA.cpp: + * tao/Valuetype/StringValueC.cpp: + * tao/Valuetype/ValueBase.cpp: Reordered include directives to make sure all necessary non-dependent names are parsed before the templates that use diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index c565ecba0df..6ba28e1129c 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1454,28 +1454,11 @@ TAO_CodeGen::gen_stub_hdr_includes (void) ); } - // This is true if we have a typecode or TCKind in the IDL file. - // If not included here, it will appear in *C.cpp, if TCs not suppressed. - this->gen_cond_file_include ( - idl_global->typecode_seen_ - | idl_global->any_seen_, - "tao/AnyTypeCode/TypeCode.h", - this->client_header_ - ); - - this->gen_cond_file_include ( - idl_global->any_seen_ - | idl_global->typecode_seen_, - "tao/AnyTypeCode/TypeCode_Constants.h", - this->client_header_); - - // This is true if we have an 'any' in the IDL file. - // If not included here, it will appear in *C.cpp, if Anys not suppressed. - this->gen_cond_file_include ( - idl_global->any_seen_, - "tao/AnyTypeCode/Any.h", - this->client_header_ - ); + this->gen_cond_file_include ((be_global->tc_support () + || idl_global->exception_seen_) + && !be_global->gen_anyop_files (), + "tao/AnyTypeCode/AnyTypeCode_methods.h", + this->client_header_); // @note This header should not go first. See the discussion above // regarding non-dependent template names. @@ -1523,6 +1506,29 @@ TAO_CodeGen::gen_stub_hdr_includes (void) this->client_header_ ); + // This is true if we have a typecode or TCKind in the IDL file. + // If not included here, it will appear in *C.cpp, if TCs not suppressed. + this->gen_cond_file_include ( + idl_global->typecode_seen_ + | idl_global->any_seen_, + "tao/AnyTypeCode/TypeCode.h", + this->client_header_ + ); + + this->gen_cond_file_include ( + idl_global->any_seen_ + | idl_global->typecode_seen_, + "tao/AnyTypeCode/TypeCode_Constants.h", + this->client_header_); + + // This is true if we have an 'any' in the IDL file. + // If not included here, it will appear in *C.cpp, if Anys not suppressed. + this->gen_cond_file_include ( + idl_global->any_seen_, + "tao/AnyTypeCode/Any.h", + this->client_header_ + ); + // Include the Messaging library entry point, if AMI is enabled. if (be_global->ami_call_back () == I_TRUE) { @@ -1615,6 +1621,12 @@ TAO_CodeGen::gen_stub_src_includes (void) << "\""; } + if ((be_global->tc_support () || idl_global->exception_seen_) + && !be_global->gen_anyop_files ()) + { + this->gen_typecode_includes (this->client_stubs_); + } + // Generate the include statement for the client header. We just // need to put only the base names. Path info is not required. *this->client_stubs_ << "\n#include \"" @@ -1699,12 +1711,6 @@ TAO_CodeGen::gen_stub_src_includes (void) "tao/ORB_Core.h"); } - if ((be_global->tc_support () || idl_global->exception_seen_) - && !be_global->gen_anyop_files ()) - { - this->gen_typecode_includes (this->client_stubs_); - } - // The UserException::_tao_{en,de}code() methods can throw a // CORBA::MARSHAL exception so make sure that system exception is // fully declared/defined by including "tao/SystemException.h". @@ -1876,11 +1882,19 @@ TAO_CodeGen::gen_any_file_includes (void) stream = this->anyop_source_; this->gen_standard_include (stream, - "tao/CDR.h"); - this->gen_standard_include (stream, "tao/AnyTypeCode/Any.h"); + this->gen_standard_include (stream, + "tao/CDR.h"); } + // Any_Impl_T.cpp needs the full CORBA::Any type. + this->gen_cond_file_include ( + idl_global->interface_seen_ + | idl_global->valuetype_seen_, + "tao/AnyTypeCode/Any.h", + stream + ); + this->gen_cond_file_include ( idl_global->interface_seen_ | idl_global->valuetype_seen_, diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index ee498370876..033371ec5bb 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -1,5 +1,5 @@ -#include "BiDirGIOP.h" #include "BiDir_ORBInitializer.h" +#include "BiDirGIOP.h" #include "BiDirPolicy_Validator.h" #include "tao/ORB_Core.h" #include "tao/debug.h" diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp index fbe180bde84..28e8cc27453 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp @@ -11,9 +11,9 @@ #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/SystemException.h" #include "tao/ORB_Constants.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h index f89f4bca6bf..3ee1e43137c 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h @@ -15,13 +15,12 @@ #include /**/ "ace/pre.h" -#include "codecfactory_export.h" +#include "IOP_Codec_includeC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IOP_Codec_includeC.h" #include "tao/LocalObject.h" /** @@ -40,7 +39,7 @@ * ORB core since it uses interpretive marshaling rather than compiled * marshaling. */ -class TAO_CodecFactory_Export TAO_CDR_Encaps_Codec +class TAO_CDR_Encaps_Codec : public virtual IOP::Codec, public virtual TAO_Local_RefCounted_Object { @@ -88,7 +87,7 @@ protected: * Only allow this class to be instantiated on the heap since it is * reference counted. */ - ~TAO_CDR_Encaps_Codec (void); + virtual ~TAO_CDR_Encaps_Codec (void); /// Verify that it is possible to encode the given data using this /// Codec. @@ -111,14 +110,14 @@ private: private: /// The major GIOP version associated with this Codec. - CORBA::Octet major_; + CORBA::Octet const major_; /// The minor GIOP version associated with this Codec. - CORBA::Octet minor_; + CORBA::Octet const minor_; /// The ORB Core to be used when decoding values from a CDR /// encapsulation. - TAO_ORB_Core * orb_core_; + TAO_ORB_Core * const orb_core_; }; diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h index 5f621159c04..82c6f95b05d 100644 --- a/TAO/tao/CodecFactory/CodecFactory.h +++ b/TAO/tao/CodecFactory/CodecFactory.h @@ -23,6 +23,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#define TAO_CODECFACTORY_SAFE_INCLUDE +#include "IOP_CodecC.h" +#undef TAO_CODECFACTORY_SAFE_INCLUDE + #include "tao/Object_Loader.h" #include "ace/Service_Config.h" @@ -47,10 +51,6 @@ ACE_FACTORY_DECLARE (TAO_CodecFactory, TAO_CodecFactory_Loader) static int TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer (); -#define TAO_CODECFACTORY_SAFE_INCLUDE -#include "IOP_CodecC.h" -#undef TAO_CODECFACTORY_SAFE_INCLUDE - #include /**/ "ace/post.h" #endif /* TAO_CODECFACTORY_H */ diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp index 0a83515a15b..96d1448d55b 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp +++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp @@ -7,7 +7,7 @@ #include "tao/SystemException.h" #include "tao/ORB_Constants.h" -ACE_RCSID (TAO_CodecFactory, +ACE_RCSID (CodecFactory_impl, CodecFactory, "$Id$") diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h index 785a1eec9d6..6699719071a 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.h +++ b/TAO/tao/CodecFactory/CodecFactory_impl.h @@ -15,14 +15,13 @@ #include /**/ "ace/pre.h" -#include "codecfactory_export.h" +#include "IOP_Codec_includeC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "IOP_Codec_includeC.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -39,7 +38,7 @@ * This class can be used to create Codec (coder/decoder) of a given * type, such as a CDR encapsulation Codec. */ -class TAO_CodecFactory_Export TAO_CodecFactory +class TAO_CodecFactory : public virtual IOP::CodecFactory, public virtual TAO_Local_RefCounted_Object { @@ -69,7 +68,7 @@ private: * Some Codec implementations may need access to the ORB Core with * which they are associated. */ - TAO_ORB_Core * orb_core_; + TAO_ORB_Core * const orb_core_; }; diff --git a/TAO/tao/CodecFactory/IOP_CodecC.h b/TAO/tao/CodecFactory/IOP_CodecC.h index b0e6e594507..2cab40f9767 100644 --- a/TAO/tao/CodecFactory/IOP_CodecC.h +++ b/TAO/tao/CodecFactory/IOP_CodecC.h @@ -44,14 +44,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/CodecFactory/codecfactory_export.h" +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/TypeCode.h" #include "tao/Objref_VarOut_T.h" #include "tao/VarOut_T.h" diff --git a/TAO/tao/CodecFactory/IOP_Codec_includeC.h b/TAO/tao/CodecFactory/IOP_Codec_includeC.h index 27a39ea7f24..7c81e3cfcf6 100644 --- a/TAO/tao/CodecFactory/IOP_Codec_includeC.h +++ b/TAO/tao/CodecFactory/IOP_Codec_includeC.h @@ -41,11 +41,11 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/CodecFactory/codecfactory_export.h" +#include "tao/CodecFactory/CodecFactory.h" + #include "tao/ORB.h" #include "tao/Environment.h" -#include "tao/CodecFactory/CodecFactory.h" - #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h index 8db5b0aaca4..b95ab45f54b 100644 --- a/TAO/tao/Domain/DomainS.h +++ b/TAO/tao/Domain/DomainS.h @@ -33,17 +33,17 @@ #include /**/ "ace/pre.h" -#include "tao/DomainC.h" +#include "tao/IFR_Client/IFR_ExtendedC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/PolicyS.h" -#include "tao/Collocation_Proxy_Broker.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Servant_Base.h" -#include "tao/IFR_Client/IFR_ExtendedC.h" +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/DomainC.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h index 5c944fb7895..198439dc114 100644 --- a/TAO/tao/DynamicAny/DynamicAny.h +++ b/TAO/tao/DynamicAny/DynamicAny.h @@ -17,13 +17,18 @@ #include /**/ "ace/pre.h" #include "dynamicany_export.h" -#include "tao/Object_Loader.h" -#include "ace/Service_Config.h" + +#define TAO_DYNAMICANY_SAFE_INCLUDE +#include "DynamicAnyC.h" +#undef TAO_DYNAMICANY_SAFE_INCLUDE #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Object_Loader.h" +#include "ace/Service_Config.h" + class TAO_DynamicAny_Export TAO_DynamicAny_Loader : public TAO_Object_Loader { public: @@ -47,9 +52,5 @@ ACE_FACTORY_DECLARE (TAO_DynamicAny, TAO_DynamicAny_Loader) static int TAO_Requires_DynamicAny_Initializer = TAO_DynamicAny_Loader::Initializer (); -#define TAO_DYNAMICANY_SAFE_INCLUDE -#include "DynamicAnyC.h" -#undef TAO_DYNAMICANY_SAFE_INCLUDE - #include /**/ "ace/post.h" #endif /* TAO_DYNAMICANY_H */ diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h index 9d8b9c916d8..f78ad947472 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.h +++ b/TAO/tao/DynamicAny/DynamicAnyC.h @@ -45,13 +45,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "dynamicany_export.h" +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/Sequence_T.h" #include "tao/Objref_VarOut_T.h" #include "tao/Seq_Var_T.h" diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index ca807b95828..de3f12de654 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -25,6 +25,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "DII_CORBA_methods.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/Pseudo_VarOut_T.h" #include "tao/orbconf.h" diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp index 02b362ed53b..31205aa8b6a 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp @@ -4,9 +4,10 @@ #include "tao/AnyTypeCode/NVList.h" #include "tao/AnyTypeCode/Any_Impl.h" +#include "tao/AnyTypeCode/DynamicC.h" #include "tao/Exception.h" #include "tao/CDR.h" -#include "tao/AnyTypeCode/DynamicC.h" + ACE_RCSID (DynamicInterface, DII_Arguments, diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index f07ff022182..abb404acba0 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -1,5 +1,8 @@ // $Id$ +#include "tao/AnyTypeCode/DynamicC.h" +#include "tao/AnyTypeCode/TypeCode.h" + #include "DII_Invocation.h" #include "Unknown_User_Exception.h" #include "DII_Arguments.h" @@ -7,8 +10,6 @@ #include "Request.h" #include "DII_Reply_Dispatcher.h" -#include "tao/AnyTypeCode/DynamicC.h" -#include "tao/AnyTypeCode/TypeCode.h" #include "tao/operation_details.h" #include "tao/Invocation_Utils.h" #include "tao/debug.h" diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index 17bb26ff7f4..05a17aba67e 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -31,10 +31,11 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "DII_CORBA_methods.h" -#include "tao/Pseudo_VarOut_T.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/orbconf.h" #include "tao/Basic_Types.h" #include "tao/default_environment.h" +#include "tao/Pseudo_VarOut_T.h" #include "ace/Unbounded_Queue.h" #include "ace/Atomic_Op.h" diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h index 83817c8af4f..7d7e3171b2b 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.h +++ b/TAO/tao/IFR_Client/IFR_BaseC.h @@ -41,14 +41,14 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ifr_client_export.h" -#include "tao/ORB.h" -#include "tao/SystemException.h" -#include "tao/Environment.h" -#include "tao/Object.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/TypeCode.h" +#include "tao/ORB.h" +#include "tao/SystemException.h" +#include "tao/Environment.h" +#include "tao/Object.h" #include "tao/Sequence_T.h" #include "tao/Objref_VarOut_T.h" #include "tao/Seq_Var_T.h" diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h index 4284fac3152..06488fb9e77 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.h +++ b/TAO/tao/IFR_Client/IFR_BasicC.h @@ -41,14 +41,14 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ifr_client_export.h" -#include "tao/ORB.h" -#include "tao/SystemException.h" -#include "tao/Environment.h" -#include "tao/Object.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/TypeCode.h" +#include "tao/ORB.h" +#include "tao/SystemException.h" +#include "tao/Environment.h" +#include "tao/Object.h" #include "tao/Sequence_T.h" #include "tao/Objref_VarOut_T.h" #include "tao/Seq_Var_T.h" diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index ae931277f9a..add9f0af0c5 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -3,12 +3,13 @@ #include "IFR_Client_Adapter_Impl.h" #include "IFR_ExtendedC.h" +#include "tao/AnyTypeCode/NVList.h" +#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" + #include "tao/ORB_Core.h" #include "tao/ORB.h" #include "tao/Invocation_Adapter.h" #include "tao/Stub.h" -#include "tao/AnyTypeCode/NVList.h" -#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" ACE_RCSID (IFR_Client, IFR_Client_Adapter_Impl, diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp index 06058bc2fed..eab777756f6 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp @@ -29,10 +29,10 @@ // be\be_codegen.cpp:293 +#include "tao/AnyTypeCode/orb_typesA.h" #include "IFR_ComponentsC.h" #include "tao/CDR.h" #include "tao/IFR_Client/IFR_ExtendedC.h" -#include "tao/AnyTypeCode/orb_typesA.h" #include "tao/Invocation_Adapter.h" #include "tao/Object_T.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index 7299eae1cf5..6e6d014a7bd 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -29,12 +29,12 @@ // be\be_codegen.cpp:293 -#include "IFR_ExtendedC.h" -#include "tao/CDR.h" -#include "tao/IFR_Client/IFR_BasicC.h" #include "tao/AnyTypeCode/VisibilityA.h" #include "tao/AnyTypeCode/ValueModifierA.h" #include "tao/AnyTypeCode/orb_typesA.h" +#include "IFR_ExtendedC.h" +#include "tao/CDR.h" +#include "tao/IFR_Client/IFR_BasicC.h" #include "tao/Invocation_Adapter.h" #include "tao/Object_T.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h index 281a37c13e7..e432cce0663 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.h +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h @@ -41,12 +41,12 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ifr_client_export.h" +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/Sequence_T.h" #include "tao/Objref_VarOut_T.h" #include "tao/Seq_Var_T.h" diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp index 4dba22229de..abf5e19d166 100644 --- a/TAO/tao/Messaging/MessagingA.cpp +++ b/TAO/tao/Messaging/MessagingA.cpp @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "Messaging.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -33,6 +32,7 @@ #include "tao/AnyTypeCode/Value_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Value_Field.h" #include "tao/AnyTypeCode/Recursive_Type_TypeCode.h" +#include "Messaging.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp index 8ee0e3c16c5..9cb832706f4 100644 --- a/TAO/tao/Messaging/MessagingS.cpp +++ b/TAO/tao/Messaging/MessagingS.cpp @@ -32,7 +32,8 @@ #ifndef _TAO_IDL_ORIG_MESSAGINGS_CPP_ #define _TAO_IDL_ORIG_MESSAGINGS_CPP_ - +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/DynamicC.h" #include "MessagingS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" @@ -52,8 +53,6 @@ #include "tao/Stub.h" #include "tao/IFR_Client_Adapter.h" #include "tao/Object_T.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/DynamicC.h" #include "tao/CDR.h" #include "tao/operation_details.h" #include "tao/PortableInterceptor.h" diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp index 4d9d4e4736f..eb98cb9fcad 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplA.cpp @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "Messaging_No_ImplC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -33,6 +32,7 @@ #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" #include "tao/AnyTypeCode/Recursive_Type_TypeCode.h" +#include "Messaging_No_ImplC.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp index 3d7726af4df..19c3fe12709 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp @@ -25,11 +25,11 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "Messaging_RT_PolicyC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "Messaging_RT_PolicyC.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp index 2e1c5244428..b4e3aa30542 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp @@ -25,11 +25,11 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "Messaging_SyncScope_PolicyC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "Messaging_SyncScope_PolicyC.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/Messaging/PollableC.cpp b/TAO/tao/Messaging/PollableC.cpp index a99b058b3dd..6f03a119620 100644 --- a/TAO/tao/Messaging/PollableC.cpp +++ b/TAO/tao/Messaging/PollableC.cpp @@ -29,16 +29,17 @@ // be\be_codegen.cpp:291 -#include "PollableC.h" -#include "tao/CDR.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +#include "PollableC.h" +#include "tao/CDR.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp index 3bce6d7972b..bd29c75f0dd 100644 --- a/TAO/tao/Messaging/TAO_ExtA.cpp +++ b/TAO/tao/Messaging/TAO_ExtA.cpp @@ -25,11 +25,11 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "TAO_ExtC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "TAO_ExtC.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h index b3391bf247d..4a47e23de92 100644 --- a/TAO/tao/PI/ClientRequestInfo.h +++ b/TAO/tao/PI/ClientRequestInfo.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "tao/LocalObject.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,13 +31,16 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +#include "tao/CORBA_methods.h" #include "ClientRequestInfoC.h" #include "PIForwardRequestC.h" #include "PICurrent_Impl.h" #include "PICurrent_Copy_Callback.h" #include "tao/ORB_Constants.h" +#include "tao/LocalObject.h" #include "tao/Invocation_Utils.h" + class TAO_Service_Context; namespace TAO diff --git a/TAO/tao/PI/ClientRequestInfoC.h b/TAO/tao/PI/ClientRequestInfoC.h index d9c265ec99b..59f9dab7f1e 100644 --- a/TAO/tao/PI/ClientRequestInfoC.h +++ b/TAO/tao/PI/ClientRequestInfoC.h @@ -41,13 +41,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI/pi_export.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/TypeCode.h" #include "tao/Objref_VarOut_T.h" #include "tao/PI/RequestInfoC.h" diff --git a/TAO/tao/PI/ClientRequestInterceptorA.cpp b/TAO/tao/PI/ClientRequestInterceptorA.cpp index a74dc65102d..7a1f1aca023 100644 --- a/TAO/tao/PI/ClientRequestInterceptorA.cpp +++ b/TAO/tao/PI/ClientRequestInterceptorA.cpp @@ -25,16 +25,17 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ClientRequestInterceptorC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" +#include "ClientRequestInterceptorC.h" +#include "tao/CDR.h" + // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h index 3139b720ceb..dbd1382fde4 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h @@ -31,10 +31,10 @@ #if TAO_HAS_INTERCEPTORS == 1 +#include "Interceptor_List_T.h" #include "ClientRequestInterceptorC.h" #include "tao/ClientRequestInterceptor_Adapter.h" -#include "Interceptor_List_T.h" namespace TAO { diff --git a/TAO/tao/PI/InterceptorA.cpp b/TAO/tao/PI/InterceptorA.cpp index ce25543d0a6..39a0f627a03 100644 --- a/TAO/tao/PI/InterceptorA.cpp +++ b/TAO/tao/PI/InterceptorA.cpp @@ -25,15 +25,16 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "InterceptorC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" +#include "InterceptorC.h" +#include "tao/CDR.h" + // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index 63a87447acb..5f3b6e74581 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "InterceptorC.h" #include "ORBInitInfoC.h" +#include "InterceptorC.h" #include "tao/SystemException.h" #include "tao/ORB_Constants.h" #include "tao/debug.h" diff --git a/TAO/tao/PI/InvalidSlotA.cpp b/TAO/tao/PI/InvalidSlotA.cpp index b4f76a7cbd6..638e24ea2f2 100644 --- a/TAO/tao/PI/InvalidSlotA.cpp +++ b/TAO/tao/PI/InvalidSlotA.cpp @@ -25,16 +25,18 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "InvalidSlotA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +#include "InvalidSlotA.h" +#include "tao/CDR.h" + + // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 diff --git a/TAO/tao/PI/ORBInitInfoC.h b/TAO/tao/PI/ORBInitInfoC.h index 4669d79760e..9b75a535ae2 100644 --- a/TAO/tao/PI/ORBInitInfoC.h +++ b/TAO/tao/PI/ORBInitInfoC.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI/pi_export.h" +#include "tao/CodecFactory/IOP_Codec_includeC.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -48,7 +49,6 @@ #include "tao/Objref_VarOut_T.h" #include "tao/StringSeqC.h" -#include "tao/CodecFactory/IOP_Codec_includeC.h" #include "tao/PI_ForwardC.h" #include "tao/PolicyC.h" diff --git a/TAO/tao/PI/ORBInitializerA.cpp b/TAO/tao/PI/ORBInitializerA.cpp index 61bf2ec78aa..8c9660f49c3 100644 --- a/TAO/tao/PI/ORBInitializerA.cpp +++ b/TAO/tao/PI/ORBInitializerA.cpp @@ -25,15 +25,16 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ORBInitializerC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" +#include "ORBInitializerC.h" +#include "tao/CDR.h" + // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h index f8f8b9ab7ae..66464bf77d8 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h @@ -21,14 +21,15 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Array_Base.h" -#include "ace/Service_Config.h" +#include "PI.h" + #include "tao/CORBA_methods.h" #include "tao/Objref_VarOut_T.h" -#include "ace/Recursive_Thread_Mutex.h" #include "tao/ORBInitializer_Registry_Adapter.h" -#include "PI.h" +#include "ace/Array_Base.h" +#include "ace/Service_Config.h" +#include "ace/Recursive_Thread_Mutex.h" namespace TAO { diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h index 389c1ebdce3..d1849e3c781 100644 --- a/TAO/tao/PI/PI.h +++ b/TAO/tao/PI/PI.h @@ -40,9 +40,9 @@ TAO_Requires_PI_Initializer = #include /**/ "ace/post.h" #define TAO_PI_SAFE_INCLUDE -#include "ORBInitializerC.h" -#include "PolicyFactoryC.h" #include "ORBInitInfoC.h" +#include "PolicyFactoryC.h" +#include "ORBInitializerC.h" #include "InterceptorC.h" #include "ClientRequestInfoC.h" #include "ClientRequestInterceptorC.h" diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h index 98e391d1aaf..3c52b628bae 100644 --- a/TAO/tao/PI/PICurrent.h +++ b/TAO/tao/PI/PICurrent.h @@ -27,8 +27,8 @@ #include "PICurrentC.h" -#include "ace/Array_Base.h" #include "tao/LocalObject.h" +#include "ace/Array_Base.h" #if defined(_MSC_VER) # pragma warning(push) diff --git a/TAO/tao/PI/PICurrentA.cpp b/TAO/tao/PI/PICurrentA.cpp index 3b0f9ba8765..27411a28fcb 100644 --- a/TAO/tao/PI/PICurrentA.cpp +++ b/TAO/tao/PI/PICurrentA.cpp @@ -25,15 +25,15 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "PICurrentA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" +#include "PICurrentA.h" +#include "tao/CDR.h" // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index e77945a9135..d374f174e4b 100644 --- a/TAO/tao/PI/PICurrent_Impl.h +++ b/TAO/tao/PI/PICurrent_Impl.h @@ -25,9 +25,10 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "ace/Array_Base.h" -#include "tao/AnyTypeCode/Any.h" #include "PICurrentC.h" +#include "tao/AnyTypeCode/Any.h" +#include "ace/Array_Base.h" + /// Forward declarations. class TAO_ORB_Core; diff --git a/TAO/tao/PI/PIForwardRequestA.cpp b/TAO/tao/PI/PIForwardRequestA.cpp index c0e4bd3cb89..b2eab47619a 100644 --- a/TAO/tao/PI/PIForwardRequestA.cpp +++ b/TAO/tao/PI/PIForwardRequestA.cpp @@ -25,16 +25,18 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "PIForwardRequestC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +#include "PIForwardRequestC.h" +#include "tao/CDR.h" + + // TAO_IDL - Generated from // be\be_visitor_typecode/struct_typecode.cpp:87 diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h index ff691089edc..aeccc94cc27 100644 --- a/TAO/tao/PI/PolicyFactoryC.h +++ b/TAO/tao/PI/PolicyFactoryC.h @@ -41,13 +41,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI/pi_export.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/TypeCode.h" #include "tao/Objref_VarOut_T.h" #include "tao/PolicyC.h" diff --git a/TAO/tao/PI/RequestInfoC.h b/TAO/tao/PI/RequestInfoC.h index 7c9d6ddb4fb..361b95d1be3 100644 --- a/TAO/tao/PI/RequestInfoC.h +++ b/TAO/tao/PI/RequestInfoC.h @@ -41,13 +41,13 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI/pi_export.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/TypeCode.h" #include "tao/Objref_VarOut_T.h" #include "tao/PI_ForwardC.h" diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h index 1cf01b210f3..9cb365164cf 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h @@ -32,9 +32,9 @@ #include "ServerRequestInterceptorC.h" -#include "tao/Basic_Types.h" -#include "tao/ServerRequestInterceptor_Adapter.h" #include "tao/PI/Interceptor_List_T.h" +#include "tao/ServerRequestInterceptor_Adapter.h" +#include "tao/Basic_Types.h" namespace TAO { diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.h b/TAO/tao/PI_Server/ServerRequestInfoC.h index ef918d43a45..6cbeedeb0dc 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoC.h +++ b/TAO/tao/PI_Server/ServerRequestInfoC.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI_Server/pi_server_export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index 4f432307e1d..826741ec9e6 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PI_Server/pi_server_export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/ParameterModeC.h b/TAO/tao/ParameterModeC.h index 641439da90d..ecb958b90bf 100644 --- a/TAO/tao/ParameterModeC.h +++ b/TAO/tao/ParameterModeC.h @@ -41,8 +41,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/TAO_Export.h" -#include "tao/ORB.h" -#include "tao/Environment.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp index 919f249a06a..0e381b61957 100644 --- a/TAO/tao/PortableServer/AdapterActivatorA.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp @@ -25,12 +25,12 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "AdapterActivatorA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" +#include "AdapterActivatorA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp index 31dfd90611e..e7f7a7415bf 100644 --- a/TAO/tao/PortableServer/ForwardRequestA.cpp +++ b/TAO/tao/PortableServer/ForwardRequestA.cpp @@ -25,12 +25,12 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ForwardRequestA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "ForwardRequestA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp index 395f34da510..ad3a8c200b3 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp @@ -25,12 +25,12 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "IdAssignmentPolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "IdAssignmentPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp index 2fc8e7ec024..49e84fb2d7e 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp @@ -25,17 +25,19 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "IdUniquenessPolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" +#include "IdUniquenessPolicyA.h" +#include "tao/CDR.h" + + // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp index 9db229c2063..dbf3b01f052 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp @@ -25,12 +25,12 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ImplicitActivationPolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "ImplicitActivationPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp index d9cd21d3b48..bfee89df475 100644 --- a/TAO/tao/PortableServer/LifespanPolicyA.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp @@ -25,12 +25,12 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "LifespanPolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "LifespanPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp index 45f95ccca10..b29a3593b40 100644 --- a/TAO/tao/PortableServer/POAManagerC.cpp +++ b/TAO/tao/PortableServer/POAManagerC.cpp @@ -29,8 +29,6 @@ // be\be_codegen.cpp:277 -#include "POAManagerC.h" -#include "tao/CDR.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -38,9 +36,12 @@ #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" +#include "POAManagerC.h" +#include "tao/CDR.h" #include "ace/OS_NS_string.h" // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/PS_CurrentA.cpp b/TAO/tao/PortableServer/PS_CurrentA.cpp index 05de30be3a2..7142aaed13a 100644 --- a/TAO/tao/PortableServer/PS_CurrentA.cpp +++ b/TAO/tao/PortableServer/PS_CurrentA.cpp @@ -25,13 +25,13 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "PS_CurrentC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "PS_CurrentC.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp index c9ba5596b79..777efdd75a0 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.cpp +++ b/TAO/tao/PortableServer/PS_ForwardA.cpp @@ -25,10 +25,10 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "PS_ForwardA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "PS_ForwardA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index a6ce46ed3dc..8efbc5798a8 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -33,7 +33,11 @@ #define _TAO_IDL_ORIG_POLICYS_CPP_ +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/Any.h" + #include "PolicyS.h" + #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" @@ -53,8 +57,6 @@ #include "tao/Stub.h" #include "tao/IFR_Client_Adapter.h" #include "tao/Object_T.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/Any.h" #include "tao/CDR.h" #include "tao/operation_details.h" #include "tao/PortableInterceptor.h" diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp index 0950e1449b4..fefd713bd53 100644 --- a/TAO/tao/PortableServer/PortableServerA.cpp +++ b/TAO/tao/PortableServer/PortableServerA.cpp @@ -25,7 +25,6 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "PortableServer.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -34,6 +33,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "PortableServer.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp index 542527f8a7b..69e96b2261c 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp @@ -25,12 +25,12 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "RequestProcessingPolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "RequestProcessingPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp index 95230e368af..fb2ece136ab 100644 --- a/TAO/tao/PortableServer/ServantActivatorA.cpp +++ b/TAO/tao/PortableServer/ServantActivatorA.cpp @@ -25,11 +25,11 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ServantActivatorA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "ServantActivatorA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp index fed82639ced..c08d031be92 100644 --- a/TAO/tao/PortableServer/ServantLocatorA.cpp +++ b/TAO/tao/PortableServer/ServantLocatorA.cpp @@ -25,12 +25,12 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ServantLocatorA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" +#include "ServantLocatorA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp index 5f6d30238b9..16d863620a4 100644 --- a/TAO/tao/PortableServer/ServantManagerA.cpp +++ b/TAO/tao/PortableServer/ServantManagerA.cpp @@ -25,11 +25,11 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ServantManagerA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "ServantManagerA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp index 70f4a4512e1..7fdc593fbac 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp @@ -25,12 +25,12 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ServantRetentionPolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "ServantRetentionPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp index 2778ac2d5c8..87d85d78165 100644 --- a/TAO/tao/PortableServer/ThreadPolicyA.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ThreadPolicyA.h" +#include "tao/orbconf.h" #if (TAO_HAS_MINIMUM_POA == 0) @@ -34,6 +34,8 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" + +#include "ThreadPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/Valuetype/StringValueC.cpp b/TAO/tao/Valuetype/StringValueC.cpp index d1000576a47..717160d1506 100644 --- a/TAO/tao/Valuetype/StringValueC.cpp +++ b/TAO/tao/Valuetype/StringValueC.cpp @@ -29,9 +29,6 @@ // .\be\be_codegen.cpp:291 -#include "StringValueC.h" -#include "tao/CDR.h" -#include "tao/Valuetype/ValueFactory.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" @@ -39,8 +36,12 @@ #include "tao/AnyTypeCode/Value_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Value_Field.h" #include "tao/AnyTypeCode/Recursive_Type_TypeCode.h" -#include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/Any_Impl_T.h" + +#include "StringValueC.h" +#include "tao/Valuetype/ValueFactory.h" +#include "tao/CDR.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index fdb5ba89524..b7496f3e6cb 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -1,16 +1,17 @@ // $Id$ +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" +#include "tao/AnyTypeCode/Value_TypeCode_Static.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" + #include "ValueBase.h" #include "ValueFactory.h" +#include "tao/CDR.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/debug.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "tao/AnyTypeCode/Value_TypeCode_Static.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/CDR.h" #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) |