summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-05-28 14:01:33 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-05-28 14:01:33 +0000
commit74b3143d4c832839f22cb9bae808e96c80789ac6 (patch)
tree79f8007e7db8348d7a980d3b2a5be655de82fa72
parent855bf575a69f50550652a233381c0a4cd577b98a (diff)
downloadATCD-74b3143d4c832839f22cb9bae808e96c80789ac6.tar.gz
ChangeLogTag: Wed May 28 14:00:00 UTC 2008 Simon Massey <sma@prismtech.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp2
-rw-r--r--TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp6
3 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 466223ea649..9175dbda7fa 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Wed May 28 14:00:00 UTC 2008 Simon Massey <sma@prismtech.com>
+
+ * orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp:
+ * orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp:
+
+ Corrected for unsigned integer (size_t) ambiguity errors.
+
Tue May 27 13:34:12 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>
* orbsvcs/orbsvcs/Notify/MonitorControl/Statistic.h:
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
index d52dca818a0..74eb450a5e4 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
@@ -58,7 +58,7 @@ ACE_TMAIN (int, ACE_TCHAR*[])
error ("second Monitor_Point_Registry::add() failed");
}
- for (int i = 0; i < 10; ++i)
+ for (size_t i = 0; i < 10; ++i)
{
s->receive (i);
}
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
index 65c90635bed..0e5c7a7cdcb 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
@@ -27,9 +27,9 @@ ACE_TMAIN (int, ACE_TCHAR*[])
}
TAO_Statistic number ("number", TAO_Statistic::TS_NUMBER);
- number.receive (8);
- number.receive (10);
- number.receive (42);
+ number.receive (8u);
+ number.receive (10u);
+ number.receive (42u);
if (number.average() != 20)
{