diff options
31 files changed, 45 insertions, 150 deletions
diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp index 879b595a4b2..abc291b0565 100644 --- a/TAO/tao/Asynch_Invocation.cpp +++ b/TAO/tao/Asynch_Invocation.cpp @@ -14,8 +14,6 @@ ACE_RCSID(tao, Asynch_Invocation, "$Id$") # include "tao/Asynch_Invocation.i" #endif /* ! __ACE_INLINE__ */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_Asynch_Invocation_Timeprobe_Description[] = @@ -120,4 +118,3 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) #endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */ -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h index 794ac9709f6..215b92f45cf 100644 --- a/TAO/tao/Asynch_Invocation.h +++ b/TAO/tao/Asynch_Invocation.h @@ -26,16 +26,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/Asynch_Reply_Dispatcher.h" -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) #include "tao/MessagingC.h" #endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - class TAO_Export TAO_GIOP_Asynch_Invocation : public TAO_GIOP_Invocation { @@ -113,8 +109,6 @@ protected: #endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */ -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - #if defined (__ACE_INLINE__) # include "tao/Asynch_Invocation.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Asynch_Invocation.i b/TAO/tao/Asynch_Invocation.i index 1d682531221..43dfeb92b63 100644 --- a/TAO/tao/Asynch_Invocation.i +++ b/TAO/tao/Asynch_Invocation.i @@ -3,8 +3,6 @@ // $Id$ // -#if (TAO_HAS_MINIMUM_CORBA == 0) - ACE_INLINE TAO_GIOP_Asynch_Invocation::TAO_GIOP_Asynch_Invocation ( TAO_Stub *stub, @@ -22,8 +20,6 @@ TAO_GIOP_Asynch_Invocation::TAO_GIOP_Asynch_Invocation ( { } -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - // ******************************************************************** #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) diff --git a/TAO/tao/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Asynch_Reply_Dispatcher.cpp index 538aab733fb..7f0d7d12f92 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Asynch_Reply_Dispatcher.cpp @@ -14,8 +14,6 @@ ACE_RCSID(tao, Asynch_Reply_Dispatcher, "$Id$") #include "tao/Asynch_Reply_Dispatcher.i" #endif /* __ACE_INLINE__ */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - // Constructor. TAO_Asynch_Reply_Dispatcher_Base::TAO_Asynch_Reply_Dispatcher_Base (void) : message_state_ (0), @@ -60,8 +58,6 @@ TAO_Asynch_Reply_Dispatcher_Base::connection_closed (void) { } -#endif /* (TAO_HAS_MINIMUM_CORBA == 0) */ - // ************************************************************************ #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) diff --git a/TAO/tao/Asynch_Reply_Dispatcher.h b/TAO/tao/Asynch_Reply_Dispatcher.h index 4cf6f3eaec4..7cdd6e634ba 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher.h +++ b/TAO/tao/Asynch_Reply_Dispatcher.h @@ -26,16 +26,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) #include "tao/Reply_Dispatcher.h" -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) #include "tao/MessagingC.h" #endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - class TAO_Export TAO_Asynch_Reply_Dispatcher_Base : public TAO_Reply_Dispatcher { @@ -82,8 +78,6 @@ protected: // This invocation is using this transport, may change... }; -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - // ********************************************************************* #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) diff --git a/TAO/tao/Asynch_Reply_Dispatcher.i b/TAO/tao/Asynch_Reply_Dispatcher.i index e21ef9fe2b1..10de97aa942 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher.i +++ b/TAO/tao/Asynch_Reply_Dispatcher.i @@ -1,12 +1,9 @@ // $Id$ -#if (TAO_HAS_MINIMUM_CORBA == 0) - ACE_INLINE void TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t) { this->transport_ = t; } -#endif /* (TAO_HAS_MINIMUM_CORBA == 0) */ diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 9f990d60c30..5379d3b2b6f 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -4,8 +4,6 @@ ACE_RCSID(DynamicInterface, Context, "$Id$") -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "tao/Typecode.h" #include "tao/Environment.h" #include "tao/NVList.h" @@ -213,5 +211,4 @@ CORBA_ContextList::_decr_refcnt (void) } } -#endif /* TAO_HAS_MINIMUM_CORBA */ diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 393d1ac1604..8459eb29b4d 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -27,8 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "dynamicinterface_export.h" class TAO_DynamicInterface_Export CORBA_Context @@ -303,6 +301,5 @@ private: # include "Context.inl" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_MINIMUM_CORBA */ #include "ace/post.h" #endif /* TAO_CONTEXT_H */ diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index 585dfdbd173..3e933174285 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -5,8 +5,6 @@ ACE_RCSID(DynamicInterface, DII_Invocation, "$Id$") -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "tao/Stub.h" #include "tao/Principal.h" #include "tao/Object_KeyC.h" @@ -146,4 +144,3 @@ TAO_GIOP_DII_Deferred_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) return TAO_INVOKE_OK; } -#endif /* TAO_HAS_MINIMUM_CORBA */ diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h index 8628afdf2a8..f3167a073f8 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.h +++ b/TAO/tao/DynamicInterface/DII_Invocation.h @@ -27,8 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "tao/Asynch_Invocation.h" #include "DII_Reply_Dispatcher.h" #include "Request.h" @@ -98,6 +96,5 @@ private: # include "DII_Invocation.inl" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_MINIMUM_CORBA */ #include "ace/post.h" #endif /* TAO_ASYNCH_INVOCATION_H */ diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index 8fb5e6031f1..2c6b674dbfa 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -5,8 +5,6 @@ ACE_RCSID(DynamicInterface, DII_Reply_Dispatcher, "$Id$") -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "Request.h" #include "tao/Pluggable.h" #include "tao/Environment.h" @@ -110,4 +108,3 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) ACE_ENDTRY; } -#endif /* TAO_HAS_MINIMUM_CORBA */ diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h index c76d19448b2..ead0bc8a097 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h @@ -25,8 +25,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "dynamicinterface_export.h" #include "tao/Asynch_Reply_Dispatcher.h" @@ -59,6 +57,5 @@ private: // Where the reply needs to go. }; -#endif /* TAO_HAS_MINIMUM_CORBA */ #include "ace/post.h" #endif /* TAO_REPLY_DISPATCHER_H */ diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp index f5258e54947..bf8c3851bd3 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp @@ -4,8 +4,6 @@ ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$") -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "Request.h" #include "Server_Request.h" #include "tao/Invocation.h" @@ -158,4 +156,3 @@ ACE_STATIC_SVC_DEFINE ( ACE_FACTORY_DEFINE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl) -#endif /* TAO_HAS_MINIMUM_CORBA */ diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h index 79fbe3c4e2a..52c69ea3de0 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h @@ -27,8 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "dynamicinterface_export.h" #include "ace/Service_Config.h" @@ -110,6 +108,5 @@ TAO_Requires_Request_Factory_Initializer = #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */ -#endif /* TAO_HAS_MINIMUM_CORBA */ #include "ace/post.h" #endif /* TAO_DYNAMIC_ADAPTER_IMPL_H */ diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp index d37e3b74871..3e49bb28692 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -4,8 +4,6 @@ ACE_RCSID(DynamicInterface, Dynamic_Implementation, "$Id$") -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "Server_Request.h" #include "tao/ORB_Core.h" #include "tao/PortableServer/POA.h" @@ -149,4 +147,3 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request, CORBA::release (dsi_request); } -#endif /* TAO_HAS_MINIMUM_CORBA */ diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h index 72fca2d9bf1..810245bbbd5 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h @@ -27,8 +27,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "dynamicinterface_export.h" class TAO_DynamicInterface_Export TAO_DynamicImplementation @@ -83,6 +81,5 @@ protected: // Turns around and calls invoke. }; -#endif /* TAO_HAS_MINIMUM_CORBA */ #include "ace/post.h" #endif /* TAO_DYNAMIC_IMPLEMENTATION_H */ diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index afcd49297f8..712bc355976 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -4,8 +4,6 @@ ACE_RCSID(DynamicInterface, ExceptionList, "$Id$") -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "tao/Typecode.h" #include "tao/Environment.h" @@ -114,4 +112,3 @@ template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_HAS_MINIMUM_CORBA */ diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index dbf8a293422..9a8f3e3f969 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -29,8 +29,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "dynamicinterface_export.h" class CORBA_ExceptionList; @@ -149,7 +147,6 @@ private: # include "ExceptionList.inl" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_MINIMUM_CORBA */ #include "ace/post.h" #endif /* TAO_CORBA_EXCEPTIONLIST_H */ diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 7a3f610ce63..939bc79f9c1 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -4,8 +4,6 @@ ACE_RCSID(DynamicInterface, Request, "$Id$") -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "ExceptionList.h" #include "DII_Invocation.h" #include "tao/Object.h" @@ -445,4 +443,3 @@ template class TAO_Pseudo_Object_Manager<CORBA_Request,CORBA_Request_var>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_HAS_MINIMUM_CORBA */ diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 34bd4279346..286b5ef4be6 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -29,8 +29,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "Context.h" #include "ExceptionList.h" #include "tao/corbafwd.h" @@ -369,6 +367,5 @@ private: # include "Request.inl" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_MINIMUM_CORBA */ #include "ace/post.h" #endif /* TAO_REQUEST_H */ diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index f5f6f729156..cbd3e242bbc 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -6,8 +6,6 @@ ACE_RCSID(DynamicInterface, Server_Request, "$Id$") -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "tao/NVList.h" #include "tao/GIOP_Utils.h" #include "tao/Marshal.h" @@ -207,5 +205,3 @@ CORBA_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV) this->orb_server_request_.tao_send_reply (); } -#endif /* TAO_HAS_MINIMUM_CORBA */ - diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 56ddfcccba6..3efb9a7d1aa 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -28,8 +28,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "Context.h" #include "tao/TAO_Server_Request.h" @@ -143,6 +141,5 @@ private: # include "Server_Request.inl" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_MINIMUM_CORBA */ #include "ace/post.h" #endif /* TAO_CORBA_SERVER_REQUEST_H */ diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp index 4646d8dd856..c27f10bcb82 100644 --- a/TAO/tao/Dynamic_Adapter.cpp +++ b/TAO/tao/Dynamic_Adapter.cpp @@ -1,9 +1,6 @@ // @(#) $Id$ #include "tao/Dynamic_Adapter.h" - -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "ace/Dynamic_Service.h" ACE_RCSID(tao, Dynamic_Adapter, "$Id$") @@ -146,5 +143,4 @@ template class ACE_Dynamic_Service<TAO_Dynamic_Adapter>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_HAS_MINIMUM_CORBA */ diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h index 9bc0299e583..bc64655b53c 100644 --- a/TAO/tao/Dynamic_Adapter.h +++ b/TAO/tao/Dynamic_Adapter.h @@ -24,8 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "ace/Service_Object.h" class TAO_GIOP_Twoway_Invocation; @@ -83,6 +81,5 @@ public: CORBA_Environment &); }; -#endif /* TAO_HAS_MINIMUM_CORBA */ #include "ace/post.h" #endif /* TAO_DYNAMIC_ADAPTER_H */ diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp index f7e70ec66e2..a7540f9c1db 100644 --- a/TAO/tao/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging_Policy_i.cpp @@ -4,12 +4,14 @@ #include "tao/Stub.h" #include "tao/debug.h" +ACE_RCSID(TAO, Messaging_Policy_i, "$Id$") + +#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) + #if ! defined (__ACE_INLINE__) #include "tao/Messaging_Policy_i.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(TAO, Messaging_Policy_i, "$Id$") - TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TimeBase::TimeT& relative_expiry) : relative_expiry_ (relative_expiry) { @@ -162,6 +164,7 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) } } +#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ // **************************************************************** @@ -288,10 +291,3 @@ TAO_Sync_Scope_Policy::destroy (CORBA_Environment &) #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ -//////////////////////////////////////////////////////////////////////////////// - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 5fbfeef5927..519c26ba223 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -4,8 +4,6 @@ #include "tao/NVList.h" -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "tao/Exception.h" #include "tao/Environment.h" #include "tao/ORB.h" @@ -466,4 +464,3 @@ template class auto_ptr<TAO_InputCDR>; #pragma instantiate auto_ptr<TAO_InputCDR> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -#endif /* TAO_HAS_MINIMUM_CORBA */ diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h index 3d3d6c5f593..9f38e79e5b4 100644 --- a/TAO/tao/NVList.h +++ b/TAO/tao/NVList.h @@ -26,8 +26,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - #include "ace/Containers_T.h" #include "tao/Any.h" @@ -392,7 +390,5 @@ private: # include "tao/NVList.i" #endif /* __ACE_INLINE__ */ -#endif /* TAO_HAS_MINIMUM_CORBA */ - #include "ace/post.h" #endif /* TAO_NVLIST_H */ diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index f6942803aa5..76b3ce3e1ae 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -243,30 +243,6 @@ CORBA::is_nil (CORBA::Object_ptr obj) return 0; } - -#if (TAO_HAS_MINIMUM_CORBA == 0) - -// NON_EXISTENT ... send a simple call to the object, which will -// either elicit a FALSE response or a OBJECT_NOT_EXIST exception. In -// the latter case, return FALSE. - -CORBA::Boolean -CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV) -{ - CORBA::Boolean _tao_retval = 0; - - // Get the right Proxy. - TAO_Object_Proxy_Impl &the_proxy = - this->proxy_broker_->select_proxy (this, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - // Perform the Call. - _tao_retval = the_proxy._non_existent (this, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - - return _tao_retval; -} - void CORBA_Object::_create_request (CORBA::Context_ptr ctx, const char *operation, @@ -366,6 +342,29 @@ CORBA_Object::_request (const char *operation, } } +#if (TAO_HAS_MINIMUM_CORBA == 0) + +// NON_EXISTENT ... send a simple call to the object, which will +// either elicit a FALSE response or a OBJECT_NOT_EXIST exception. In +// the latter case, return FALSE. + +CORBA::Boolean +CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV) +{ + CORBA::Boolean _tao_retval = 0; + + // Get the right Proxy. + TAO_Object_Proxy_Impl &the_proxy = + this->proxy_broker_->select_proxy (this, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + // Perform the Call. + _tao_retval = the_proxy._non_existent (this, ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + + return _tao_retval; +} + #if (TAO_HAS_INTERFACE_REPOSITORY == 1) IR::InterfaceDef_ptr diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 2e4c2a60316..eec1a76bd2b 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -105,6 +105,8 @@ public: #endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ +#endif /* TAO_HAS_MINIMUM_CORBA */ + // Interface repository related operations. // DII operations to create a request. @@ -142,8 +144,6 @@ public: TAO_default_environment ()); // DII operation to create a request. -#endif /* TAO_HAS_MINIMUM_CORBA */ - #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Policy_ptr _get_policy ( diff --git a/TAO/tao/RT_ORBInitializer.h b/TAO/tao/RT_ORBInitializer.h index 80a75352780..3340e4b946f 100644 --- a/TAO/tao/RT_ORBInitializer.h +++ b/TAO/tao/RT_ORBInitializer.h @@ -38,6 +38,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +#if TAO_HAS_RT_CORBA == 1 + /// RTCORBA ORB initializer. class TAO_Export TAO_RT_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, @@ -56,12 +58,15 @@ public: private: void register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - TAO_ENV_ARG_DECL); + PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL + ); ///< Register RTCORBA policy factories. }; +#endif /* TAO_HAS_RT_CORBA == 1 */ + #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index 03f9e4bb939..d4c645ebf75 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -132,6 +132,13 @@ TAO_SYSTEM_EXCEPTION_LIST class CORBA_WrongTransaction; typedef CORBA_WrongTransaction *CORBA_WrongTransaction_ptr; +class CORBA_ConstructionPolicy; +class CORBA_ConstructionPolicy_var; +class CORBA_ConstructionPolicy_out; +typedef class CORBA_ConstructionPolicy *CORBA_ConstructionPolicy_ptr; + +#endif /* ! TAO_HAS_MINIMUM_CORBA */ + class CORBA_Request; class CORBA_Request_var; class CORBA_Request_out; @@ -146,7 +153,6 @@ class CORBA_NamedValue_var; class CORBA_NamedValue_out; typedef class CORBA_NamedValue *CORBA_NamedValue_ptr; - class CORBA_NVList; class CORBA_NVList_var; class CORBA_NVList_out; @@ -162,13 +168,6 @@ class CORBA_ContextList_var; class CORBA_ContextList_out; typedef class CORBA_ContextList *CORBA_ContextList_ptr; -class CORBA_ConstructionPolicy; -class CORBA_ConstructionPolicy_var; -class CORBA_ConstructionPolicy_out; -typedef class CORBA_ConstructionPolicy *CORBA_ConstructionPolicy_ptr; - -#endif /* ! TAO_HAS_MINIMUM_CORBA */ - class CORBA_ORB; class CORBA_ORB_var; class CORBA_ORB_out; @@ -542,8 +541,6 @@ TAO_NAMESPACE CORBA typedef CORBA_SystemException SystemException; typedef CORBA_UserException UserException; -#if (TAO_HAS_MINIMUM_CORBA == 0) - typedef CORBA_Request Request; typedef Request *Request_ptr; typedef CORBA_Request_var Request_var; @@ -569,8 +566,6 @@ TAO_NAMESPACE CORBA typedef CORBA_ContextList_var ContextList_var; typedef CORBA_ContextList_out ContextList_out; -#endif /* TAO_HAS_MINIMUM_CORBA */ - typedef CORBA_Object Object; typedef CORBA_Object *Object_ptr; typedef CORBA_Object_var Object_var; @@ -676,34 +671,24 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (TypeCode_ptr); TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ORB_ptr); TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Principal_ptr); - -#if (TAO_HAS_MINIMUM_CORBA == 0) - TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (Request_ptr); TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (ServerRequest_ptr req); TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NamedValue_ptr); TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NVList_ptr); TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (Context_ptr); -#endif /* TAO_HAS_MINIMUM_CORBA */ - // = all the CORBA release methods. TAO_NAMESPACE_INLINE_FUNCTION void release (Object_ptr); TAO_NAMESPACE_INLINE_FUNCTION void release (Environment_ptr); TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr); TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr); TAO_NAMESPACE_INLINE_FUNCTION void release (ORB_ptr); - -#if (TAO_HAS_MINIMUM_CORBA == 0) - TAO_NAMESPACE_STORAGE_CLASS void release (Request_ptr); TAO_NAMESPACE_STORAGE_CLASS void release (ServerRequest_ptr req); TAO_NAMESPACE_INLINE_FUNCTION void release (NamedValue_ptr); TAO_NAMESPACE_INLINE_FUNCTION void release (NVList_ptr); TAO_NAMESPACE_STORAGE_CLASS void release (Context_ptr); -#endif /* TAO_HAS_MINIMUM_CORBA */ - enum TCKind { // = Kinds of typecodes. @@ -793,9 +778,8 @@ TAO_NAMESPACE CORBA TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Bounds; TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_Current; -#if (TAO_HAS_MINIMUM_CORBA == 0) TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_NamedValue; -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + enum { // = Flags for NVList add methods |