summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2010-07-01 10:53:49 +0000
committermsmit <msmit@remedy.nl>2010-07-01 10:53:49 +0000
commit2d251a2b6708f1c9c3f513b6688958c78ea45a6b (patch)
tree9b63e8b4098205938f7d8bba73c3d34b8da36df7
parentb9c2d07d2c3dc9b1f7a49707bdf6c56dcf468b37 (diff)
downloadATCD-2d251a2b6708f1c9c3f513b6688958c78ea45a6b.tar.gz
Thu Jul 1 10:50:47 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: Warnings.
-rw-r--r--CIAO/ChangeLog6
-rw-r--r--CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp4
-rw-r--r--CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp4
3 files changed, 10 insertions, 4 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 2b75283d67f..72cbacec647 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 1 10:50:47 UTC 2010 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp:
+ * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp:
+ Warnings.
+
Thu Jul 1 10:44:58 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
index cff54919da4..15a03ce9a1e 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
@@ -423,7 +423,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
ACE_TEXT ("expected <%d> - received <%C>\n"),
port,
this->current_iter_value1_,
- filter->parameters[0]));
+ filter->parameters[0].in ()));
error = true;
}
}
@@ -435,7 +435,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
ACE_TEXT ("Unexpected param value: ")
ACE_TEXT ("expected <%d> - received <%C>\n"),
port, this->current_iter_value2_,
- filter->parameters[1]));
+ filter->parameters[1].in ()));
error = true;
}
}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
index 66c1d22114e..965d9e7bc80 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp
@@ -322,7 +322,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
"Unexpected param value: "
"expected <%d> - received <%C>\n",
this->current_min_iteration_,
- filter->parameters[0]));
+ filter->parameters[0].in ()));
error = true;
}
}
@@ -334,7 +334,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl
"Unexpected param value: "
"expected <%d> - received <%C>\n",
this->current_max_iteration_,
- filter->parameters[1]));
+ filter->parameters[1].in ()));
error = true;
}
}