ChangeLogTag: Tue Nov 11 18:28:17 2003 Dale Wilson <wilson_d@ociweb.com>

10 files changed, 61 insertions, 19 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 015aeacbfbe..89fcf6f8631 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Tue Nov 11 18:28:17 2003  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h:
+
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.h:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp:
+        * orbsvcs/tests/FT_App/StubFaultNotifier.h:
+        * orbsvcs/tests/FT_App/StubFaultNotifier.cpp:
+          More cleaning: unused args, missing in()s.
+
 Tue Nov 11 16:58:21 2003  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
index 93248cf9e3f..4eb281a1aa9 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
@@ -19,6 +19,7 @@
 #define FT_DEFAULT_FAULT_ANALYZER_H_
 
 #include /**/ "ace/pre.h"
+#include <ace/ACE.h>
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
index 1c85c9f6c7d..8430d20beaa 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
@@ -16,6 +16,7 @@
 #define FT_FAULT_ANALYZER_H_
 
 #include /**/ "ace/pre.h"
+#include <ace/ACE.h>
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index 5724f2f6fe1..da2a51a4218 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -17,6 +17,7 @@
 
 #include /**/ "ace/pre.h"
 #include <ace/ACE.h>
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
index 6a7556b875e..bc59b6b63a4 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
@@ -16,6 +16,7 @@
 #define FT_FAULT_EVENT_DESCRIPTOR_H_
 
 #include /**/ "ace/pre.h"
+#include <ace/ACE.h>
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index 906e8285c30..d90cdeefcbc 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -73,7 +73,7 @@ public:
    * @param orb our ORB -- we keep var to it.
    * @return zero for success; nonzero is process return code for failure.
    */
-  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
 
   /**
    * Prepare to exit.
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index 5eccee9f5bb..c5a7469e92d 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -95,11 +95,14 @@ namespace
 // class FT_TestReplica_i construction/destruction
 
 FT_TestReplica_i::FT_TestReplica_i (FT_ReplicaFactory_i * factory, const char * name, unsigned long factory_id)
-  : factory_(factory)
-  , name_(name)
-  , factory_id_(factory_id)
-  , death_pending_(FT_TEST::TestReplica::NOT_YET)
-  , verbose_(1)
+  : death_pending_ (FT_TEST::TestReplica::NOT_YET)
+  , verbose_ (1)
+  , name_ (name)
+  , factory_id_ (factory_id)
+  , factory_ (factory)
+  , orb_ (0)
+  , poa_ (0)
+  , object_id_ (0)
 {
 //  std::cout << name_.c_str() << '@' << this->factory_->location() << '#' << this->factory_id_ << " Construct" << std::endl;
 }
@@ -133,6 +136,8 @@ const char * FT_TestReplica_i::repository_id()
 int
 FT_TestReplica_i::parse_args (int argc, char *argv[])
 {
+  ACE_UNUSED_ARG (argc);
+  ACE_UNUSED_ARG (argv);
   return 0;
 }
 
@@ -150,7 +155,7 @@ unsigned long FT_TestReplica_i::factory_id()const
 
 ::PortableServer::POA_ptr FT_TestReplica_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
-  return ::PortableServer::POA::_duplicate(this->poa_ ACE_ENV_ARG_PARAMETER);
+  return ::PortableServer::POA::_duplicate(this->poa_.in () ACE_ENV_ARG_PARAMETER);
 }
 
 PortableServer::ObjectId FT_TestReplica_i::object_id()const
@@ -186,7 +191,7 @@ int FT_TestReplica_i::init (CORBA::ORB_var & orb ACE_ENV_ARG_DECL)
 
   ACE_CHECK_RETURN (-1);
 
-  if (CORBA::is_nil(this->poa_))
+  if (CORBA::is_nil(this->poa_.in ()))
   {
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" (%P|%t) Unable to narrow the POA.\n")),
@@ -304,6 +309,10 @@ void FT_TestReplica_i::tao_update_object_group (
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_UNUSED_ARG (iogr);
+  ACE_UNUSED_ARG (version);
+  ACE_UNUSED_ARG (is_primary);
+
   ACE_THROW (CORBA::NO_IMPLEMENT());
 }
 
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
index 06f3b16ca53..2bbc53064b1 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h
@@ -13,11 +13,13 @@
 //
 #ifndef FT_TESTREPLICA_I_H_
 #define FT_TESTREPLICA_I_H_
+#include /**/ <ace/pre.h>
+
+#include <ace/ACE.h>
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ <ace/pre.h>
 #include "FT_TestReplicaS.h"
 
 ////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index e7f32665b4e..6955701e2b9 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -169,7 +169,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
   ACE_CHECK_RETURN (-1);
 
