1 files changed, 35 insertions, 26 deletions
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index a0097ee45dd..f3d17ec38c2 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ci.cpp:70
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_
@@ -39,9 +39,13 @@ ImplementationRepository::ServerObject::ServerObject (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc),
+  : ACE_NESTED_CLASS (CORBA, Object) (
+        objref,
+        _tao_collocated,
+        servant,
+        oc
+      ),
     the_TAO_ServerObject_Proxy_Broker_ (0)
-  
 {
   this->ImplementationRepository_ServerObject_setup_collocation (_tao_collocated);
 }
@@ -53,14 +57,13 @@ ImplementationRepository::ServerObject::ServerObject (
   )
   : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
     the_TAO_ServerObject_Proxy_Broker_ (0)
-  
 {
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ci.cpp:70
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_
@@ -72,9 +75,13 @@ ImplementationRepository::Administration::Administration (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc),
+  : ACE_NESTED_CLASS (CORBA, Object) (
+        objref,
+        _tao_collocated,
+        servant,
+        oc
+      ),
     the_TAO_Administration_Proxy_Broker_ (0)
-  
 {
   this->ImplementationRepository_Administration_setup_collocation (_tao_collocated);
 }
@@ -86,14 +93,13 @@ ImplementationRepository::Administration::Administration (
   )
   : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
     the_TAO_Administration_Proxy_Broker_ (0)
-  
 {
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/interface_ci.cpp:70
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
@@ -105,9 +111,13 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc),
+  : ACE_NESTED_CLASS (CORBA, Object) (
+        objref,
+        _tao_collocated,
+        servant,
+        oc
+      ),
     the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
-  
 {
   this->ImplementationRepository_ServerInformationIterator_setup_collocation (_tao_collocated);
 }
@@ -119,14 +129,13 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
   )
   : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
     the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
-  
 {
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -139,7 +148,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -168,7 +177,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -217,7 +226,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -246,7 +255,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -271,7 +280,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_sequence/cdr_op_ci.cpp:81
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
@@ -289,7 +298,7 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_enum/cdr_op_ci.cpp:51
 
 ACE_INLINE
 CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ActivationMode &_tao_enumval)
@@ -313,7 +322,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::Activat
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -326,7 +335,7 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.environment) &&
     (strm << _tao_aggregate.working_directory.in ()) &&
     (strm << _tao_aggregate.activation) &&
-    (strm << _tao_aggregate.location.in ());
+    (strm << _tao_aggregate.activator.in ());
 }
 
 ACE_INLINE
@@ -340,11 +349,11 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.environment) &&
     (strm >> _tao_aggregate.working_directory.out ()) &&
     (strm >> _tao_aggregate.activation) &&
-    (strm >> _tao_aggregate.location.out ());
+    (strm >> _tao_aggregate.activator.out ());
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -373,7 +382,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_sequence/cdr_op_ci.cpp:81
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
@@ -391,7 +400,7 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -404,7 +413,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
+// c:\cvsdoc\ace_wrappers\build\vc71\tao\tao_idl\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,