summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2009-12-08 15:16:01 +0000
committermsmit <msmit@remedy.nl>2009-12-08 15:16:01 +0000
commit00e644a2621850a8a38f3ae14b375ecc9c8fee77 (patch)
treeffcc2122540d8f2fe2a4de209101a83b0681da4e
parent04785f4bae71c2c2665f24076b004e574e8b3fc8 (diff)
downloadATCD-00e644a2621850a8a38f3ae14b375ecc9c8fee77.tar.gz
Tue Dec 8 15:17:44 UTC 2009 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp: Resolved compiler warnings.
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp10
2 files changed, 8 insertions, 7 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index ade1c62060c..d5f4fef4ab7 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 8 15:17:44 UTC 2009 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
+ Resolved compiler warnings.
+
Tue Dec 8 15:11:22 UTC 2009 Marcel Smit <msmit@remedy.nl>
* DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl:
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
index cc695410a01..efabc6ea49c 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
@@ -117,14 +117,10 @@ namespace CIAO_Reader_Test_Receiver_Impl
::DDS::HANDLE_NIL);
return readertest_info.iteration == this->iterations_;
}
- catch(CCM_DDS::NonExistent& ex)
- {
- }
- catch(CCM_DDS::InternalError& ex)
- {
- }
- catch (const CORBA::Exception& ex)
+ catch(...)
{
+ // no need to catch. An error is given
+ // when this example didn't run at all.
}
return false;
}