diff options
| author | jeliazkov_i <jeliazkov_i@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-07 15:45:15 +0000 |
|---|---|---|
| committer | jeliazkov_i <jeliazkov_i@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-07 15:45:15 +0000 |
| commit | 4477de980b6a1d6243931124f1e650f95ea1e790 (patch) | |
| tree | b5beffd3c6f12767edbce202ef3f217225608563 | |
| parent | 41346cae2054b7ab50d4387cbf5aa557fa9ffc06 (diff) | |
| download | ATCD-4477de980b6a1d6243931124f1e650f95ea1e790.tar.gz | |
ChangeLogTag: Sun May 7 14:56:20 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/ORB_Local_Config/Bunch/Test.cpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index fdf71f7a0ff..5642f711c2a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Sun May 7 14:56:20 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * tests/ORB_Local_Config/Bunch/Test.cpp: + + Removed semicolons after if() - cleaning the residue from + replacing the ACE_ASSERTs. + Sun May 7 06:59:54 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> * tao/ORB_Core.cpp: diff --git a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp index 788124f34fc..fad76bd876c 100644 --- a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp +++ b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp @@ -129,7 +129,7 @@ testTSSGestalt (int , ACE_TCHAR *[]) ACE_Service_Gestalt *global_instance = ACE_Service_Config::instance (); // Sanity check - if (global_instance == &one); + if (global_instance == &one) ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT("Invalid global gestalt\n")), -1); { @@ -147,7 +147,7 @@ testTSSGestalt (int , ACE_TCHAR *[]) // The guard is dead! Long live the global gestalt that was previously global! } - if (global_instance != ACE_Service_Config::instance ()); + if (global_instance != ACE_Service_Config::instance ()) ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT("Expected the original global gestalt\n")), -1); if (global_instance == &one); |