diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-12 16:38:12 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-12 16:38:12 +0000 |
| commit | dcbf766e0ed3b9df21b1ab02516b15b1bd6cb651 (patch) | |
| tree | 8ebc28ad62ea7d63d2ae11eb4d083df3bc7949b1 | |
| parent | 3b74afd1ee82c848b01e74405cd12942d06034be (diff) | |
| download | ATCD-dcbf766e0ed3b9df21b1ab02516b15b1bd6cb651.tar.gz | |
ChangeLogTag:Wed Nov 12 16:44:24 UTC 2003 Don Hinton <dhinton@dresystems.com>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5f3a2d946bb..42612239794 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 12 16:44:24 UTC 2003 Don Hinton <dhinton@dresystems.com>" + + * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp (init): + Changed ACE_THROW to ACE_THROW_RETURN to fix compile error. + Wed Nov 12 14:51:14 UTC 2003 Don Hinton <dhinton@dresystems.com> * orbsvcs/orbsvcs/Makefile: diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 0a231e9134f..997c7200e81 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -317,7 +317,7 @@ ImR_Locator_i::register_activator (const char* activator, // object_ref is set to the removed activator. void ImR_Locator_i::unregister_activator (const char * activator, - CORBA::Long /* token */ + CORBA::Long token ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { |