diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-07-26 01:54:00 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-07-26 01:54:00 +0000 |
| commit | eecb73bdaec02cf6178c07609105d3b75091cd54 (patch) | |
| tree | b61c47bcf50814638d82904788837da807767332 | |
| parent | e8ae690be6e88626ec642858ed856829904165a5 (diff) | |
| download | ATCD-eecb73bdaec02cf6178c07609105d3b75091cd54.tar.gz | |
Mon Jul 26 01:53:38 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp:
* DAnCE/LocalityManager/Configuration/Process_Name.cpp:
Address exception warning on Windows.
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp | 6 | ||||
| -rw-r--r-- | CIAO/DAnCE/LocalityManager/Configuration/Process_Name.cpp | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 3afe16e1f29..298dc26f016 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Jul 26 01:53:38 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp: + * DAnCE/LocalityManager/Configuration/Process_Name.cpp: + + Address exception warning on Windows. + Mon Jul 26 01:51:16 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu> * DAnCE/tools/System_Health/Interceptors/SHS_CORBA_Transport.h: diff --git a/CIAO/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp b/CIAO/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp index d2175cbed80..dd53494447b 100644 --- a/CIAO/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp +++ b/CIAO/DAnCE/LocalityManager/Configuration/CPU_Affinity.cpp @@ -111,9 +111,9 @@ extern "C" { DAnCE::LocalityConfiguration_ptr retval (0); - ACE_NEW_THROW_EX (retval, - DAnCE::CPU_Affinity (), - CORBA::NO_MEMORY ()); + ACE_NEW_RETURN (retval, + DAnCE::CPU_Affinity (), + 0); return retval; } diff --git a/CIAO/DAnCE/LocalityManager/Configuration/Process_Name.cpp b/CIAO/DAnCE/LocalityManager/Configuration/Process_Name.cpp index d1d761595e4..c72fe3bba2a 100644 --- a/CIAO/DAnCE/LocalityManager/Configuration/Process_Name.cpp +++ b/CIAO/DAnCE/LocalityManager/Configuration/Process_Name.cpp @@ -97,9 +97,9 @@ extern "C" { DAnCE::LocalityConfiguration_ptr retval (0); - ACE_NEW_THROW_EX (retval, - DAnCE::Process_Name (), - CORBA::NO_MEMORY ()); + ACE_NEW_RETURN (retval, + DAnCE::Process_Name (), + 0); return retval; } |