ChangeLogTag: Mon Jul 28 09:14:34 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 102 insertions, 37 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 74396edba09..49327114460 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Mon Jul 28 09:14:34 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp:
+
+          Changed settings to exclude template source file from build.
+
+        * orbsvcs/tests/Redundant_Naming/client.dsp:
+
+          Turned on RTTI in project settings.
+
+        * tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
+        * orbsvcs/tests/Notify/lib/Peer_T.cpp:
+
+          Fixed problems with usage of environment variable, and cosmetic
+          changes.
+
 Mon Jul 28 09:04:14 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/fe/idl.ll:
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 2128ff143bd..2aa5c63e754 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -1,4 +1,5 @@
 // $Id$
+
 #ifndef TAO_Notify_Tests_Peer_T_CPP
 #define TAO_Notify_Tests_Peer_T_CPP
 
@@ -27,24 +28,30 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::~TAO_Notify_Tests_Peer_T ()
 {
 }
 
-template <class Peer_Traits> ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Proxy_Traits_PTR
+template <class Peer_Traits> 
+ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Proxy_Traits_PTR
 TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy (void)
 {
   return proxy_.in ();
 }
 
-template <class Peer_Traits> ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Peer_Traits_PTR
+template <class Peer_Traits> 
+ACE_TYPENAME TAO_Notify_Tests_Peer_T<Peer_Traits>::Peer_Traits_PTR
 TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (ACE_ENV_SINGLE_ARG_DECL)
 {
   return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-template <class Peer_Traits> void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, Proxy_Traits_ID proxy_id ACE_ENV_ARG_DECL)
+template <class Peer_Traits> 
+void
+TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, 
+                                               Proxy_Traits_ID proxy_id 
+                                               ACE_ENV_ARG_DECL)
 {
   PortableServer::ServantBase_var servant_var (this);
 
-  ACE_TYPENAME Peer_Traits::VAR peer_var = this->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_TYPENAME Peer_Traits::VAR peer_var = 
+    this->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->connect_to_peer (proxy, peer_var.in () ACE_ENV_ARG_PARAMETER);
@@ -55,101 +62,135 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Proxy_Traits_PTR proxy, Proxy_Tra
 
   // Register the proxy.
   if (this->proxy_name_.length () != 0)
-    LOOKUP_MANAGER->_register (this->proxy_.in ()
-                               , this->proxy_name_.c_str () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    {
+      LOOKUP_MANAGER->_register (this->proxy_.in (), 
+                                 this->proxy_name_.c_str () 
+                                 ACE_ENV_ARG_PARAMETER);
+   
+      ACE_CHECK;
+    }
 }
 
-template <class Peer_Traits> void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr ACE_ENV_ARG_DECL)
+template <class Peer_Traits> 
+void
+TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr 
+                                               ACE_ENV_ARG_DECL)
 {
-  ACE_TYPENAME Proxy_Traits::VAR proxy_var = this->obtain_proxy (admin_ptr ACE_ENV_ARG_PARAMETER);
+  ACE_TYPENAME Proxy_Traits::VAR proxy_var = 
+    this->obtain_proxy (admin_ptr 
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_var.in ()));
 
-  this->connect (proxy_var.in ()
-                 , this->proxy_id_  ACE_ENV_ARG_PARAMETER);
+  this->connect (proxy_var.in (), 
+                 this->proxy_id_  
+                 ACE_ENV_ARG_PARAMETER);
 }
 
 
-template <class Peer_Traits> void
+template <class Peer_Traits> 
+void
 TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get the POA
   PortableServer::POA_var poa;
