diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-01-20 18:51:25 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-01-20 18:51:25 +0000 |
| commit | 66591af8b96837aaf51de9feafdef7f07dfc4350 (patch) | |
| tree | 16fc7e048f150a721368cc9807371c18a752e79a | |
| parent | e1b1c1072a749b0ca6454c907463662f4e5adb29 (diff) | |
| download | ATCD-66591af8b96837aaf51de9feafdef7f07dfc4350.tar.gz | |
Fri Jan 20 18:50:58 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Portable_Interceptors/Bug_2088/client.cpp:
Fixed gcc warning
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tests/Portable_Interceptors/Bug_2088/client.cpp | 46 |
2 files changed, 38 insertions, 13 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e0cbc16f681..271c5bac481 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 20 18:50:58 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Portable_Interceptors/Bug_2088/client.cpp: + Fixed gcc warning + Fri Jan 20 18:46:22 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * tests/UNKNOWN_Exception/client.cpp: diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp index 1eab0d806a8..c908fa6d094 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp @@ -19,11 +19,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) Client_ORBInitializer, -1); // No exceptions yet! - PortableInterceptor::ORBInitializer_var initializer_var1 = - initializer1; - - PortableInterceptor::ORBInitializer_var initializer_var2 = - initializer2; + PortableInterceptor::ORBInitializer_var initializer_var1 = initializer1; + PortableInterceptor::ORBInitializer_var initializer_var2 = initializer2; try { @@ -31,9 +28,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableInterceptor::register_orb_initializer (initializer_var2.in ()); - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv); - + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); } catch (const CORBA::NO_MEMORY&) { @@ -48,11 +43,36 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Only the pre init for initalizer 1 must be called, other initializers // shouldn't be caught - ACE_ASSERT (initializer1->pre_init_called == true); - ACE_ASSERT (initializer2->pre_init_called == false); - ACE_ASSERT (initializer1->post_init_called == false); - ACE_ASSERT (initializer2->post_init_called == false); - ACE_ASSERT (caught_exception == true); + if (initializer1->pre_init_called != true) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Pre init not called for 1\n"), + -1); + } + if (initializer2->pre_init_called != false) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Pre init called for 2\n"), + -1); + } + if (initializer1->post_init_called != false) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Post init not called for 1\n"), + -1); + } + if (initializer2->post_init_called != false) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Post init not called for 1\n"), + -1); + } + if (caught_exception != true) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Excep not caught\n"), + -1); + } return 0; } |