diff options
Diffstat (limited to 'TAO/tao/PI')
-rw-r--r-- | TAO/tao/PI/ClientRequestInfo.h | 5 | ||||
-rw-r--r-- | TAO/tao/PI/ClientRequestInfoC.h | 6 | ||||
-rw-r--r-- | TAO/tao/PI/ClientRequestInterceptorA.cpp | 5 | ||||
-rw-r--r-- | TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h | 2 | ||||
-rw-r--r-- | TAO/tao/PI/InterceptorA.cpp | 5 | ||||
-rw-r--r-- | TAO/tao/PI/Interceptor_List_T.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/PI/InvalidSlotA.cpp | 6 | ||||
-rw-r--r-- | TAO/tao/PI/ORBInitInfoC.h | 2 | ||||
-rw-r--r-- | TAO/tao/PI/ORBInitializerA.cpp | 5 | ||||
-rw-r--r-- | TAO/tao/PI/ORBInitializer_Registry_Impl.h | 9 | ||||
-rw-r--r-- | TAO/tao/PI/PI.h | 4 | ||||
-rw-r--r-- | TAO/tao/PI/PICurrent.h | 2 | ||||
-rw-r--r-- | TAO/tao/PI/PICurrentA.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/PI/PICurrent_Impl.h | 5 | ||||
-rw-r--r-- | TAO/tao/PI/PIForwardRequestA.cpp | 6 | ||||
-rw-r--r-- | TAO/tao/PI/PolicyFactoryC.h | 6 | ||||
-rw-r--r-- | TAO/tao/PI/RequestInfoC.h | 6 |
17 files changed, 46 insertions, 34 deletions
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" |