diff options
Diffstat (limited to 'TAO/tao')
41 files changed, 148 insertions, 411 deletions
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h index d0e11552f78..6a0fd845adc 100644 --- a/TAO/tao/Adapter.h +++ b/TAO/tao/Adapter.h @@ -27,6 +27,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { + class Object; + typedef Object * Object_ptr; + typedef TAO_Pseudo_Var_T<Object> Object_var; typedef TAO_Pseudo_Out_T<Object> Object_out; } diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h b/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h index d954af4b0ad..32bbd304915 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h @@ -29,28 +29,14 @@ #include "tao/Basic_Types.h" #include "tao/orbconf.h" +#include "tao/CORBA_methods.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { - class NamedValue; - typedef NamedValue *NamedValue_ptr; - - class NVList; - typedef NVList *NVList_ptr; - - class TypeCode; - typedef TypeCode *TypeCode_ptr; - - TAO_NAMESPACE_INLINE_FUNCTION void release (NamedValue_ptr); - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NamedValue_ptr); - - TAO_NAMESPACE_INLINE_FUNCTION void release (NVList_ptr); - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NVList_ptr ); - - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (TypeCode_ptr); - TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr); + template<> + TAO_AnyTypeCode_Export void release (CORBA::TypeCode_ptr); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 80f127fc5e6..6b0ef8aabc5 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -22,22 +22,18 @@ # include "tao/AnyTypeCode/NVList.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (AnyTypeCode, - NVList, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Reference counting for DII Request object CORBA::ULong -CORBA::NamedValue::_incr_refcnt (void) +CORBA::NamedValue::_incr_refcount (void) { return ++this->refcount_; } CORBA::ULong -CORBA::NamedValue::_decr_refcnt (void) +CORBA::NamedValue::_decr_refcount (void) { CORBA::ULong const new_count = --this->refcount_; @@ -60,13 +56,13 @@ CORBA::NamedValue::~NamedValue (void) // **************************************************************** CORBA::ULong -CORBA::NVList::_incr_refcnt (void) +CORBA::NVList::_incr_refcount (void) { return ++this->refcount_; } CORBA::ULong -CORBA::NVList::_decr_refcnt (void) +CORBA::NVList::_decr_refcount (void) { CORBA::ULong const new_count = --this->refcount_; diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index 1cf6aef8f21..a3af6fd0688 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef TAO_NVLIST_H #define TAO_NVLIST_H @@ -97,8 +96,8 @@ namespace CORBA static NamedValue * _nil (void); // = Reference counting. - ULong _incr_refcnt (void); - ULong _decr_refcnt (void); + ULong _incr_refcount (void); + ULong _decr_refcount (void); // Useful for template programming. typedef NamedValue_ptr _ptr_type; @@ -195,8 +194,8 @@ namespace CORBA static NVList * _nil (void); // = Reference counting. - ULong _incr_refcnt (void); - ULong _decr_refcnt (void); + ULong _incr_refcount (void); + ULong _decr_refcount (void); // = TAO Extensions: diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl index d0514805ceb..861678e262f 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -4,21 +4,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_INLINE CORBA::Boolean -CORBA::is_nil (CORBA::NamedValue_ptr nv) -{ - return nv == 0; -} - -ACE_INLINE void -CORBA::release (CORBA::NamedValue_ptr nv) -{ - if (nv) - nv->_decr_refcnt (); -} - -// ************************************************************* - ACE_INLINE CORBA::NamedValue::NamedValue (void) : refcount_ (1), @@ -54,7 +39,7 @@ CORBA::NamedValue::_duplicate (CORBA::NamedValue * x) { if (x != 0) { - x->_incr_refcnt (); + x->_incr_refcount (); } return x; @@ -70,25 +55,6 @@ CORBA::NamedValue::_nil (void) // ************************************************************* ACE_INLINE -CORBA::Boolean -CORBA::is_nil (CORBA::NVList_ptr nvl) -{ - return (CORBA::Boolean) (nvl == 0); -} - -ACE_INLINE -void -CORBA::release (CORBA::NVList_ptr nvl) -{ - if (nvl) - { - nvl->_decr_refcnt (); - } -} - -// **************************************************************** - -ACE_INLINE CORBA::NVList::NVList (void) : max_ (0), refcount_ (1), @@ -112,7 +78,7 @@ CORBA::NVList::_duplicate (CORBA::NVList * x) { if (x != 0) { - x->_incr_refcnt (); + x->_incr_refcount (); } return x; diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index b6bf5c65e20..c026a815d07 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -2,11 +2,6 @@ #include "tao/AnyTypeCode/TypeCode.h" -ACE_RCSID (AnyTypeCode, - TypeCode, - "$Id$") - - #if !defined (__ACE_INLINE__) # include "tao/AnyTypeCode/TypeCode.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl index ea1465a83a7..f9cc23f4439 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.inl +++ b/TAO/tao/AnyTypeCode/TypeCode.inl @@ -4,17 +4,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_INLINE CORBA::Boolean -CORBA::is_nil (CORBA::TypeCode_ptr obj) -{ - return obj == 0; -} - +template<> ACE_INLINE void CORBA::release (CORBA::TypeCode_ptr obj) { - if (obj) - obj->tao_release (); + if (obj != 0) + { + obj->tao_release (); + } } // -------------------------------------------------------------- diff --git a/TAO/tao/CORBA_methods.h b/TAO/tao/CORBA_methods.h index b6ad992d720..c24c68fb561 100644 --- a/TAO/tao/CORBA_methods.h +++ b/TAO/tao/CORBA_methods.h @@ -37,18 +37,6 @@ namespace CORBA class ORB; typedef ORB *ORB_ptr; - class Environment; - typedef Environment *Environment_ptr; - - class Object; - typedef Object *Object_ptr; - - class Principal; - typedef Principal *Principal_ptr; - - class OperationDef; - typedef OperationDef *OperationDef_ptr; - /** * ORB Initialization */ @@ -65,17 +53,18 @@ namespace CORBA const wchar_t * orb_name); #endif - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Environment_ptr); - TAO_NAMESPACE_INLINE_FUNCTION void release (Environment_ptr); - - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ORB_ptr); - TAO_NAMESPACE_INLINE_FUNCTION void release (ORB_ptr); - - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Object_ptr); - TAO_NAMESPACE_INLINE_FUNCTION void release (Object_ptr); - - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Principal_ptr); - TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr); + template<typename T> inline Boolean is_nil (T x) + { + return x == 0; + } + + template<typename T> inline void release (T x) + { + if (x != 0) + { + x->_decr_refcount (); + } + } } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 4f369575dda..b1bb9f70399 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -26,13 +26,13 @@ CORBA::Context::~Context (void) } CORBA::ULong -CORBA::Context::_incr_refcnt (void) +CORBA::Context::_incr_refcount (void) { return ++refcount_; } CORBA::ULong -CORBA::Context::_decr_refcnt (void) +CORBA::Context::_decr_refcount (void) { CORBA::ULong const new_count = --this->refcount_; @@ -165,13 +165,13 @@ CORBA::ContextList::_destroy (void) } void -CORBA::ContextList::_incr_refcnt (void) +CORBA::ContextList::_incr_refcount (void) { ++this->ref_count_; } void -CORBA::ContextList::_decr_refcnt (void) +CORBA::ContextList::_decr_refcount (void) { --this->ref_count_; diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 5a381ee69c5..e0eb9101ca7 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -49,6 +49,12 @@ namespace CORBA class NVList; typedef NVList *NVList_ptr; + + class Context; + typedef Context * Context_ptr; + + class ContextList; + typedef ContextList * ContextList_ptr; typedef TAO_Pseudo_Var_T<Context> Context_var; typedef TAO_Pseudo_Out_T<Context> Context_out; @@ -81,8 +87,8 @@ namespace CORBA static Context *_nil (void); // = Reference counting. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcount (void); + CORBA::ULong _decr_refcount (void); // = All the spec-required functions below will just throw a // CORBA::NO_IMPLEMENT exception and do nothing else. @@ -163,8 +169,8 @@ namespace CORBA void remove (CORBA::ULong slot); /// Increment and decrement ref counts. - void _incr_refcnt (void); - void _decr_refcnt (void); + void _incr_refcount (void); + void _decr_refcount (void); // Useful for template programming. typedef CORBA::ContextList_ptr _ptr_type; diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl index 87c338e31e0..459cc2bca87 100644 --- a/TAO/tao/DynamicInterface/Context.inl +++ b/TAO/tao/DynamicInterface/Context.inl @@ -5,48 +5,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -void -CORBA::release (CORBA::Context_ptr x) -{ - if (x != 0) - { - x->_decr_refcnt (); - } -} - -ACE_INLINE -CORBA::Boolean -CORBA::is_nil (CORBA::Context_ptr x) -{ - return (CORBA::Boolean) (x == 0); -} - -ACE_INLINE -void -CORBA::release (CORBA::ContextList *x) -{ - if (x != 0) - { - x->_decr_refcnt (); - } -} - -ACE_INLINE -CORBA::Boolean -CORBA::is_nil (CORBA::ContextList_ptr x) -{ - return (CORBA::Boolean) (x == 0); -} - -// =================================================================== - -ACE_INLINE CORBA::Context_ptr CORBA::Context::_duplicate (CORBA::Context_ptr x) { if (x != 0) { - x->_incr_refcnt (); + x->_incr_refcount (); } return x; @@ -88,7 +52,7 @@ CORBA::ContextList::_duplicate (CORBA::ContextList_ptr x) { if (x != 0) { - x->_incr_refcnt (); + x->_incr_refcount (); } return x; diff --git a/TAO/tao/DynamicInterface/DII_CORBA_methods.h b/TAO/tao/DynamicInterface/DII_CORBA_methods.h index aea9e098cbb..4de9bd17a2c 100644 --- a/TAO/tao/DynamicInterface/DII_CORBA_methods.h +++ b/TAO/tao/DynamicInterface/DII_CORBA_methods.h @@ -31,38 +31,6 @@ #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace CORBA -{ - class ContextList; - typedef ContextList *ContextList_ptr; - - class Context; - typedef Context *Context_ptr; - - class ExceptionList; - typedef ExceptionList *ExceptionList_ptr; - - class Request; - typedef Request *Request_ptr; - - TAO_NAMESPACE_INLINE_FUNCTION void release (Context_ptr); - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Context_ptr); - - TAO_NAMESPACE_INLINE_FUNCTION void release (ContextList_ptr); - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ContextList_ptr ); - - TAO_NAMESPACE_INLINE_FUNCTION void release (ExceptionList_ptr); - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ExceptionList_ptr); - - TAO_NAMESPACE_INLINE_FUNCTION void release (Request_ptr); - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Request_ptr); - -} - -TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* TAO_DII_CORBA_METHODS_H */ diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp index cb4e04a7e8f..57a453ed077 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp @@ -81,7 +81,7 @@ TAO_Dynamic_Adapter_Impl::context_release (CORBA::Context_ptr ctx) { if (ctx != 0) { - ctx->_decr_refcnt (); + ctx->_decr_refcount (); } } @@ -96,7 +96,7 @@ TAO_Dynamic_Adapter_Impl::request_release (CORBA::Request_ptr req) { if (req != 0) { - req->_decr_refcnt (); + req->_decr_refcount (); } } @@ -111,7 +111,7 @@ TAO_Dynamic_Adapter_Impl::server_request_release (CORBA::ServerRequest_ptr req) { if (req != 0) { - req->_decr_refcnt (); + req->_decr_refcount (); } } diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index 7263b740ba1..74dffaef6b4 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -74,24 +74,24 @@ CORBA::ExceptionList::remove (CORBA::ULong) CORBA::ExceptionList_ptr CORBA::ExceptionList::_duplicate (void) { - this->_incr_refcnt (); + this->_incr_refcount (); return this; } void CORBA::ExceptionList::_destroy (void) { - this->_decr_refcnt (); + this->_decr_refcount (); } void -CORBA::ExceptionList::_incr_refcnt (void) +CORBA::ExceptionList::_incr_refcount (void) { ++this->ref_count_; } void -CORBA::ExceptionList::_decr_refcnt (void) +CORBA::ExceptionList::_decr_refcount (void) { CORBA::ULong const refcount = --this->ref_count_; diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index 28b7fc5b385..877249397fb 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -14,7 +14,6 @@ */ //============================================================================= - #ifndef TAO_CORBA_EXCEPTIONLIST_H #define TAO_CORBA_EXCEPTIONLIST_H @@ -46,6 +45,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { + class ExceptionList; + typedef ExceptionList * ExceptionList_ptr; + typedef TAO_Pseudo_Var_T<ExceptionList> ExceptionList_var; typedef TAO_Pseudo_Out_T<ExceptionList> ExceptionList_out; @@ -97,8 +99,8 @@ namespace CORBA void remove (CORBA::ULong slot); /// Increment and decrement ref counts. - void _incr_refcnt (void); - void _decr_refcnt (void); + void _incr_refcount (void); + void _decr_refcount (void); /// Useful for template programming. typedef CORBA::ExceptionList_ptr _ptr_type; diff --git a/TAO/tao/DynamicInterface/ExceptionList.inl b/TAO/tao/DynamicInterface/ExceptionList.inl index 62326650a10..3cc1340b963 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.inl +++ b/TAO/tao/DynamicInterface/ExceptionList.inl @@ -5,25 +5,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -void -CORBA::release (CORBA::ExceptionList_ptr x) -{ - if (x != 0) - { - x->_decr_refcnt (); - } -} - -ACE_INLINE -CORBA::Boolean -CORBA::is_nil (CORBA::ExceptionList_ptr x) -{ - return x == 0; -} - -// =================================================================== - -ACE_INLINE CORBA::ExceptionList::ExceptionList (void) : ref_count_ (1) { @@ -49,7 +30,7 @@ CORBA::ExceptionList::_duplicate (CORBA::ExceptionList_ptr x) { if (x != 0) { - x->_incr_refcnt (); + x->_incr_refcount (); } return x; diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 92884047502..0764f125b9c 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -33,13 +33,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Reference counting for DII Request object. CORBA::ULong -CORBA::Request::_incr_refcnt (void) +CORBA::Request::_incr_refcount (void) { return ++this->refcount_; } CORBA::ULong -CORBA::Request::_decr_refcnt (void) +CORBA::Request::_decr_refcount (void) { CORBA::ULong const new_count = --this->refcount_; diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 896d530c0da..5da63a1a932 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -173,8 +173,8 @@ namespace CORBA static CORBA::Request* _nil (void); // = Reference counting. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcount (void); + CORBA::ULong _decr_refcount (void); /// Set the lazy evaluation flag. void _tao_lazy_evaluation (bool lazy_evaluation); diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl index 05a9ffeb62a..a48debc6797 100644 --- a/TAO/tao/DynamicInterface/Request.inl +++ b/TAO/tao/DynamicInterface/Request.inl @@ -4,31 +4,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_INLINE -void -CORBA::release (CORBA::Request_ptr x) -{ - if (x != 0) - { - x->_decr_refcnt (); - } -} - -ACE_INLINE -CORBA::Boolean -CORBA::is_nil (CORBA::Request_ptr x) -{ - return (CORBA::Boolean) (x == 0); -} - -// =================================================================== - ACE_INLINE CORBA::Request_ptr CORBA::Request::_duplicate (CORBA::Request_ptr x) { if (x != 0) { - x->_incr_refcnt (); + x->_incr_refcount (); } return x; diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index 7900b2420f3..018c56c5e75 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -28,13 +28,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Reference counting for DSI ServerRequest object. CORBA::ULong -CORBA::ServerRequest::_incr_refcnt (void) +CORBA::ServerRequest::_incr_refcount (void) { return ++this->refcount_; } CORBA::ULong -CORBA::ServerRequest::_decr_refcnt (void) +CORBA::ServerRequest::_decr_refcount (void) { CORBA::ULong const new_count = --this->refcount_; diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 8c9db7c9233..41c8df2f76c 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -15,7 +15,6 @@ */ //============================================================================= - #ifndef TAO_CORBA_SERVER_REQUEST_H #define TAO_CORBA_SERVER_REQUEST_H @@ -47,9 +46,6 @@ namespace CORBA class ServerRequest; typedef ServerRequest *ServerRequest_ptr; - TAO_NAMESPACE_INLINE_FUNCTION void release (ServerRequest_ptr); - TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ServerRequest_ptr); - typedef TAO_Pseudo_Var_T<ServerRequest> ServerRequest_var; typedef TAO_Pseudo_Out_T<ServerRequest> ServerRequest_out; @@ -117,8 +113,8 @@ namespace CORBA static ServerRequest_ptr _nil (void); // = Reference counting. - CORBA::ULong _incr_refcnt (void); - CORBA::ULong _decr_refcnt (void); + CORBA::ULong _incr_refcount (void); + CORBA::ULong _decr_refcount (void); /// Set the lazy evaluation flag. void _tao_lazy_evaluation (bool lazy_evaluation); diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl index 926ecbd9532..c61d0e0ed83 100644 --- a/TAO/tao/DynamicInterface/Server_Request.inl +++ b/TAO/tao/DynamicInterface/Server_Request.inl @@ -4,31 +4,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_INLINE -void -CORBA::release (CORBA::ServerRequest_ptr x) -{ - if (x != 0) - { - x->_decr_refcnt (); - } -} - -ACE_INLINE -CORBA::Boolean -CORBA::is_nil (CORBA::ServerRequest_ptr x) -{ - return x == 0; -} - -// =================================================================== - ACE_INLINE CORBA::ServerRequest_ptr CORBA::ServerRequest::_duplicate (CORBA::ServerRequest_ptr x) { if (x != 0) { - x->_incr_refcnt (); + x->_incr_refcount (); } return x; diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 9e37abb8179..b5f2f835b5d 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -9,12 +9,6 @@ # include "tao/Environment.inl" #endif /* __ACE_INLINE__ */ - -ACE_RCSID (tao, - Environment, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Environment::Environment (void) diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index cab9a5f89e8..c2b51ce77b7 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -15,6 +15,7 @@ * @author Carlos O'Ryan <coryan@cs.wustl.edu> */ //============================================================================= + #ifndef TAO_ENVIRONMENT_H #define TAO_ENVIRONMENT_H @@ -149,6 +150,12 @@ namespace CORBA /// The previous environment on the "default environment stack". Environment *previous_; }; + + template<> + inline void release (Environment_ptr env) + { + delete env; + } } // End CORBA namespace TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Environment.inl b/TAO/tao/Environment.inl index a8547215d6d..8227415e62c 100644 --- a/TAO/tao/Environment.inl +++ b/TAO/tao/Environment.inl @@ -2,26 +2,11 @@ // // $Id$ - #include "ace/OS_Memory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -CORBA::Boolean -CORBA::is_nil (CORBA::Environment_ptr env) -{ - return env == 0; -} - -ACE_INLINE -void -CORBA::release (CORBA::Environment_ptr env) -{ - delete env; -} - -ACE_INLINE CORBA::Exception * CORBA::Environment::exception (void) const { diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index 94b2276cbc0..1530495fe93 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -11,10 +11,6 @@ #include "tao/Invocation_Adapter.h" #include "tao/Stub.h" -ACE_RCSID (IFR_Client, - IFR_Client_Adapter_Impl, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/IORManipulation/IORManip_Filter.h b/TAO/tao/IORManipulation/IORManip_Filter.h index e5b98736a97..91b8e9ee163 100644 --- a/TAO/tao/IORManipulation/IORManip_Filter.h +++ b/TAO/tao/IORManipulation/IORManip_Filter.h @@ -33,6 +33,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Profile; class TAO_MProfile; +namespace CORBA +{ + class Object; + typedef Object *Object_ptr; +} + class TAO_IORManip_Export TAO_IORManip_Filter { public: diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index fa63bff2ce5..f031417a061 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -27,7 +27,6 @@ #include "tao/orb_typesC.h" #include "tao/objectid.h" -#include "tao/CORBA_methods.h" #include "tao/VarOut_T.h" #include "tao/Pseudo_VarOut_T.h" #include "tao/Seq_Var_T.h" @@ -71,6 +70,9 @@ namespace CORBA class UnionMemberSeq; class ValueMemberSeq; class ORB_ObjectIdList; + + class Object; + typedef Object * Object_ptr; class ExceptionList; typedef ExceptionList * ExceptionList_ptr; @@ -89,6 +91,9 @@ namespace CORBA class Policy; typedef Policy *Policy_ptr; + + class OperationDef; + typedef OperationDef * OperationDef_ptr; typedef CORBA::ULong PolicyType; @@ -505,9 +510,9 @@ namespace CORBA #endif /// Reference counting... - unsigned long _incr_refcnt (void); - unsigned long _decr_refcnt (void); - unsigned long _refcnt (void) const; + unsigned long _incr_refcount (void); + unsigned long _decr_refcount (void); + unsigned long _refcount (void) const; /// Set the IOR flag. void _use_omg_ior_format (CORBA::Boolean ior); diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl index 2024920b2ef..371e894f050 100644 --- a/TAO/tao/ORB.inl +++ b/TAO/tao/ORB.inl @@ -21,19 +21,19 @@ CORBA::ORB::set_timeout (ACE_Time_Value *timeout) } ACE_INLINE unsigned long -CORBA::ORB::_incr_refcnt (void) +CORBA::ORB::_incr_refcount (void) { return ++this->refcount_; } ACE_INLINE unsigned long -CORBA::ORB::_refcnt (void) const +CORBA::ORB::_refcount (void) const { return this->refcount_.value (); } ACE_INLINE unsigned long -CORBA::ORB::_decr_refcnt (void) +CORBA::ORB::_decr_refcount (void) { unsigned long const count = --this->refcount_; @@ -51,7 +51,7 @@ CORBA::ORB::_duplicate (CORBA::ORB_ptr obj) { if (obj) { - obj->_incr_refcnt (); + obj->_incr_refcount (); } return obj; @@ -83,21 +83,4 @@ CORBA::ORB::orb_core (void) const return this->orb_core_; } -// ************************************************************ -// These are in CORBA namespace -// ************************************************************ - -ACE_INLINE CORBA::Boolean -CORBA::is_nil (CORBA::ORB_ptr obj) -{ - return obj == CORBA::ORB::_nil (); -} - -ACE_INLINE void -CORBA::release (CORBA::ORB_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_decr_refcnt (); -} - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index bcd10b83a63..57aa973a879 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -28,11 +28,6 @@ # include "tao/Object.inl" #endif /* ! __ACE_INLINE__ */ - -ACE_RCSID (tao, - Object, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Object::~Object (void) diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 7456d4f1efc..8a050dbfd6e 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -83,8 +83,13 @@ namespace CORBA class Object; typedef Object *Object_ptr; + typedef TAO_Pseudo_Var_T<Object> Object_var; typedef TAO_Pseudo_Out_T<Object> Object_out; + + template<> + TAO_Export Boolean + is_nil (Object_ptr); /** * @class Object @@ -337,6 +342,10 @@ namespace CORBA /// implement Smart Proxies and no others. virtual char* convert_to_ior (bool use_omg_ior_format, const char* ior_prefix) const; + + /// Wrapper for _remove_ref(), naming convention for + /// templatizing. + inline void _decr_refcount (void); protected: diff --git a/TAO/tao/Object.inl b/TAO/tao/Object.inl index ee055d70f41..c3434283af8 100644 --- a/TAO/tao/Object.inl +++ b/TAO/tao/Object.inl @@ -2,9 +2,24 @@ // // $Id$ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // **************************************************************** -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +template<> +ACE_INLINE +CORBA::Boolean +CORBA::is_nil (CORBA::Object_ptr obj) +{ + if (obj == 0) + { + return true; + } + + return CORBA::Object::is_nil_i (obj); +} + +// **************************************************************** ACE_INLINE CORBA::Object::Object (int) @@ -28,33 +43,6 @@ CORBA::Object::_duplicate (CORBA::Object_ptr obj) return obj; } -// ************************************************************ -// These are in CORBA namespace - -ACE_INLINE -void -CORBA::release (CORBA::Object_ptr obj) -{ - if (obj) - { - obj->_remove_ref (); - } -} - -ACE_INLINE -CORBA::Boolean -CORBA::is_nil (CORBA::Object_ptr obj) -{ - if (obj == 0) - { - return true; - } - - return CORBA::Object::is_nil_i (obj); -} - -// ************************************************************ - // Null pointers represent nil objects. ACE_INLINE @@ -95,4 +83,10 @@ CORBA::Object::ior (void) const return this->ior_.in (); } +inline void +CORBA::Object::_decr_refcount (void) +{ + this->_remove_ref (); +} + TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp index 08652b88096..f552ab086ae 100644 --- a/TAO/tao/Principal.cpp +++ b/TAO/tao/Principal.cpp @@ -11,11 +11,6 @@ #include "tao/Principal.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (tao, - Principal, - "$Id$") - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Principal::Principal (void) diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index 289a9be9a6e..9c19250c55e 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -13,7 +13,6 @@ */ //============================================================================= - #ifndef TAO_PRINCIPAL_H #define TAO_PRINCIPAL_H @@ -68,8 +67,8 @@ namespace CORBA static Principal * _nil (void); // = Stuff required for memory management. - unsigned long _incr_refcnt (void); - unsigned long _decr_refcnt (void); + unsigned long _incr_refcount (void); + unsigned long _decr_refcount (void); Principal (void); diff --git a/TAO/tao/Principal.inl b/TAO/tao/Principal.inl index 8ea7d1f905f..e2bc626f708 100644 --- a/TAO/tao/Principal.inl +++ b/TAO/tao/Principal.inl @@ -5,15 +5,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -CORBA::Boolean -CORBA::is_nil (CORBA::Principal_ptr principal) -{ - return principal == 0; -} - -ACE_INLINE unsigned long -CORBA::Principal::_decr_refcnt (void) +CORBA::Principal::_decr_refcount (void) { unsigned long new_count = --this->refcount_; @@ -24,18 +17,8 @@ CORBA::Principal::_decr_refcnt (void) } ACE_INLINE -void -CORBA::release (CORBA::Principal_ptr principal) -{ - if (principal) - { - principal->_decr_refcnt (); - } -} - -ACE_INLINE unsigned long -CORBA::Principal::_incr_refcnt (void) +CORBA::Principal::_incr_refcount (void) { return ++this->refcount_; } @@ -47,7 +30,7 @@ CORBA::Principal::_duplicate (CORBA::Principal * x) { if (x != 0) { - x->_incr_refcnt (); + x->_incr_refcount (); } return x; diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h index d6926f06c94..0f8d280bb9a 100644 --- a/TAO/tao/Unbounded_Sequence_CDR_T.h +++ b/TAO/tao/Unbounded_Sequence_CDR_T.h @@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { template <typename stream> - bool demarshal_sequence(stream & strm, TAO::unbounded_value_sequence <CORBA::Short> & target) { + bool demarshal_sequence(stream & strm, unbounded_value_sequence <CORBA::Short> & target) { typedef TAO::unbounded_value_sequence <CORBA::Short> sequence; ::CORBA::ULong new_length = 0; if (!(strm >> new_length)) { diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index b52d979ad1b..147eb54a1f3 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -14,32 +14,8 @@ # include "tao/Valuetype/AbstractBase.inl" #endif /* ! __ACE_INLINE__ */ -ACE_RCSID (Valuetype, - AbstractBase, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL -// ************************************************************ -// These are in CORBA namespace - -void -CORBA::release (CORBA::AbstractBase_ptr obj) -{ - if (obj) - { - obj->_remove_ref (); - } -} - -CORBA::Boolean -CORBA::is_nil (CORBA::AbstractBase_ptr obj) -{ - return (obj == 0); -} - -// ************************************************************ - CORBA::AbstractBase::AbstractBase (void) : is_objref_ (false) , concrete_stubobj_ (0) diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index c6b5bc18ac9..e76e2683037 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -40,7 +40,8 @@ class TAO_Abstract_ServantBase; namespace CORBA { - class ValueBase; + class AbstractBase; + typedef AbstractBase * AbstractBase_ptr; typedef TAO_Pseudo_Var_T<AbstractBase> AbstractBase_var; typedef TAO_Pseudo_Out_T<AbstractBase> AbstractBase_out; @@ -126,6 +127,10 @@ namespace CORBA */ CORBA::Object_ptr equivalent_objref (void); + /// Wrapper for _remove_ref(), naming convention for + /// templatizing. + inline void _decr_refcount (void); + protected: AbstractBase (void); diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl index e29418e7154..90e033664c8 100644 --- a/TAO/tao/Valuetype/AbstractBase.inl +++ b/TAO/tao/Valuetype/AbstractBase.inl @@ -55,4 +55,10 @@ CORBA::AbstractBase::_is_local (void) const return this->is_local_; } +inline void +CORBA::AbstractBase::_decr_refcount (void) +{ + this->_remove_ref (); +} + TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/Value_CORBA_methods.h b/TAO/tao/Valuetype/Value_CORBA_methods.h index dde1c2837b7..969d832df7d 100644 --- a/TAO/tao/Valuetype/Value_CORBA_methods.h +++ b/TAO/tao/Valuetype/Value_CORBA_methods.h @@ -24,6 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Basic_Types.h" +#include "tao/CORBA_methods.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -39,14 +40,6 @@ namespace CORBA extern TAO_Valuetype_Export void add_ref (ValueBase *); extern TAO_Valuetype_Export void remove_ref (ValueBase *); - - class AbstractBase; - typedef AbstractBase *AbstractBase_ptr; - - extern TAO_Valuetype_Export Boolean is_nil (AbstractBase_ptr); - extern TAO_Valuetype_Export void release (AbstractBase_ptr); - - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ZIOP_Adapter.cpp b/TAO/tao/ZIOP_Adapter.cpp index 1b18773362e..72646df886e 100644 --- a/TAO/tao/ZIOP_Adapter.cpp +++ b/TAO/tao/ZIOP_Adapter.cpp @@ -2,10 +2,6 @@ #include "tao/ZIOP_Adapter.h" -ACE_RCSID(tao, - ZIOP_Adapter, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ZIOP_Adapter::~TAO_ZIOP_Adapter (void) |