summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2005-04-27 23:17:08 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2005-04-27 23:17:08 +0000
commit5c848a07530f8fc51fb4736e20f20ba9c67ad635 (patch)
treed01f39dbc81f843de13cafe6a5cd2f5e6c2f0f35
parentb2ae774c1bdc8935ec57ba45f4267f625cbcc00f (diff)
downloadATCD-5c848a07530f8fc51fb4736e20f20ba9c67ad635.tar.gz
ChangeLogTag:Wed Apr 27 16:10:11 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp10
2 files changed, 14 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2d70660a632..4ba57042d56 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Apr 27 16:10:11 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
+
+ * orbsvcs/orbsvcs/Scheduler_Factory.cpp (log_scheduling_tuples):
+
+ Corrected format specifier for an enumeration. An enumeration
+ is implicitly converted to an "int", not "unsigned int".
+ Addresses compile-time warnings from g++ builds with format
+ specifier warnings enabled.
+
Wed Apr 27 18:51:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 0a7981ae50d..c915b6cd15f 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -716,12 +716,12 @@ ACE_Scheduler_Factory::log_scheduling_tuples(
"%13d, /* priority */\n"
"%13d, /* preemption_subpriority */\n"
"%13d, /* preemption_priority */\n"
- "%13u } /* enabled */\n";
+ "%13d } /* enabled */\n";
for (int ndx = 0; ndx < tuple_ptr_array_size; ndx++)
- {
- fprintf(file,
- subset_tuple_format,
+ {
+ fprintf(file,
+ subset_tuple_format,
tuple_ptr_array[ndx]->handle,
tuple_ptr_array[ndx]->rate_index,
tuple_ptr_array[ndx]->period,
@@ -730,7 +730,7 @@ ACE_Scheduler_Factory::log_scheduling_tuples(
tuple_ptr_array[ndx]->preemption_subpriority,
tuple_ptr_array[ndx]->preemption_priority,
tuple_ptr_array[ndx]->enabled);
- }
+ }
ACE_OS::fclose (file);
}