summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CIAO/ChangeLog6
-rw-r--r--CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp6
-rw-r--r--CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp4
-rw-r--r--TAO/performance-tests/Throughput/README2
4 files changed, 12 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 937d962c8e4..d882f26b756 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 15 19:30:43 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp:
+ * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp:
+ Fixed compile warnings
+
Fri Jun 15 18:58:24 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/install_ciao_headers.mpc:
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
index abeb3c6ff68..26351126be6 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
@@ -220,7 +220,7 @@ namespace CIAO_Shapes_Receiver_Impl
ACE_Time_Value time;
time <<= readinfo.source_timestamp;
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ")
- ACE_TEXT (" -> date = %#T\n"), time));
+ ACE_TEXT (" -> date = %#T\n"), &time));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ON shape info : ")
ACE_TEXT ("received shape_info for <%C> at X <%u> Y <%u> size <%u>\n"),
shape_info.color.in (),
@@ -256,7 +256,7 @@ namespace CIAO_Shapes_Receiver_Impl
ACE_Time_Value time;
time <<= readinfoseq[i].source_timestamp;
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
- ACE_TEXT ("-> UTC date = %#T\n"), time));
+ ACE_TEXT ("-> UTC date = %#T\n"), &time));
}
for(CORBA::ULong i = 0; i < shape_infos.length(); ++i)
{
@@ -293,7 +293,7 @@ namespace CIAO_Shapes_Receiver_Impl
ACE_Time_Value time;
time <<= readinfo->source_timestamp;
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ReadInfo -> ")
- ACE_TEXT ("date = %#T\n"), time));
+ ACE_TEXT ("date = %#T\n"), &time));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ShapeType : ")
ACE_TEXT ("received shape_info for <%C> at X <%u> Y <%u> size <%u>\n"),
shape_info->color.in (),
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp
index a3a531cfe25..72b38187f6b 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp
@@ -128,7 +128,7 @@ namespace CIAO_Shapes_Receiver_Impl
ACE_Time_Value time;
time <<= readinfo->source_timestamp;
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - SQUARE> ReadInfo -> ")
- ACE_TEXT ("date = %#T\n"), time));
+ ACE_TEXT ("date = %#T\n"), &time));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - SQUARE> : ")
ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"),
shape_info->color.in (),
@@ -157,7 +157,7 @@ namespace CIAO_Shapes_Receiver_Impl
ACE_Time_Value time;
time <<= readinfo->source_timestamp;
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - TRIANGLE> ReadInfo -> ")
- ACE_TEXT ("date = %#T\n"), time));
+ ACE_TEXT ("date = %#T\n"), &time));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<GET_ONE - TRIANGLE> : ")
ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"),
shape_info->color.in (),
diff --git a/TAO/performance-tests/Throughput/README b/TAO/performance-tests/Throughput/README
index b0407327ca5..b64bb8ae3d4 100644
--- a/TAO/performance-tests/Throughput/README
+++ b/TAO/performance-tests/Throughput/README
@@ -4,7 +4,7 @@ $Id$
@page Throughput Performance Test README File
- This test tries to estimate the maximum throughput (int bytes
+ This test tries to estimate the maximum throughput (in bytes
per second) that the ORB can achieve. The test sends octet sequences
of increasing sizes to a remote consumer, and measures both the time
it takes to receive the data as well as the time required to send it.