summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-12-06 23:35:58 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-12-06 23:35:58 +0000
commit8e4df94c862d9375342eb55e60fba46f6432345d (patch)
tree4016baf2d561f7a1d518cc7cd7834429281c84c5
parent89de104be01c1f2d0e369ee8e45ab45d6cac75d6 (diff)
downloadATCD-8e4df94c862d9375342eb55e60fba46f6432345d.tar.gz
ChangeLogTag:Thu Dec 6 15:34:45 2001 Carlos O'Ryan <coryan@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a17
-rw-r--r--TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp3
2 files changed, 14 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 67fb65f10a2..389f7701644 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,7 +1,14 @@
+Thu Dec 6 15:34:45 2001 Carlos O'Ryan <coryan@uci.edu>
+
+ * orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp:
+ Fixed warnings about inconsistent formatting directives and the
+ actual argument type. Used ACE_UINT64_FORMAT_SPECIFIER to deal
+ with the variation across platforms.
+
Thu Dec 6 16:35:04 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de>
* tao/Strategies/DIOP_Transport.cpp:
-
+
Fixed a compiler warning. Thanks to Venkita for pointing this
out.
@@ -22,9 +29,9 @@ Thu Dec 6 14:56:14 2001 Justin Michel <michel_j@ociweb.com>
Updated the readme file and fixed a few typos in the
portspan test.
Tried to update the borland project to recurse into the
- portspan test directory.
+ portspan test directory.
Note : The portspan test is not set up to run nightly, but
- it will at least build.
+ it will at least build.
Thu Dec 6 11:05:14 2001 Justin Michel <michel_j@ociweb.com>
@@ -43,12 +50,12 @@ Thu Dec 6 11:05:14 2001 Justin Michel <michel_j@ociweb.com>
* TAO/tests/ior_corbaloc/IOR CorbaLoc Server.dsp
* TAO/tests/ior_corbaloc/IOR CorbaName Client.dsp
- Added the Portspan test that was originally added to 1.1a.
+ Added the Portspan test that was originally added to 1.1a.
Added Visual C++ project files for the tao ior_corbaloc test.
Thu Dec 6 10:30:17 2001 Balachandran Natarajan <bala@cs.wustl.edu>
- * tests/Smart_Proxies/On_Demand/Makefile: Updated dependencies.
+ * tests/Smart_Proxies/On_Demand/Makefile: Updated dependencies.
Thu Dec 6 07:25:14 2001 Chad Elliott <elliott_c@ociweb.com>
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp
index 61249c77222..41ac5aa08cf 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp
@@ -128,7 +128,8 @@ ECFS_Coordinator::join (Control::Peer_ptr peer,
for (CORBA::ULong k = 0; k != samples->length (); ++k)
{
history.sample (samples[k]);
- ACE_OS::fprintf (output_file, "HISTO: %d %lld\n",
+ ACE_OS::fprintf (output_file,
+ "HISTO: %d " ACE_UINT64_FORMAT_SPECIFIER "\n",
k, samples[k] / gsf);
}
ACE_OS::fclose (output_file);