summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2009-11-26 12:11:43 +0000
committermsmit <msmit@remedy.nl>2009-11-26 12:11:43 +0000
commitc19a7cd3d2cf301335e5423a50dbe3080b67d83e (patch)
tree2d03e3701aabccf3a76836a87472fdacebb257d5
parent01adc70c5bf7d88a89f5cc73e6a9a82d64dc4863 (diff)
downloadATCD-c19a7cd3d2cf301335e5423a50dbe3080b67d83e.tar.gz
Thu Nov 26 12:12:36 UTC 2009 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp: Resolved compiler warnings on linux.
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp4
2 files changed, 7 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 36791283e11..5bee5d80fdf 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 26 12:12:36 UTC 2009 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
+ Resolved compiler warnings on linux.
+
Thu Nov 26 11:43:12 UTC 2009 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
index 93b49979b50..c2cdac3685b 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
@@ -411,12 +411,12 @@ namespace CIAO_Keyed_Test_Receiver_Impl
Receiver_exec_i::ccm_remove (void)
{
CIAO_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u> - expected <%d>\n",
- this->received_,
+ this->received_.value (),
this->expected_));
if (this->received_ < this->expected_)
{
CIAO_ERROR ((LM_ERROR, "ERROR : Expected to receive %u samples, actually got %u\n",
- this->expected_, this->received_));
+ this->expected_, this->received_.value ()));
}
}