ChangeLogTag: Tue Aug 3 13:59:58 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

14 files changed, 39 insertions, 160 deletions

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;