diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-01 16:22:40 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-01 16:22:40 +0000 |
| commit | 050cad2da78783e3895a1242b3ed28ace8f36a1a (patch) | |
| tree | cfbda33aafeb240cc8c76a8636be236a083d7926 | |
| parent | 17370907494306186659e2e6996eae6e8a792351 (diff) | |
| download | ATCD-050cad2da78783e3895a1242b3ed28ace8f36a1a.tar.gz | |
ChangeLogTag: Wed Nov 01 09:58:29 2000 Irfan Pyarali <irfan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Object_Adapter.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 391cb2b6326..f67f00e5e4d 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Wed Nov 01 09:58:29 2000 Irfan Pyarali <irfan@cs.wustl.edu> + + * tao/PortableServer/Object_Adapter.h (prepare_for_upcall): Added + back the default value for ACE_TRY_ENV. I thought that this was + library code and should not have a default. Actually, this code + is also called from the Through POA stubs and therefore requires + the default so that it can be called from code that uses native + exceptions and not the simulated exceptions. Thanks to Carlos + for pointing this out. + Wed Nov 1 08:14:14 2000 Jeff Parsons <parsons@cs.wustl.edu> * tao/DynamicInterface/Context.cpp: diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index b9143ceb14b..ab8f4ea16c3 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -614,7 +614,7 @@ public: int prepare_for_upcall (const TAO_ObjectKey &key, const char *operation, CORBA::Object_out forward_to, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); // Locate POA and servant. TAO_POA &poa (void) const; |