diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-11-29 04:31:52 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-11-29 04:31:52 +0000 |
| commit | 96da1231698ada078b9e6101bdc6d9da869951fa (patch) | |
| tree | 31ab2fd1c368f8170507a1f656754fbb875cd427 | |
| parent | cd38c9521d28d774a96fe671de1664be28b147a3 (diff) | |
| download | ATCD-96da1231698ada078b9e6101bdc6d9da869951fa.tar.gz | |
ChangeLogTag: Thu Nov 28 22:30:37 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tests/OBV/TC_Alignment/client.cpp | 8 | ||||
| -rw-r--r-- | TAO/tests/OBV/TC_Alignment/test_i.cpp | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d1058b08bce..f0938c280f2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 28 22:30:37 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * tests/OBV/TC_Alignment/client.cpp: Fixed errors and warnings in + builds where exceptions are turned off. + Thu Nov 28 14:45:43 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * tests/Bug_1361_Regression/Server_Thread_Pool.cpp (svc): diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp index d6b55530739..55845270e89 100644 --- a/TAO/tests/OBV/TC_Alignment/client.cpp +++ b/TAO/tests/OBV/TC_Alignment/client.cpp @@ -19,7 +19,7 @@ int do_shutdown = 0; int register_factories (CORBA::ORB_ptr orb - ACE_ENV_ARG_PARAMETER) + ACE_ENV_ARG_DECL) { // Create and register factories. @@ -76,7 +76,7 @@ register_factories (CORBA::ORB_ptr orb int run_test (test_ptr objref, CORBA::Long offset - TAO_ENV_ARG_PARAMETER) + ACE_ENV_ARG_DECL) { CORBA::Any_var result = objref->get_value (offset ACE_ENV_ARG_PARAMETER); @@ -157,8 +157,8 @@ parse_args (int argc, char *argv[]) int main (int argc, char* argv[]) { - ACE_TRY_NEW_ENV - { + ACE_TRY_NEW_ENV + { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp index 8b293402fbc..daa27007ebd 100644 --- a/TAO/tests/OBV/TC_Alignment/test_i.cpp +++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp @@ -17,9 +17,9 @@ test_i::get_value (CORBA::Long offset ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_var retval; - ACE_NEW_RETURN (retval, - CORBA::Any, - 0); + ACE_NEW_THROW_EX (retval, + CORBA::Any, + CORBA::NO_MEMORY ()); switch (offset) { |