ChangeLogTag:Tue Mar 14 16:26:27 2000 Nanbor Wang <nanbor@cs.wustl.edu>

2 files changed, 69 insertions, 61 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 2bcddf90705..742ae0d8fbe 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Tue Mar 14 16:26:27 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tao/POAC.cpp: The typecode for _tc_Current was not properly
+	  defined using TAO_NAMESPACE_blah macros.  Applied those macros.
+	  Thanks to Pradeep and Darrell for noticing this.
+
 Tue Mar 14 14:37:58 2000  David L. Levine  <levine@cs.wustl.edu>
 
         * examples/Simple/time/README: added note that this example
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
index 8f7c0a234fc..4e338028c65 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -164,7 +164,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_t
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -240,7 +240,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ForwardR
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -291,7 +291,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Fo
   {
     delete ACE_const_cast (PortableServer::ForwardRequest *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -3170,7 +3170,10 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current (CORBA::tk_objref, size
                                                        (_oc_PortableServer_Current), (char *) &_oc_PortableServer_Current,
                                                        0,
                                                        sizeof (PortableServer::Current));
-CORBA::TypeCode_ptr PortableServer::_tc_Current = &_tc_TAO_tc_PortableServer_Current;
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Current, &_tc_TAO_tc_PortableServer_Current)
+TAO_NAMESPACE_END
 
 char *
 PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id)
@@ -3217,7 +3220,7 @@ void operator<<= (
           _tao_any_val,
           ACE_TRY_ENV
         );
-      ACE_TRY_CHECK; 
+      ACE_TRY_CHECK;
     }
     else
     {
@@ -3300,7 +3303,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ObjectId
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -3351,7 +3354,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Ob
   {
     delete ACE_const_cast (PortableServer::ObjectId *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -3424,7 +3427,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ThreadPolicy_ptr _tao_el
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_ThreadPolicy, 
+          PortableServer::_tc_ThreadPolicy,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -3561,7 +3564,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::LifespanPolicy_ptr _tao_
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_LifespanPolicy, 
+          PortableServer::_tc_LifespanPolicy,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -3696,7 +3699,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::IdUniquenessPolicy_ptr _
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_IdUniquenessPolicy, 
+          PortableServer::_tc_IdUniquenessPolicy,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -3831,7 +3834,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::IdAssignmentPolicy_ptr _
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_IdAssignmentPolicy, 
+          PortableServer::_tc_IdAssignmentPolicy,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -3968,7 +3971,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicy
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_ImplicitActivationPolicy, 
+          PortableServer::_tc_ImplicitActivationPolicy,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -4103,7 +4106,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ServantRetentionPolicy_p
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_ServantRetentionPolicy, 
+          PortableServer::_tc_ServantRetentionPolicy,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -4238,7 +4241,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::RequestProcessingPolicy_
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_RequestProcessingPolicy, 
+          PortableServer::_tc_RequestProcessingPolicy,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -4329,7 +4332,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterAlread
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -4405,7 +4408,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ada
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -4456,7 +4459,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POA::AdapterAlreadyExists *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -4483,7 +4486,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterInacti
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -4559,7 +4562,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ada
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -4610,7 +4613,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POA::AdapterInactive *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -4637,7 +4640,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterNonExi
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -4713,7 +4716,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ada
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -4764,7 +4767,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POA::AdapterNonExistent *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -4789,7 +4792,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::InvalidPolicy
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -4865,7 +4868,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Inv
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -4916,7 +4919,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POA::InvalidPolicy *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -4943,7 +4946,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::NoServant &_t
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -5019,7 +5022,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::NoS
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5070,7 +5073,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POA::NoServant *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5097,7 +5100,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ObjectAlready
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -5173,7 +5176,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Obj
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5224,7 +5227,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POA::ObjectAlreadyActive *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5249,7 +5252,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ObjectNotActi
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -5325,7 +5328,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Obj
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5376,7 +5379,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POA::ObjectNotActive *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5401,7 +5404,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantAlread
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -5477,7 +5480,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ser
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5528,7 +5531,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POA::ServantAlreadyActive *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5553,7 +5556,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantNotAct
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -5629,7 +5632,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Ser
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5680,7 +5683,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POA::ServantNotActive *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5705,7 +5708,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongAdapter
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -5781,7 +5784,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Wro
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5832,7 +5835,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POA::WrongAdapter *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5857,7 +5860,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongPolicy &
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -5933,7 +5936,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::Wro
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -5984,7 +5987,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POA::WrongPolicy *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -6009,7 +6012,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::Current::NoContext
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -6085,7 +6088,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Current:
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -6136,7 +6139,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Cu
   {
     delete ACE_const_cast (PortableServer::Current::NoContext *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -6153,7 +6156,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::Current_ptr _tao_elem)
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_Current, 
+          PortableServer::_tc_Current,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -6234,7 +6237,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::POAManager_ptr _tao_elem
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_POAManager, 
+          PortableServer::_tc_POAManager,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -6377,7 +6380,7 @@ void operator<<= (CORBA::Any &_tao_any, const PortableServer::POAManager::Adapte
       );
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -6453,7 +6456,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POAManag
   {
     delete _tao_elem;
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -6504,7 +6507,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::PO
   {
     delete ACE_const_cast (PortableServer::POAManager::AdapterInactive *&, _tao_elem);
     _tao_elem = 0;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -6523,7 +6526,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::AdapterActivator_ptr _ta
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_AdapterActivator, 
+          PortableServer::_tc_AdapterActivator,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -6604,7 +6607,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ServantLocator_ptr _tao_
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_ServantLocator, 
+          PortableServer::_tc_ServantLocator,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -6685,7 +6688,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ServantManager_ptr _tao_
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_ServantManager, 
+          PortableServer::_tc_ServantManager,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -6766,7 +6769,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::ServantActivator_ptr _ta
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_ServantActivator, 
+          PortableServer::_tc_ServantActivator,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -6849,7 +6852,7 @@ void operator<<= (CORBA::Any &_tao_any, PortableServer::POA_ptr _tao_elem)
     if (stream << *_tao_obj_ptr)
     {
       _tao_any._tao_replace (
-          PortableServer::_tc_POA, 
+          PortableServer::_tc_POA,
           TAO_ENCAP_BYTE_ORDER,
           stream.begin (),
           1,
@@ -6918,4 +6921,3 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA_ptr
   _tao_elem = PortableServer::POA::_nil ();
   return 0;
 }
-