diff options
| author | bala <balanatarajan@users.noreply.github.com> | 1999-04-06 21:35:55 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 1999-04-06 21:35:55 +0000 |
| commit | 715126b1050a5e77755a77b900c754c196f9c13a (patch) | |
| tree | be1bd2b32549bafe1d78c19085eafd4ba679a76b | |
| parent | 3ecc0bb880c701052d02f9aae19df4b483c6f7c6 (diff) | |
| download | ATCD-715126b1050a5e77755a77b900c754c196f9c13a.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-99c | 7 | ||||
| -rw-r--r-- | TAO/examples/Simple/Simple_util.cpp | 9 | ||||
| -rw-r--r-- | TAO/examples/Simple/grid/server.cpp | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 5878e649677..13dc473c308 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,10 @@ +Tue Apr 6 16:29:55 1999 Balachandran Natarajan <bala@cs.wustl.edu> + + * examples/Simple/echo/Echo_i.cpp (echo_string): + * examples/Simple/echo/Echo_Client_i.cpp + * examples/Simple/echo/server.cpp + Made some changes to the ACE_TRY macros + Tue Apr 6 15:44:52 1999 Vishal Kachroo <vishal@cs.wustl.edu> Changed the Names of the following files: diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp index 210ccfe202e..0f6747aacdd 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -205,8 +205,10 @@ Server<Servant>::register_name (void) bindName.length (1); bindName[0].id = CORBA::string_dup (name); + ACE_DECLARE_NEW_CORBA_ENV; + // (re)Bind the object. - ACE_TRY_NEW_ENV + ACE_TRY { CORBA::Object_var object = servant_._this (ACE_TRY_ENV); ACE_TRY_CHECK; @@ -329,8 +331,9 @@ Client<InterfaceObj, Var>::init (const char *name, this->argv_ = argv; - - ACE_TRY_NEW_ENV + ACE_DECLARE_NEW_CORBA_ENV; + + ACE_TRY { // Retrieve the ORB. this->orb_ = CORBA::ORB_init (this->argc_, diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp index 98aa3dd04ee..0d31fd11cef 100644 --- a/TAO/examples/Simple/grid/server.cpp +++ b/TAO/examples/Simple/grid/server.cpp @@ -12,7 +12,9 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tGrid server\n\n")); - ACE_TRY_NEW_ENV + ACE_DECLARE_NEW_CORBA_ENV; + + ACE_TRY { if (server.init ("Grid", argc, |