ChangeLogTag: Wed Nov 26 10:38:01 2003 Dale Wilson <wilson_d@ociweb.com>

3 files changed, 18 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d98ab6e1e70..cadd3e5fdea 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 26 10:38:01 2003  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+        * orbsvcs/tests/FT_App/FT_Creator.cpp:
+          Fix build errors/warnings on linux.
+
 Tue Nov 25 17:40:01 2003  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 6c845b8f3bc..499216c503c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -261,7 +261,7 @@ void TAO::PG_Object_Group::add_member (
   // This can be avoided when we get support for TAG_MULTIPLE_COMPONENTS
   // For now, we already have a copy of the tagGroupTagged component and we're going to use
   // it below wen we increment the group version so we can clean out the dummy entry.
-  PortableGroup::ObjectGroup_var cleaned = PortableGroup::ObjectGroup::_duplicate (this->reference_);
+  PortableGroup::ObjectGroup_var cleaned = PortableGroup::ObjectGroup::_duplicate (this->reference_.in ());
   if (this->empty_)
   {
     // remove the original profile.  It's a dummy entry supplied by create_object.
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 13d05d2d906..b5d77ab26ff 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -21,13 +21,15 @@
 
 
 FTAPP::FT_Creator::FT_Creator ()
-  : registry_ior_ (0)
-  , replication_manager_ (0)
+  : creator_ ()
+  , orb_ (CORBA::ORB::_nil ())
+  , registry_ior_(0)
+  , replication_manager_ (::FT::ReplicationManager::_nil ())
   , have_replication_manager_ (0)
   , write_iors_ (0)
   , write_iogr_ (0)
-  , iogr_seq_ (0)
   , ns_register_ (1)
+  , iogr_seq_ (0)
   , prefix_ ("")
 {
 }
@@ -139,9 +141,9 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   {
     CORBA::Object_var registry_obj = this->orb_->string_to_object (this->registry_ior_  ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
-    PortableGroup::FactoryRegistry_var registry = PortableGroup::FactoryRegistry::_narrow(registry_obj  ACE_ENV_ARG_PARAMETER);
+    PortableGroup::FactoryRegistry_var registry = PortableGroup::FactoryRegistry::_narrow(registry_obj.in ()  ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
-    if (! CORBA::is_nil (registry))
+    if (! CORBA::is_nil (registry.in ()))
     {
       result = this->creator_.set_factory_registry(registry.in());
     }
@@ -178,7 +180,8 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   int result = 0;
   size_t typeCount = this->create_roles_.size();
-  for ( size_t nType = 0; result == 0 && nType < typeCount; ++nType)
+  size_t nType = 0;
+  for ( nType = 0; result == 0 && nType < typeCount; ++nType)
   {
     const char * role = this->create_roles_[nType].c_str();
     std::cout << std::endl << "Creator: Creating group of " << role << std::endl;
@@ -190,7 +193,7 @@ int FTAPP::FT_Creator::run (ACE_ENV_SINGLE_ARG_DECL)
 
     if (this->write_iogr_)
     {
-      CORBA::String_var iogr = this->orb_->object_to_string (group ACE_ENV_ARG_PARAMETER);
+      CORBA::String_var iogr = this->orb_->object_to_string (group.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (1);
 
       char iogr_filename[1000];
@@ -260,7 +263,7 @@ main (int argc, char *argv[])
     result = app.parse_args(argc, argv);
     if (result == 0)
     {
-      result = app.init (orb ACE_ENV_ARG_PARAMETER);
+      result = app.init (orb.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == 0)
       {