diff options
16 files changed, 30 insertions, 495 deletions
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp index 0a73f02541a..f4ce9754556 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp @@ -5,7 +5,6 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/NVList.h" #include "tao/AnyTypeCode/ExceptionA.h" -#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/IFR_Client/IFR_BasicC.h" diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i index 966da4ea4bc..3875aa4ac65 100644 --- a/TAO/tao/Environment.i +++ b/TAO/tao/Environment.i @@ -39,6 +39,6 @@ ACE_INLINE CORBA::Environment_ptr CORBA::Environment::_nil (void) { - return (CORBA::Environment_ptr) 0; + return static_cast <CORBA::Environment_ptr> (0); } diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 15580b19b63..14ed6f02fa3 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -335,7 +335,7 @@ CORBA::Object::is_nil_i (CORBA::Object_ptr obj) // null-object. if ((!obj->is_evaluated ()) && obj->ior ().profiles.length () == 0) - return 1; + return true; // To accomodate new definitions. if (obj->orb_core_) @@ -343,7 +343,7 @@ CORBA::Object::is_nil_i (CORBA::Object_ptr obj) return obj->orb_core_->object_is_nil (obj); } - return 0; + return false; } diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i index d65de4e3bc9..e86207df933 100644 --- a/TAO/tao/Object.i +++ b/TAO/tao/Object.i @@ -49,7 +49,7 @@ CORBA::is_nil (CORBA::Object_ptr obj) { if (obj == 0) { - return 1; + return true; } return CORBA::Object::is_nil_i (obj); diff --git a/TAO/tao/TypeCode.cpp b/TAO/tao/TypeCode.cpp deleted file mode 100644 index c4736bc8d30..00000000000 --- a/TAO/tao/TypeCode.cpp +++ /dev/null @@ -1,465 +0,0 @@ -// $Id$ - -#include "TypeCode.h" - - -ACE_RCSID (tao, - TypeCode, - "$Id$") - - -#if !defined (__ACE_INLINE__) -# include "TypeCode.inl" -#endif /* ! __ACE_INLINE__ */ - -#include "SystemException.h" -#include "CDR.h" -#include "ORB_Constants.h" - -#include "debug.h" - -#include "ace/OS_NS_string.h" - - -CORBA::TypeCode::~TypeCode (void) -{ -} - -bool -CORBA::TypeCode::tao_marshal_kind (TAO_OutputCDR & cdr) const -{ - return cdr << this->kind_; -} - -CORBA::Boolean -CORBA::TypeCode::equal (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const -{ - if (this == tc) - { - return true; - } - else if (CORBA::is_nil (tc)) - { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13, - CORBA::COMPLETED_NO), - false); - } - - CORBA::TCKind const tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - if (tc_kind != this->kind_) - return 0; - - ACE_TRY - { - char const * const tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - char const * const this_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (ACE_OS::strcmp (this_id, tc_id) != 0) - return 0; - - char const * const tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - char const * const this_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (ACE_OS::strcmp (this_name, tc_name) != 0) - return 0; - } - ACE_CATCH (CORBA::TypeCode::BadKind, ex) - { - // Some TypeCodes do not support the id() and name() - // operations. Ignore the failure, and continue equality - // verification using TypeCode subclass-specific techniques - // below. - } - ACE_ENDTRY; - ACE_CHECK_RETURN (0); - - return this->equal_i (tc - ACE_ENV_ARG_PARAMETER); -} - -CORBA::Boolean -CORBA::TypeCode::equivalent (TypeCode_ptr tc - ACE_ENV_ARG_DECL) const -{ - if (this == tc) - { - return true; - } - else if (CORBA::is_nil (tc)) - { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13, - CORBA::COMPLETED_NO), - false); - } - - CORBA::TypeCode_ptr const mutable_this = - const_cast<CORBA::TypeCode_ptr> (this); - - CORBA::TypeCode_var unaliased_this = - TAO::unaliased_typecode (mutable_this - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); - - CORBA::TypeCode_var unaliased_tc = - TAO::unaliased_typecode (tc - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); - - - CORBA::TCKind const this_kind = - unaliased_this->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); - - CORBA::TCKind const tc_kind = - unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); - - if (tc_kind != this_kind) - return false; - - ACE_TRY - { - char const * const this_id = - unaliased_this->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - char const * const tc_id = - unaliased_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (ACE_OS::strlen (this_id) == 0 - || ACE_OS::strlen (tc_id) == 0) - { - return unaliased_this->equivalent_i (unaliased_tc.in () - ACE_ENV_ARG_PARAMETER); - } - else if (ACE_OS::strcmp (this_id, tc_id) != 0) - { - return false; - } - } - ACE_CATCH (CORBA::TypeCode::BadKind, ex) - { - // Some TypeCodes do not support the id() operation. Ignore the - // failure, and continue equivalence verification using TypeCode - // subclass-specific techniques. - return unaliased_this->equivalent_i (unaliased_tc.in () - ACE_ENV_ARG_PARAMETER); - } - ACE_ENDTRY; - ACE_CHECK_RETURN (false); - - return true; -} - -char const * -CORBA::TypeCode::id_i (ACE_ENV_SINGLE_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); -} - -char const * -CORBA::TypeCode::name_i (ACE_ENV_SINGLE_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); -} - -CORBA::ULong -CORBA::TypeCode::member_count_i (ACE_ENV_SINGLE_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); -} - -char const * -CORBA::TypeCode::member_name_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); -} - -CORBA::TypeCode_ptr -CORBA::TypeCode::member_type_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), - CORBA::TypeCode::_nil ()); -} - -CORBA::Any * -CORBA::TypeCode::member_label_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); -} - -CORBA::TypeCode_ptr -CORBA::TypeCode::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), - CORBA::TypeCode::_nil ()); -} - -CORBA::Long -CORBA::TypeCode::default_index_i (ACE_ENV_SINGLE_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); -} - -CORBA::ULong -CORBA::TypeCode::length_i (ACE_ENV_SINGLE_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); -} - -CORBA::TypeCode_ptr -CORBA::TypeCode::content_type_i (ACE_ENV_SINGLE_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), - CORBA::TypeCode::_nil ()); -} - -CORBA::UShort -CORBA::TypeCode::fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); -} - -CORBA::UShort -CORBA::TypeCode::fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0); -} - -CORBA::Visibility -CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */ - ACE_ENV_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), - CORBA::PRIVATE_MEMBER); -} - -CORBA::ValueModifier -CORBA::TypeCode::type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), - CORBA::VM_NONE); -} - -CORBA::TypeCode_ptr -CORBA::TypeCode::concrete_base_type_i (ACE_ENV_SINGLE_ARG_DECL) const -{ - ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), - CORBA::TypeCode::_nil ()); -} - -// --------------------------------------------------------------- - -CORBA::TypeCode::Bounds::Bounds (void) - : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0", - "Bounds") -{ -} - -CORBA::TypeCode::Bounds* -CORBA::TypeCode::Bounds::_downcast (CORBA::Exception *ex) -{ - return dynamic_cast <CORBA::TypeCode::Bounds*> (ex); -} - -CORBA::Exception * -CORBA::TypeCode::Bounds::_alloc (void) -{ - CORBA::Exception *retval = 0; - ACE_NEW_RETURN (retval, ::CORBA::TypeCode::Bounds, 0); - return retval; -} - -CORBA::Exception * -CORBA::TypeCode::Bounds::_tao_duplicate (void) const -{ - CORBA::Exception *result; - ACE_NEW_RETURN (result, - CORBA::TypeCode::Bounds (*this), - 0); - return result; -} - -void -CORBA::TypeCode::Bounds::_raise (void) const -{ - TAO_RAISE(*this); -} - -void -CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const -{ - if (cdr << this->_rep_id ()) - { - return; - } - - ACE_THROW (CORBA::MARSHAL ()); -} - -void -CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED) -{ -} - -// **************************************************************** - -CORBA::TypeCode::BadKind::BadKind (void) - : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0", - "BadKind") -{ -} - -CORBA::TypeCode::BadKind* -CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex) -{ - return dynamic_cast <CORBA::TypeCode::BadKind*> (ex); -} - -CORBA::Exception * -CORBA::TypeCode::BadKind::_tao_duplicate (void) const -{ - CORBA::Exception *result; - ACE_NEW_RETURN (result, - CORBA::TypeCode::BadKind (*this), - 0); - return result; -} - -void -CORBA::TypeCode::BadKind::_raise (void) const -{ - TAO_RAISE(*this); -} - -void -CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr - ACE_ENV_ARG_DECL) const -{ - if (cdr << this->_rep_id ()) - { - return; - } - - ACE_THROW (CORBA::MARSHAL ()); -} - -void -CORBA::TypeCode::BadKind::_tao_decode (TAO_InputCDR & - ACE_ENV_ARG_DECL_NOT_USED) -{ -} - -// --------------------------------------------------------------- - -bool -TAO::TypeCode::marshal (TAO_OutputCDR & cdr, - CORBA::TypeCode_ptr tc, - CORBA::ULong offset) -{ - // Marshal the TypeCode TCKind and TypeCode body. - // - // Update the offset value in case a recursive TypeCode is being - // marshaled. - - return - tc != 0 - && tc->tao_marshal_kind (cdr) - && tc->tao_marshal (cdr, aligned_offset (offset) + sizeof (CORBA::ULong)); -} - -CORBA::ULong -TAO::TypeCode::aligned_offset (CORBA::ULong offset) -{ - ptrdiff_t const unaligned_offset = - static_cast<ptrdiff_t> (offset); - - return - static_cast<CORBA::ULong> (ACE_align_binary (unaligned_offset, - ACE_CDR::LONG_ALIGN)); -} - -// --------------------------------------------------------------- - -CORBA::TypeCode_ptr -TAO::unaliased_typecode (CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) -{ - if (CORBA::is_nil (tc)) - { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 13, - CORBA::COMPLETED_NO), - tc); - } - - CORBA::TCKind tc_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); - - if (tc_kind == CORBA::tk_alias) - { - CORBA::TypeCode_var tc_content = - CORBA::TypeCode::_duplicate (tc); - - // Iterate until we get to the actual unaliased type. - do - { - tc_content = - tc_content->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); - - tc_kind = tc_content->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (tc); - } - while (tc_kind == CORBA::tk_alias); - - return tc_content._retn (); - } - - return CORBA::TypeCode::_duplicate (tc); -} - -// ========================================================= - -// Traits specializations for CORBA::TypeCode. -namespace TAO -{ - CORBA::TypeCode_ptr - Objref_Traits<CORBA::TypeCode>::duplicate (CORBA::TypeCode_ptr p) - { - return CORBA::TypeCode::_duplicate (p); - } - - void - Objref_Traits<CORBA::TypeCode>::release (CORBA::TypeCode_ptr p) - { - CORBA::release (p); - } - - CORBA::TypeCode_ptr - Objref_Traits<CORBA::TypeCode>::nil (void) - { - return CORBA::TypeCode::_nil (); - } - - CORBA::Boolean - Objref_Traits<CORBA::TypeCode>::marshal (CORBA::TypeCode_ptr p, - TAO_OutputCDR & cdr) - { - return cdr << p; - } -} diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index 90711bedfc5..f58e6d39d77 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -13,9 +13,9 @@ #include "data.h" -#include "ace/Log_Msg.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/PortableServer/PortableServer.h" +#include "ace/Log_Msg.h" Data::Data (CORBA::ORB_var orb) : m_bool1 (1), m_bool2 (0), diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp index cfdde4db414..af7efedb17c 100644 --- a/TAO/tests/DynAny_Test/test_dynunion.cpp +++ b/TAO/tests/DynAny_Test/test_dynunion.cpp @@ -13,8 +13,8 @@ #include "test_dynunion.h" #include "da_testsC.h" #include "data.h" -#include "tao/DynamicAny/DynamicAny.h" #include "analyzer.h" +#include "tao/DynamicAny/DynamicAny.h" #include "ace/OS_NS_string.h" Test_DynUnion::Test_DynUnion (CORBA::ORB_var orb, int debug) diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h index 39ae6020841..def1f6d2bb4 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h @@ -5,14 +5,14 @@ #ifndef COLLOCATED_TEST_CLIENT_TASK_H #define COLLOCATED_TEST_CLIENT_TASK_H #include /**/ "ace/pre.h" + +#include "tao/ORB.h" #include "ace/Task.h" #include "testS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ORB.h" - /// Implement a Task to run the client as a thread class Client_Task : public ACE_Task_Base diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp index 7e8d6e28aa4..d29f74769d0 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp @@ -1,13 +1,14 @@ //$Id$ + #include "Server_Task.h" #include "Client_Task.h" +#include "Echo_Collocated_ORBInitializer.h" +#include "interceptors.h" +#include "tao/ORBInitializer_Registry.h" #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" #include "ace/SString.h" #include "ace/Manual_Event.h" -#include "Echo_Collocated_ORBInitializer.h" -#include "tao/ORBInitializer_Registry.h" -#include "interceptors.h" const char *output = "test.ior"; const char *input = "file://test.ior"; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h index 4f2307adc30..7bac19ca641 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h @@ -7,13 +7,13 @@ #include /**/ "ace/pre.h" -#include "ace/Task.h" +#include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/ORB.h" +#include "ace/Task.h" class ACE_Manual_Event; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp index 70c8acfafd5..907a3e1193f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp @@ -1,11 +1,11 @@ // $Id$ #include "interceptors.h" -#include "ace/Log_Msg.h" -#include "ace/OS_NS_string.h" +#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "tao/AnyTypeCode/DynamicC.h" #include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" ACE_RCSID (Dynamic, interceptors, diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h index 194ab46566d..244270d4a37 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h @@ -6,14 +6,14 @@ #define TAO_INTERCEPTORS_H #include /**/ "ace/pre.h" -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PI/PI.h" #include "tao/PI_Server/PI_Server.h" +#include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h index 2c29fd378cc..bb1f24cbdcc 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h @@ -22,12 +22,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "Request_Interceptor.h" + #include "tao/PI/PI.h" +#include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" -#include "Request_Interceptor.h" - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h index 2eb51870c7b..ade0ae89891 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h @@ -22,13 +22,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Atomic_Op.h" - -#include "tao/PortableInterceptorC.h" #include "tao/PI/PI.h" +#include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" #include "tao/CORBA_String.h" +#include "ace/Atomic_Op.h" + #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp index b562e83f74e..45e9c1b1650 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp @@ -8,8 +8,9 @@ ACE_RCSID (Request_Interceptor_Flow, #include "testC.h" -#include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" +#include "tao/AnyTypeCode/TypeCode.h" + #include "ace/OS_NS_string.h" Server_Request_Interceptor::Server_Request_Interceptor (const char *name) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h index 590491e9f62..e0a9c66c947 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h @@ -22,12 +22,11 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" -#include "tao/PI_Server/PI_Server.h" -#include "tao/LocalObject.h" - #include "Request_Interceptor.h" +#include "tao/PI_Server/PI_Server.h" +#include "tao/PortableInterceptorC.h" +#include "tao/LocalObject.h" #if defined(_MSC_VER) #pragma warning(push) |