-  if (CORBA::is_nil(this->poa_))
+  if (CORBA::is_nil(this->poa_.in ()))
   {
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT (" (%P|%t) Unable to narrow the POA.\n")),
@@ -198,8 +198,8 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   // resolve references to detector factory
 
   CORBA::Object_var obj = this->orb_->string_to_object(detector_ior_);
-  this->factory_ = ::FT::FaultDetectorFactory::_narrow(obj);
-  if (CORBA::is_nil(this->factory_))
+  this->factory_ = ::FT::FaultDetectorFactory::_narrow(obj.in ());
+  if (CORBA::is_nil(this->factory_.in ()))
   {
     std::cerr << "Can't resolve Detector Factory IOR " << this->detector_ior_ << std::endl;
     result = -1;
@@ -213,8 +213,8 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     {
       const char * iorName = this->iorReplicaFiles_[nRep];
       CORBA::Object_var obj = this->orb_->string_to_object(iorName);
-      FT::PullMonitorable_var replica = FT::PullMonitorable::_narrow(obj);
-      if (CORBA::is_nil(replica))
+      FT::PullMonitorable_var replica = FT::PullMonitorable::_narrow(obj.in ());
+      if (CORBA::is_nil(replica.in ()))
       {
         std::cerr << "Can't resolve Replica IOR " << iorName << std::endl;
         result = -1;
@@ -231,12 +231,12 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
         //////////////////
         // FaultDetectorFactory gets picky about FaultNotifier's object type.
         // coddle it.
-        ::FT::FaultNotifier_var notifier = ::FT::FaultNotifier::_narrow(this_obj);
-        value <<= notifier;
+        ::FT::FaultNotifier_var notifier = ::FT::FaultNotifier::_narrow(this_obj.in ());
+        value <<= notifier.in ();
         encoder.add(::FT::FT_NOTIFIER, value);
 
 
-        value <<= replica;
+        value <<= replica.in ();
         encoder.add(::FT::FT_MONITORABLE, value);
 
         FT::FTDomainId domain_id = 0;
@@ -394,6 +394,7 @@ void StubFaultNotifier::push_sequence_fault (
     CORBA::SystemException
   ))
 {
+  ACE_UNUSED_ARG (events);
   ACE_THROW (CORBA::NO_IMPLEMENT());
 }
 
@@ -406,6 +407,7 @@ void StubFaultNotifier::push_sequence_fault (
     , CosNotifyFilter::InvalidGrammar
   ))
 {
+  ACE_UNUSED_ARG (constraint_grammar);
   ACE_THROW (CORBA::NO_IMPLEMENT());
 }
 
@@ -419,6 +421,9 @@ FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_structured_fault_consum
     CORBA::SystemException
   ))
 {
+  ACE_UNUSED_ARG(push_consumer);
+  ACE_UNUSED_ARG(filter);
+
   ACE_THROW (CORBA::NO_IMPLEMENT());
 }
 
@@ -432,6 +437,9 @@ FT::FaultNotifier::ConsumerId StubFaultNotifier::connect_sequence_fault_consumer
     CORBA::SystemException
   ))
 {
+  ACE_UNUSED_ARG(push_consumer);
+  ACE_UNUSED_ARG(filter);
+
   ACE_THROW (CORBA::NO_IMPLEMENT());
 }
 
@@ -444,6 +452,8 @@ void StubFaultNotifier::disconnect_consumer (
     , CosEventComm::Disconnected
   ))
 {
+  ACE_UNUSED_ARG(connection);
+
   ACE_THROW (CORBA::NO_IMPLEMENT());
 }
 
@@ -459,7 +469,7 @@ int StubFaultNotifier::idle(int & result)
   int quit = 0;
   ACE_TRY_NEW_ENV
   {
-    if(this->factory_.ptr() != 0 && !CORBA::is_nil(this->factory_))
+    if(!CORBA::is_nil(this->factory_.in ()))
     {
       if (!this->factory_->is_alive( ACE_ENV_SINGLE_ARG_PARAMETER))
       {
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index 1f5be208924..340e6a971f6 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -3,6 +3,9 @@
 // $Id$
 #ifndef STUBFAULTNOTIFIER_H_
 #define STUBFAULTNOTIFIER_H_
+
+#include <ace/ACE.h>
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */