diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-11-17 14:20:15 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-11-17 14:20:15 +0000 |
| commit | c994310573d1dbfbd3456c729cd5a5cbe9f59c72 (patch) | |
| tree | d875fa7bbd1b0c4dc2e576a6921b699288b50d2b | |
| parent | 4de4b0abcbb192ce2a2db03439d17e3b34338e77 (diff) | |
| download | ATCD-c994310573d1dbfbd3456c729cd5a5cbe9f59c72.tar.gz | |
ChangeLogTag: Mon Nov 17 14:20:00 UTC 2008 Simon Massey <sma at prismtech dot com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index fb613fb2cba..27a5809752b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 17 14:20:00 UTC 2008 Simon Massey <sma at prismtech dot com> + + * tests/Bug_3499_Regression/DLL_Service_Host.cpp: + Use ACE_throw_bad_alloc instead of manually calling + ACE_bad_alloc () as MFC builds redefine the call appropriatly. + Mon Nov 17 13:46:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * testst/Bug_3299_Regression/run_test.pl: diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp index 211853e5f7a..73e7bac6503 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp +++ b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp @@ -18,7 +18,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv []) ACE_Service_Gestalt * gestalt = 0; ACE_NEW_THROW_EX (gestalt, ACE_Service_Gestalt (), - ACE_bad_alloc ()); + ACE_throw_bad_alloc); ACE_Intrusive_Auto_Ptr <ACE_Service_Gestalt> auto_clean (gestalt); |