diff options
| author | Simon McQueen <simon.mcqueen@gmail.com> | 2006-11-23 14:27:33 +0000 |
|---|---|---|
| committer | Simon McQueen <simon.mcqueen@gmail.com> | 2006-11-23 14:27:33 +0000 |
| commit | 2f01dfe69490c832b0d07a8562d4aa69224c26cf (patch) | |
| tree | e5808acb7ca4169de7783200817d43dbe14efabe | |
| parent | 8407219f4dc8f4ad396fc1807bb7f9c809e6a915 (diff) | |
| download | ATCD-2f01dfe69490c832b0d07a8562d4aa69224c26cf.tar.gz | |
ChangeLogTag: Thu Nov 23 14:20:33 UTC 2006 Simon McQueen <sm@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index dc58c001e4b..cd578d76814 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 23 14:20:33 UTC 2006 Simon McQueen <sm@prismtech.com> + + * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp: + + (Hopefully) fix Borland warning. + Thu Nov 23 14:15:47 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Makefile.am: diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp index 8e2454e62b6..d9c87c1d884 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp @@ -89,7 +89,9 @@ TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb, orb); if (result != 0) { - throw new CORBA::BAD_PARAM; + ACE_THROW_RETURN (CORBA::BAD_PARAM (0, + CORBA::COMPLETED_NO), + CORBA::Object::_nil ()); } return CORBA::Object::_nil (); |