ChangeLogTag:Thu Oct 13 12:26:47 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

13 files changed, 139 insertions, 69 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bc3951b016e..597814caec0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,4 +1,60 @@
-Thu Oct 13 12:03:05 2005  Steve Totten  <totten_s@ociweb.com>
+Thu Oct 13 12:26:47 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* tao/ORB_Core.cpp:
+
+	  Minor coding convention updates.  Class members outside of a
+	  base member initializer list should be referenced with the
+	  "this" pointer (e.g. this->client_request_interceptor_adapter_).
+
+	* tao/Pseudo_VarOut_T.h:
+
+	  Added unimplemented copy constructor and assignment operator
+	  that accept a TAO_Base_var parameter.  Prevents invalid
+	  widening.
+
+	* tao/Pseudo_VarOut_T.inl:
+
+	  Explicitly initialize TAO_Base_var in the copy constructor
+	  base member initializer list.
+
+	* tao/SystemException.cpp:
+	* tao/SystemException.inl:
+
+	  Inlined concrete system exception constructors and static
+	  _tao_any_destructor() method.  Since they are small, a good
+	  footprint decrease is achieved by doing so, especially since
+	  only a few of the concrete SystemExceptions are used within
+	  TAO.
+
+	* tao/UserException.cpp:
+	* tao/UserException.inl:
+
+	  Likewise.
+
+	  Moved _tao_type() method of out of line.  Since it is virtual
+	  inlining can cause RTTI related problems when using g++ 4.x's
+	  "-fvisibility-inlines-hidden" feature.
+
+	* tao/TSS_Resources.cpp:
+
+	  Do not use "this" pointer in base member initializer list.  It
+	  is not guaranteed to be available until after base member
+	  initialization is completed.
+
+	* tao/TSS_Resources.h:
+
+	  Minor include directive reorganization.
+
+	* tao/PI/ClientRequestInterceptor_Adapter_Impl.h:
+
+	  Cosmetic update.
+
+	* tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp:
+	* tao/PI/ClientRequestInterceptor_Factory_Impl.cpp:
+
+	  Corrected ACE_RCSID macro arguments.
+
+Thu Oct 13 12:03:05 2005  Steve Totten  <totten_s@ociweb.com>:
 
         * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp:
         * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 16c21d52646..e04f844c247 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -2157,8 +2157,8 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
             ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          delete client_request_interceptor_adapter_;
-          client_request_interceptor_adapter_ = 0;
+          delete this->client_request_interceptor_adapter_;
+          this->client_request_interceptor_adapter_ = 0;
         }
 
       if (this->server_request_interceptor_adapter_ != 0)
@@ -2167,8 +2167,8 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
             ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          delete server_request_interceptor_adapter_;
-          server_request_interceptor_adapter_ = 0;
+          delete this->server_request_interceptor_adapter_;
+          this->server_request_interceptor_adapter_ = 0;
         }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 526e79e1acf..574fc987085 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -13,8 +13,8 @@
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/PortableInterceptorC.h"
 
-ACE_RCSID (tao,
-           ClientInterceptorAdapter,
+ACE_RCSID (PI,
+           ClientRequestInterceptorAdapter_Impl,
            "$Id$")
 
 namespace TAO
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
index dbd1382fde4..2ec52a987aa 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -21,13 +21,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "pi_export.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -58,8 +57,8 @@ namespace TAO
    * point, and enforces flow rules dictated by the Portable Interceptor
    * specification/chapter.
    */
-  class TAO_PI_Export ClientRequestInterceptor_Adapter_Impl :
-    public ClientRequestInterceptor_Adapter
+  class ClientRequestInterceptor_Adapter_Impl
+    : public ClientRequestInterceptor_Adapter
   {
   public:
 
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
index 893efb316f4..890ce995534 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp
@@ -21,7 +21,7 @@
 #include "tao/debug.h"
 
 ACE_RCSID (PI,
-           PolicyFactory_Loader,
+           ClientRequestInterceptor_Factory_Impl,
            "$Id$")
 
 TAO::ClientRequestInterceptor_Adapter*
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
index bdc0131b322..4d73bba0c55 100644
--- a/TAO/tao/Pseudo_VarOut_T.h
+++ b/TAO/tao/Pseudo_VarOut_T.h
@@ -40,6 +40,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/varbase.h"
+
 /**
  * @class TAO_Pseudo_Var_T
  *
@@ -50,7 +52,7 @@
  *
  */
 template <typename T>
-class TAO_Pseudo_Var_T
+class TAO_Pseudo_Var_T : private TAO_Base_var
 {
 public:
   TAO_Pseudo_Var_T (void);
@@ -81,6 +83,12 @@ public:
   _retn_type    ptr (void) const;
 
 private:
+
+  // Unimplemented - prevents widening assignment.
+  TAO_Pseudo_Var_T (const TAO_Base_var &);
+  void operator= (const TAO_Base_var &);
+
+private:
   T * ptr_;
 };
 
diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl
index b13e74045a6..7baddc74b88 100644
--- a/TAO/tao/Pseudo_VarOut_T.inl
+++ b/TAO/tao/Pseudo_VarOut_T.inl
@@ -17,7 +17,8 @@ TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (T * p)
 template <typename T>
 ACE_INLINE
 TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> & p)
-  : ptr_ (T::_duplicate (p.ptr ()))
+  : TAO_Base_var ()
+  , ptr_ (T::_duplicate (p.ptr ()))
 {}
 
 template <typename T>
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 677f507c50c..49290d033cb 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -909,16 +909,6 @@ CORBA::name ::_tao_type (void) const \
 STANDARD_EXCEPTION_LIST
 #undef  TAO_SYSTEM_EXCEPTION
 
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::name ::_tao_any_destructor (void * x) \
-{ \
-  delete static_cast<CORBA::name *> (x); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
 CORBA::SystemException *
 TAO_Exceptions::create_system_exception (const char *id)
 {
@@ -941,27 +931,6 @@ CORBA::name ::_raise (void) const \
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
-// SystemException constructors
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::name ::name (void) \
-  :  CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \
-                             #name, \
-                             0, \
-                             CORBA::COMPLETED_NO) \
-{ \
-} \
-\
-CORBA::name ::name (CORBA::ULong code, CORBA::CompletionStatus completed) \
-  : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \
-                            #name, \
-                            code, \
-                            completed) \
-{ \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
 #define TAO_SYSTEM_EXCEPTION(name) \
 CORBA::Exception * \
 CORBA::name ::_tao_duplicate (void) const \
diff --git a/TAO/tao/SystemException.inl b/TAO/tao/SystemException.inl
index 2657bc1b135..36d2fc78d44 100644
--- a/TAO/tao/SystemException.inl
+++ b/TAO/tao/SystemException.inl
@@ -81,6 +81,29 @@ CORBA::SystemException::_downcast (const CORBA::Exception *exception)
     TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \
     TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED)
 
+// Concrete SystemException constructors
+#define TAO_SYSTEM_EXCEPTION(name) \
+ACE_INLINE \
+CORBA::name ::name (void) \
+  :  CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \
+                             #name, \
+                             0, \
+                             CORBA::COMPLETED_NO) \
+{ \
+} \
+\
+ACE_INLINE \
+CORBA::name ::name (CORBA::ULong code, CORBA::CompletionStatus completed) \
+  : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \
+                            #name, \
+                            code, \
+                            completed) \
+{ \
+}
+
+TAO_STANDARD_SYSTEM_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
 #define TAO_SYSTEM_EXCEPTION(name) \
 ACE_INLINE CORBA::name * \
 CORBA::name ::_downcast (CORBA::Exception* exception) \
