diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-07-29 21:32:04 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-07-29 21:32:04 +0000 |
| commit | e17378e249b671429435488869f218d0e64cc906 (patch) | |
| tree | e94c6b4cf47517bbf177b854a0c4e667f8a4fe5a | |
| parent | 03dca0ae4a048b9995f42388e12a9a3204ab7a28 (diff) | |
| download | ATCD-e17378e249b671429435488869f218d0e64cc906.tar.gz | |
ChangeLogTag:Thu Jul 29 14:28:55 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp | 13 |
2 files changed, 14 insertions, 7 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index c974a19f3d5..fceb8b3bdb0 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Jul 29 14:28:55 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp + (createPackage, deletePackage, findPackageByName): + + Fixed emulated exception macro usage. Addresses compile-time + problems in MSVC++ 6 builds. + Tue Jul 27 14:48:10 2004 Tao Lu <lu@dre.vanderbilt.edu> * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp index a91a2329bf5..60055845cad 100644 --- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp +++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp @@ -57,7 +57,7 @@ installPackage (const char* installation_name, throw DOMException (); } - CIAO::Config_Handler::TPD_Handler top_pc_handler + CIAO::Config_Handler::TPD_Handler top_pc_handler (tpd_doc, DOMNodeFilter::SHOW_ELEMENT | DOMNodeFilter::SHOW_TEXT); @@ -121,13 +121,12 @@ createPackage (const char*, Deployment::NameExists, Deployment::PackageError)) { - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); + ACE_THROW (CORBA::NO_IMPLEMENT ()); } Deployment::PackageConfiguration* -CIAO::RepositoryManager_Impl:: -findPackageByName (const char* name - ACE_ENV_ARG_DECL) +CIAO::RepositoryManager_Impl::findPackageByName (const char* name + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Deployment::NoSuchName)) { @@ -139,7 +138,7 @@ findPackageByName (const char* name } else { - ACE_THROW (Deployment::NoSuchName ()); + ACE_THROW_RETURN (Deployment::NoSuchName (), 0); } } @@ -185,7 +184,7 @@ deletePackage (const char* ACE_THROW_SPEC ((CORBA::SystemException, Deployment::NoSuchName)) { - ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); + ACE_THROW (CORBA::NO_IMPLEMENT ()); } void |