diff options
| -rw-r--r-- | TAO/ChangeLog | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ServerRequestInfo.cpp | 27 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ServerRequestInfo.h | 6 |
3 files changed, 14 insertions, 23 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9c6a7a493b6..cd7e04ff349 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -12,7 +12,7 @@ Tue Mar 25 16:28:17 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp: * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp: - Moved generation of Any template specializations + Moved generation of Any template specializations to the inline file. * tao/Messaging/MessagingC.cpp: @@ -42,6 +42,8 @@ Tue Mar 25 14:06:58 2003 Ossama Othman <ossama@uci.edu> * tao/ClientRequestInfo.cpp (sync_scope): * tao/ClientRequestInfo_i.h (sync_scope): * tao/ClientRequestInfo_i.cpp (sync_scope): + * tao/PortableServer/ServerRequestInfo.h (sync_scope): + * tao/PortableServer/ServerRequestInfo.cpp (sync_scope): Do not protect this method with a "TAO_HAS_CORBA_MESSAGING" preprocessor block. Doing is no longer necessary since it diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp index fe3d7d44b69..183191797d3 100644 --- a/TAO/tao/PortableServer/ServerRequestInfo.cpp +++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp @@ -1,8 +1,11 @@ -// -*- C++ -*- -// -// $Id$ - #include "ServerRequestInfo.h" + +#if (TAO_HAS_INTERCEPTORS == 1) + +ACE_RCSID (TAO_PortableServer, + ServerRequestInfo, + "$Id$") + #include "POA.h" #include "POA_Policy_Set.h" @@ -11,13 +14,6 @@ #include "tao/PolicyC.h" #include "tao/ORB_Core.h" - -ACE_RCSID (TAO_PortableServer, - ServerRequestInfo, - "$Id$") - -#if (TAO_HAS_INTERCEPTORS == 1) - # if !defined (__ACE_INLINE__) # include "ServerRequestInfo.inl" # endif /* !__ACE_INLINE__ */ @@ -134,7 +130,6 @@ TAO_ServerRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) return this->server_request_.response_expected (); } -# if TAO_HAS_CORBA_MESSAGING == 1 Messaging::SyncScope TAO_ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) @@ -146,7 +141,6 @@ TAO_ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL) CORBA::COMPLETED_NO), -1); } -#endif /* TAO_HAS_CORBA_MESSAGING */ PortableInterceptor::ReplyStatus TAO_ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL) @@ -328,7 +322,6 @@ PortableInterceptor::AdapterName * TAO_ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - // The adapter_name attribute defines a name for the object adapter // that services requests for the invoked object. In the case of the // POA, the adapter_name is the sequence of names from the root POA @@ -416,9 +409,6 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - // @@ Currently, it is only possible to retrieve the server policy - // only during and after the receive_request() interception - // point, i.e. within the skeleton. if (this->servant_upcall_ != 0) { TAO_POA_Policy_Set &policies = @@ -437,7 +427,8 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type // object reference!!! CORBA::Policy_var policy = policies.get_policy_by_index (i); - CORBA::PolicyType ptype = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::PolicyType ptype = + policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Policy::_nil ()); if (ptype == type) diff --git a/TAO/tao/PortableServer/ServerRequestInfo.h b/TAO/tao/PortableServer/ServerRequestInfo.h index bf2d856464b..49480e3a0a1 100644 --- a/TAO/tao/PortableServer/ServerRequestInfo.h +++ b/TAO/tao/PortableServer/ServerRequestInfo.h @@ -34,9 +34,9 @@ #include "tao/Service_Context.h" #include "tao/TAO_Server_Request.h" -#include "Object_Adapter.h" +#include "tao/PortableServer/Object_Adapter.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -104,14 +104,12 @@ public: ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)) ; -#if TAO_HAS_CORBA_MESSAGING == 1 /// Return the sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// CORBA::BAD_INV_ORDER exception is thrown. virtual Messaging::SyncScope sync_scope ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); -#endif /* TAO_HAS_CORBA_MESSAGING */ /// Return the reply status for the current request. Statuses can /// be PortableInterceptor::SUCCESSFUL, SYSTEM_EXCEPTION, |