@@ -100,3 +123,13 @@ CORBA::name ::_downcast (CORBA::Exception const * exception) \
 
 TAO_STANDARD_SYSTEM_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+ACE_INLINE void \
+CORBA::name ::_tao_any_destructor (void * x) \
+{ \
+  delete static_cast<CORBA::name *> (x); \
+}
+
+TAO_STANDARD_SYSTEM_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp
index 30d2613eb2d..e80f9cab0cc 100644
--- a/TAO/tao/TSS_Resources.cpp
+++ b/TAO/tao/TSS_Resources.cpp
@@ -10,14 +10,14 @@ ACE_RCSID (tao,
 
 
 TAO_TSS_Resources::TAO_TSS_Resources (void)
-  :  poa_current_impl_ (0)
+  : poa_current_impl_ (0)
   , rtscheduler_current_impl_ (0)
   , rtscheduler_previous_current_impl_ (0)
-  , default_environment_ (&this->tss_environment_)
+  , default_environment_ (&tss_environment_)
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
-  , policy_current_ (&this->initial_policy_current_)
+  , policy_current_ (&initial_policy_current_)
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
   , gui_resource_factory_ (0)
@@ -27,7 +27,7 @@ TAO_TSS_Resources::TAO_TSS_Resources (void)
 
 TAO_TSS_Resources::~TAO_TSS_Resources (void)
 {
-  delete gui_resource_factory_;
+  delete this->gui_resource_factory_;
 }
 
 TAO_TSS_Resources *
diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h
index 49d73a60f63..a33983a0dc6 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -17,15 +17,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Policy_Current_Impl.h"
-
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Environment.h"
-#include "tao/TAO_Export.h"
+
+#include "tao/Policy_Current_Impl.h"
 
 // Forward declarations
 namespace TAO
diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp
index 241852cddae..0e382b85985 100644
--- a/TAO/tao/UserException.cpp
+++ b/TAO/tao/UserException.cpp
@@ -14,17 +14,7 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-CORBA::UserException::UserException (void)
-{
-}
-
-CORBA::UserException::UserException (char const * repository_id,
-                                     char const * local_name)
-  : CORBA::Exception (repository_id,
-                      local_name)
-{
-}
-
+// Virtual.  Do not inline.
 CORBA::UserException::~UserException (void)
 {
 }
@@ -36,6 +26,13 @@ CORBA::UserException::operator= (CORBA::UserException const & rhs)
   return *this;
 }
 
+// Virtual.  Do not inline.
+CORBA::TypeCode_ptr
+CORBA::UserException::_tao_type (void) const
+{
+  return 0;
+}
+
 ACE_CString
 CORBA::UserException::_info (void) const
 {
diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl
index a8ca0e78f23..ba01c46e9fd 100644
--- a/TAO/tao/UserException.inl
+++ b/TAO/tao/UserException.inl
@@ -3,6 +3,19 @@
 // $Id$
 
 ACE_INLINE
+CORBA::UserException::UserException (void)
+{
+}
+
+ACE_INLINE
+CORBA::UserException::UserException (char const * repository_id,
+                                     char const * local_name)
+  : CORBA::Exception (repository_id,
+                      local_name)
+{
+}
+
+ACE_INLINE
 CORBA::UserException::UserException (CORBA::UserException const & rhs)
   : CORBA::Exception (rhs)
 {
@@ -19,9 +32,3 @@ CORBA::UserException::_downcast (CORBA::Exception const * exception)
 {
   return dynamic_cast<const CORBA::UserException *> (exception);
 }
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::UserException::_tao_type (void) const
-{
-  return 0;
-}