-  LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (poa, 
+                           this->poa_name_.c_str () 
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // set the POA
-  this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
+  this->set_poa (poa.in () 
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Resolve the admin
   ACE_TYPENAME Admin_Traits::VAR admin_var;
 
-  LOOKUP_MANAGER->resolve (admin_var, this->admin_name_.c_str () ACE_ENV_ARG_PARAMETER);
+  LOOKUP_MANAGER->resolve (admin_var, 
+                           this->admin_name_.c_str () 
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TYPENAME Admin_Ext_Traits::VAR admin_ext_var =
-    Admin_Ext_Traits_INTERFACE::_narrow (admin_var.in () ACE_ENV_ARG_PARAMETER);
+    Admin_Ext_Traits_INTERFACE::_narrow (admin_var.in () 
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  ACE_TYPENAME Proxy_Traits::VAR proxy_var = this->obtain_proxy (admin_ext_var.in ()
-                                                                 , this->qos_
-                                                                 ACE_ENV_ARG_PARAMETER);
+  ACE_TYPENAME Proxy_Traits::VAR proxy_var = 
+    this->obtain_proxy (admin_ext_var.in (), 
+                        this->qos_
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_var.in ()));
 
   // connect supplier to proxy,
   // also activates the servant as CORBA object in the POA specified.
-  this->connect (proxy_var.in (), this->proxy_id_  ACE_ENV_ARG_PARAMETER);
+  this->connect (proxy_var.in (), 
+                 this->proxy_id_  
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
-template <class Peer_Traits> void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos (CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL)
+template <class Peer_Traits> 
+void
+TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos (
+    CosNotification::QoSProperties& qos 
+    ACE_ENV_ARG_DECL
+  )
 {
   this->get_proxy ()->set_qos (qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
-template <class Peer_Traits> void
-TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+template <class Peer_Traits> 
+void
+TAO_Notify_Tests_Peer_T<Peer_Traits>::status (ACE_ENV_SINGLE_ARG_DECL)
 {
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   ACE_TRY
     {
-      CORBA::Boolean not_exist = this->get_proxy ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Boolean not_exist = 
+        this->get_proxy ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (not_exist == 1)
         {
-          ACE_DEBUG ((LM_DEBUG, "Peer %s, Proxy does not exist\n",this->name_.c_str ()));
+          ACE_DEBUG ((LM_DEBUG, 
+                      "Peer %s, Proxy does not exist\n",
+                      this->name_.c_str ()));
         }
       else
         {
-          ACE_DEBUG ((LM_DEBUG, "Peer %s, Proxy exists\n",this->name_.c_str ()));
+          ACE_DEBUG ((LM_DEBUG, 
+                      "Peer %s, Proxy exists\n",
+                      this->name_.c_str ()));
         }
     }
   ACE_CATCH(CORBA::TRANSIENT, ex)
     {
       ACE_PRINT_EXCEPTION (ex, "");
-      ACE_DEBUG ((LM_DEBUG, "Peer %s is_equivalent transient exception.", this->name_.c_str ()));
+      ACE_DEBUG ((LM_DEBUG, 
+                  "Peer %s is_equivalent transient exception.", 
+                  this->name_.c_str ()));
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "");
-      ACE_DEBUG ((LM_DEBUG, "Peer %s is_equivanent other exception.", this->name_.c_str ()));
+      ACE_DEBUG ((LM_DEBUG, 
+                  "Peer %s is_equivanent other exception.", 
+                  this->name_.c_str ()));
     }
   ACE_ENDTRY;
 #else
-  return;
+  ACE_UNUSED_ARG (ACE_ENV_SINGLE_ARG_PARAMETER);
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
-template <class Peer_Traits> void
+template <class Peer_Traits> 
+void
 TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ()));
@@ -160,13 +201,17 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (ACE_ENV_SINGLE_ARG_DECL)
   this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-template <class Peer_Traits> PortableServer::POA_ptr
-TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+template <class Peer_Traits> 
+PortableServer::POA_ptr
+TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
-template <class Peer_Traits> void
+template <class Peer_Traits> 
+void
 TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa = this->_default_POA ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
index 0fe5a67097a..5687cbcac13 100644
--- a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
+++ b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
@@ -367,14 +367,17 @@ SOURCE=.\Command_Factory_T.cpp
 # Begin Source File

 

 SOURCE=.\Consumer_T.cpp

+# PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Peer_T.cpp

+# PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\Supplier_T.cpp

+# PROP Exclude_From_Build 1

 # End Source File

 # End Group

 # Begin Group "Documentation"

diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.dsp b/TAO/orbsvcs/tests/Redundant_Naming/client.dsp
index 5d8c0ce564f..506cf2d944f 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.dsp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.dsp
@@ -94,6 +94,7 @@ SOURCE=.\client.cpp
 # Begin Source File

 

 SOURCE=.\test_objectC.cpp

+# ADD CPP /GR

 # End Source File

 # Begin Source File

 

diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
index 2d7b998a12a..2fa56bf2766 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp
@@ -12,7 +12,7 @@ TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Imp
 }
 
 TAO_IORInterceptor_Adapter * TAO_IORInterceptor_Adapter_Factory_Impl::create (
-    ACE_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {