diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-11-13 11:32:19 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-11-13 11:32:19 +0000 |
| commit | c0acbcc025a51ff6b5e21b42441632849090d828 (patch) | |
| tree | 0528e141f3fed5af1cfdb171c7a3d070530203e7 /TAO/tests/Mixed_Sync_ASync_Events | |
| parent | f81f3cf5c06ef000a9e635f8da517b396543602b (diff) | |
| download | ATCD-c0acbcc025a51ff6b5e21b42441632849090d828.tar.gz | |
Sun Nov 13 11:31:21 UTC 2011 Martin Corino <mcorino@remedy.nl>
* tests/Mixed_Sync_ASync_Events/main.cpp:
* tests/Mixed_Sync_ASync_Events/test_i.h:
* tests/Mixed_Sync_ASync_Events/test_i.cpp:
Fixed more Win32 warnings and compile errors :-(
Diffstat (limited to 'TAO/tests/Mixed_Sync_ASync_Events')
| -rw-r--r-- | TAO/tests/Mixed_Sync_ASync_Events/main.cpp | 1 | ||||
| -rw-r--r-- | TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp | 6 | ||||
| -rw-r--r-- | TAO/tests/Mixed_Sync_ASync_Events/test_i.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp index 2c91f458987..5fab2ac1754 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp +++ b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp @@ -18,6 +18,7 @@ #include "tao/debug.h" #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" const ACE_TCHAR *ior_output_file = 0; const ACE_TCHAR *input_ior = 0; diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp index d89d0ab3e68..9dbeb419a32 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp +++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp @@ -49,7 +49,7 @@ Test_i::request ( counter)); const char* follow_up_str; - switch (ACE_OS::rand_r (static_cast<unsigned int*> (&this->seed_)) % 2) + switch (ACE_OS::rand_r (reinterpret_cast<unsigned int*> (&this->seed_)) % 2) { case 0: follow_up = (reqmode == A::RQM_SYNCH ? A::FU_TIMER : A::FU_NOTIFICATION); @@ -186,7 +186,7 @@ TestHandler::handle_timeout (const ACE_Time_Value &, const void *) { this->orb_->orb_core ()->reactor ()->cancel_timer (this); - if ((ACE_OS::rand_r (static_cast<unsigned int*> (&this->seed_)) % 2) == 0) + if ((ACE_OS::rand_r (reinterpret_cast<unsigned int*> (&this->seed_)) % 2) == 0) { A::FollowUp followup; if (!CORBA::is_nil (this->opponent_)) @@ -208,7 +208,7 @@ TestHandler::handle_timeout (const ACE_Time_Value &, int TestHandler::handle_exception (ACE_HANDLE) { - if ((ACE_OS::rand_r (static_cast<unsigned int*> (&this->seed_)) % 2) == 0) + if ((ACE_OS::rand_r (reinterpret_cast<unsigned int*> (&this->seed_)) % 2) == 0) { A::FollowUp followup; if (!CORBA::is_nil (this->opponent_)) diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h index 1110efb4ead..7ac5a36f1e9 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h +++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h @@ -52,7 +52,7 @@ private: A::RunMode mode_; - unsigned int seed_; + time_t seed_; }; class TestHandler @@ -90,7 +90,7 @@ private: CORBA::ULong max_count_; A::RunMode mode_; CORBA::ULong counter_; - unsigned int seed_; + time_t seed_; }; class Test_Reply_i : public POA_A::AMI_TestHandler |