diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2011-11-15 15:44:51 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2011-11-15 15:44:51 +0000 |
| commit | 8ce3604ae72e1bddbee91acd57bd2ff522b9dba0 (patch) | |
| tree | bd3feeee2edd84ebf332a389f90c1091d0434f72 | |
| parent | b55bf53a5685bd1b9b70929c8813b8f45749769c (diff) | |
| download | ATCD-8ce3604ae72e1bddbee91acd57bd2ff522b9dba0.tar.gz | |
Tue Nov 15 15:43:31 UTC 2011 Martin Corino <mcorino@remedy.nl>
* tests/Bug_3531b_Regression/server.cpp:
Fixed ST build compile error.
* tests/Mixed_Sync_ASync_Events/test_i.cpp:
Trying to silence strict aliasing warnings.
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tests/Bug_3531b_Regression/server.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp | 9 |
3 files changed, 15 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d6797e50e8c..ce53a91e597 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 15 15:43:31 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * tests/Bug_3531b_Regression/server.cpp: + Fixed ST build compile error. + + * tests/Mixed_Sync_ASync_Events/test_i.cpp: + Trying to silence strict aliasing warnings. + Tue Nov 15 08:23:08 UTC 2011 Martin Corino <mcorino@remedy.nl> * NEWS: diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp index a1bc0eaff77..6c0b5cd7598 100644 --- a/TAO/tests/Bug_3531b_Regression/server.cpp +++ b/TAO/tests/Bug_3531b_Regression/server.cpp @@ -68,7 +68,7 @@ public: // NOTE: Do *NOT* put the same msg into the msg queue more than once. // This will confuse the msg queue and result it in dropping messages ////////////////////////////////////////////////////////////////////// -class Worker: public ACE_Task<ACE_MT_SYNCH> +class Worker: public ACE_Task<ACE_SYNCH> { public: Worker (void) diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp index c5ae05c7e16..9e58786811e 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp +++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp @@ -48,7 +48,8 @@ Test_i::request ( counter)); const char* follow_up_str; - switch (ACE_OS::rand_r (reinterpret_cast<unsigned int*> (&this->seed_)) % 2) + unsigned int* p_seed = reinterpret_cast<unsigned int*> (&this->seed_); + switch (ACE_OS::rand_r (p_seed) % 2) { case 0: follow_up = (reqmode == A::RQM_SYNCH ? A::FU_TIMER : A::FU_NOTIFICATION); @@ -185,7 +186,8 @@ TestHandler::handle_timeout (const ACE_Time_Value &, const void *) { this->orb_->orb_core ()->reactor ()->cancel_timer (this); - if ((ACE_OS::rand_r (reinterpret_cast<unsigned int*> (&this->seed_)) % 2) == 0) + unsigned int* p_seed = reinterpret_cast<unsigned int*> (&this->seed_); + if ((ACE_OS::rand_r (p_seed) % 2) == 0) { A::FollowUp followup; if (!CORBA::is_nil (this->opponent_)) @@ -207,7 +209,8 @@ TestHandler::handle_timeout (const ACE_Time_Value &, int TestHandler::handle_exception (ACE_HANDLE) { - if ((ACE_OS::rand_r (reinterpret_cast<unsigned int*> (&this->seed_)) % 2) == 0) + unsigned int* p_seed = reinterpret_cast<unsigned int*> (&this->seed_); + if ((ACE_OS::rand_r (p_seed) % 2) == 0) { A::FollowUp followup; if (!CORBA::is_nil (this->opponent_)) |