ChangeLogTag: Wed Dec 1 07:18:37 2004 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 34 insertions, 25 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b0d712a9226..a1377790c39 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,24 +1,31 @@
+Wed Dec  1 07:18:37 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/tests/FT_App/FT_Client.cpp:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp:
+
+          Fixed build warnings about mismatch parameter types with fprintf.
+
 Tue Nov 30 16:33:08 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* orbsvcs/orbsvcs/Makefile.am:
+        * orbsvcs/orbsvcs/Makefile.am:
 
-	  Add replace_key.cpp to FTRT_EventChannel sources.
+          Add replace_key.cpp to FTRT_EventChannel sources.
 
 Tue Nov 30 11:42:50 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Any_Arg_Traits.h:
-        
+
           New file, containing template specializations of the
           stub and skeleton arg traits classes for CORBA::Any.
           These specializations were formerly in generated code.
-          
+
         * TAO_IDL/be/be_codegen.cpp:
         * TAO_IDL/be/be_decl.cpp:
         * TAO_IDL/be/be_visitor_arg_traits.cpp:
         * TAO_IDL/be_include/be_visitor_arg_traits.h:
         * TAO_IDL/include/idl_global.h:
         * TAO_IDL/util/utl_global.cpp:
-        
+
           Added check for an Any used as an operation parameter, and
           code to include the new file above if one is seen. This
           was the only predefined type for which arg traits class
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index 7a82ccf18ad..61fe1a0e3ac 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -273,7 +273,7 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            ACE_OS::fprintf (stdout, "FT Client: ->set(%d);\n", operand);
+            ACE_OS::fprintf (stdout, "FT Client: ->set(%ld);\n", operand);
           }
           this->replica_->set(operand ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
@@ -290,12 +290,12 @@ int FTClientMain::pass (
           ACE_CHECK_RETURN (-1);
           if (value == operand)
           {
-            ACE_OS::fprintf (stdout, "FT Client: Good: Read %d expecting %d\n", value, operand);
+            ACE_OS::fprintf (stdout, "FT Client: Good: Read %ld expecting %ld\n", value, operand);
             counter = operand;
           }
           else
           {
-            ACE_OS::fprintf (stdout, "FT Client: Error: Read %d expecting %d\n", value, operand);
+            ACE_OS::fprintf (stdout, "FT Client: Error: Read %ld expecting %ld\n", value, operand);
           }
           echo = 0;
           break;
@@ -305,7 +305,7 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            ACE_OS::fprintf (stdout, "FT Client: ->counter(%d);\n", operand);
+            ACE_OS::fprintf (stdout, "FT Client: ->counter(%ld);\n", operand);
           }
           this->replica_->counter(operand ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
@@ -316,7 +316,7 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            ACE_OS::fprintf (stdout, "FT Client: ->increment(%d);\n", operand);
+            ACE_OS::fprintf (stdout, "FT Client: ->increment(%ld);\n", operand);
           }
           this->replica_->increment(operand ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
@@ -327,7 +327,7 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            ACE_OS::fprintf (stdout, "FT Client: ->increment(%d);\n", -operand);
+            ACE_OS::fprintf (stdout, "FT Client: ->increment(%ld);\n", -operand);
           }
           this->replica_->increment(-operand ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
@@ -342,7 +342,7 @@ int FTClientMain::pass (
           }
           long attribute = this->replica_->counter(ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
-          ACE_OS::fprintf (stdout, "FT Client: Attribute: %d\n", attribute);
+          ACE_OS::fprintf (stdout, "FT Client: Attribute: %ld\n", attribute);
           echo = 0;
           break;
         }
@@ -361,7 +361,7 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= LOUD)
           {
-            ACE_OS::fprintf (stdout, "FT Client: ->die(%d);\n", operand);
+            ACE_OS::fprintf (stdout, "FT Client: ->die(%ld);\n", operand);
           }
           this->replica_->die(ACE_static_cast (FT_TEST::TestReplica::Bane, operand) ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
@@ -494,12 +494,12 @@ int FTClientMain::pass (
         {
           if (this->verbose_ >= NORMAL)
           {
-            ACE_OS::fprintf (stdout, "FT Client: %d\n", counter);
+            ACE_OS::fprintf (stdout, "FT Client: %ld\n", counter);
           }
         }
         else
         {
-          ACE_OS::fprintf (stdout, "FT Client: Error: read %d expecting %d\n", value, counter);
+          ACE_OS::fprintf (stdout, "FT Client: Error: read %ld expecting %ld\n", value, counter);
           result = -1;
         }
       }
@@ -529,7 +529,9 @@ int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL)
   }
   else
   {
-    ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** %s\n", this->replica_pos_);
+    ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** "
+                             ACE_SIZE_T_FORMAT_SPECIFIER
+                             "\n", this->replica_pos_);
   }
   return result;
 }
@@ -553,7 +555,7 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
 
     if (this->verbose_ >= NORMAL)
     {
-      ACE_OS::fprintf (stdout, "FT Client: Initial counter %d\n", counter);
+      ACE_OS::fprintf (stdout, "FT Client: Initial counter %ld\n", counter);
     }
     if (ACE_OS::isatty(fileno(stdin)))
     {
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index 82bd56cf829..eee00c18600 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -140,8 +140,8 @@ FT_TestReplica_i::~FT_TestReplica_i ()
 
 void FT_TestReplica_i::suicide(const char * note)
 {
-  ACE_OS::fprintf (stdout, "%s@%s#%u Simulate FAULT_CODE fault: %s\n",
-  						   name_.c_str(), this->factory_->location(), this->factory_id_, note);
+  ACE_OS::fprintf (stdout, "%s@%s#%lu Simulate FAULT_CODE fault: %s\n",
+                   name_.c_str(), this->factory_->location(), this->factory_id_, note);
 
   // Tell the poa we aren't accepting future calls
   this->poa_->deactivate_object (this->object_id_.in ());
@@ -395,8 +395,8 @@ void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when
       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_OS::fprintf (stdout, "%s@%s#%u Received death threat: %d\n",
-  						   name_.c_str(), this->factory_->location(), this->factory_id_, when);
+  ACE_OS::fprintf (stdout, "%s@%s#%lu Received death threat: %d\n",
+                   name_.c_str(), this->factory_->location(), this->factory_id_, when);
 
   this->death_pending_ = when;
   KEVORKIAN(RIGHT_NOW, die)
@@ -405,8 +405,8 @@ void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane  when
 void FT_TestReplica_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_OS::fprintf (stdout, "%s@%s#%u Shut down requested\n",
-  						   name_.c_str(), this->factory_->location(), this->factory_id_);
+  ACE_OS::fprintf (stdout, "%s@%s#%lu Shut down requested\n",
+                   name_.c_str(), this->factory_->location(), this->factory_id_);
   this->death_pending_ = FT_TEST::TestReplica::CLEAN_EXIT;
 }
 
@@ -456,8 +456,8 @@ void FT_TestReplica_i::store(long counter)
     ACE_OS::fclose(f);
     if (this->verbose_)
     {
-      ACE_OS::fprintf (stdout, "%s@%s#%u :%d\n",
-  							   name_.c_str(), this->factory_->location(), this->factory_id_, counter);
+      ACE_OS::fprintf (stdout, "%s@%s#%lu :%ld\n",
+                       name_.c_str(), this->factory_->location(), this->factory_id_, counter);
     }
     delete[] buffer;
     buffer = 0;