diff options
| author | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-02 09:06:47 +0000 |
|---|---|---|
| committer | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-02 09:06:47 +0000 |
| commit | e6889e86b714b1b229317bd6b752ebd2604e8f1a (patch) | |
| tree | 75a2de96b40708a16b953104c481c5b113e13f34 | |
| parent | 2fb812abb77a721e802a683ef4ee9291344af9c2 (diff) | |
| download | ATCD-e6889e86b714b1b229317bd6b752ebd2604e8f1a.tar.gz | |
Wed Nov 02 08:04:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* tests/Collocation/Receiver/Receiver_exec.cpp:
* tests/Collocation/Sender/Sender_exec.cpp:
Removed unreferenced local variables
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/tests/Collocation/Receiver/Receiver_exec.cpp | 2 | ||||
| -rw-r--r-- | CIAO/tests/Collocation/Sender/Sender_exec.cpp | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 25b74fad4db..9df2344c300 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Nov 02 08:04:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + * tests/Collocation/Receiver/Receiver_exec.cpp: + * tests/Collocation/Sender/Sender_exec.cpp: + Removed unreferenced local variables + + Wed Nov 02 08:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl> Merged changes from Remedy work branch. diff --git a/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp b/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp index 4f67f5e937c..362b2f50184 100644 --- a/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp +++ b/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp @@ -114,7 +114,7 @@ namespace CIAO_Receiver_Impl "no connection hello_to_rec with sender.\n")); } } - catch (const CORBA::INTERNAL& ex) + catch (const CORBA::INTERNAL& /*ex*/) { if (ACE_OS::strcmp ("no_thru_poa", this->strategy_.in())== 0) { diff --git a/CIAO/tests/Collocation/Sender/Sender_exec.cpp b/CIAO/tests/Collocation/Sender/Sender_exec.cpp index c5bb949dc81..168358136f5 100644 --- a/CIAO/tests/Collocation/Sender/Sender_exec.cpp +++ b/CIAO/tests/Collocation/Sender/Sender_exec.cpp @@ -26,9 +26,10 @@ namespace CIAO_Sender_Impl #if !defined (CCM_DIRECTCOLL) ACE_DEBUG ((LM_DEBUG, "SENDER: hello_exec_i::set_point pointer" - "No collocation because CIAO not build with " + "Strategy desired <%C>, but no collocation " + "because CIAO not build with " "ccm_diect_collocation = 1.\n", - (void *)&p)); + start, (void *)&p)); #else if ((ACE_OS::strcmp("direct", strat) == 0) || (ACE_OS::strcmp("best", strat) == 0)) |