From 2f01dfe69490c832b0d07a8562d4aa69224c26cf Mon Sep 17 00:00:00 2001 From: Simon McQueen Date: Thu, 23 Nov 2006 14:27:33 +0000 Subject: ChangeLogTag: Thu Nov 23 14:20:33 UTC 2006 Simon McQueen --- TAO/ChangeLog | 6 ++++++ TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) 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 + + * orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp: + + (Hopefully) fix Borland warning. + Thu Nov 23 14:15:47 UTC 2006 J.T. Conklin * 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 (); -- cgit v1.2.1