summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>1999-06-23 01:17:50 +0000
committerbala <balanatarajan@users.noreply.github.com>1999-06-23 01:17:50 +0000
commit8f5918995e0a1bb49d6f07ffeaa12e8753554b3f (patch)
treef7cc52c28637886f26c0754eb7b53d17adc038d5
parent16022acbe9f1abeed0fca329169cfc26b5ace88b (diff)
downloadATCD-8f5918995e0a1bb49d6f07ffeaa12e8753554b3f.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog-99c6
-rw-r--r--TAO/examples/Simple/bank/server.cpp11
-rw-r--r--TAO/examples/Simple/echo/server.cpp11
-rw-r--r--TAO/examples/Simple/time/server.cpp11
4 files changed, 20 insertions, 19 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index b54ab2b127f..b7b48aff10f 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,9 @@
+Tue Jun 22 20:10:53 1999 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tao/Active_Object_Map.cpp: Removed some statements that were
+ giving compile errors. They were ACE_UNUSED_ARG () which were
+ not there.
+
Tue Jun 22 19:27:21 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
* orbsvcs/tests/Event/Performance/run_test.pl:
diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp
index b72ba205331..cc7cca34f15 100644
--- a/TAO/examples/Simple/bank/server.cpp
+++ b/TAO/examples/Simple/bank/server.cpp
@@ -25,18 +25,17 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
}
}
- ACE_CATCH (CORBA::SystemException, sysex)
+ ACE_CATCH (CORBA::UserException, userex)
{
- ACE_UNUSED_ARG (sysex);
- ACE_TRY_ENV.print_exception ("System Exception");
+ ACE_PRINT_EXCEPTION (userex,"User Exception");
return -1;
}
- ACE_CATCH (CORBA::UserException, userex)
+ ACE_CATCH (CORBA::SystemException, sysex)
{
- ACE_UNUSED_ARG (userex);
- ACE_TRY_ENV.print_exception ("User Exception");
+ ACE_PRINT_EXCEPTION (sysex,"System Exception");
return -1;
}
+
ACE_ENDTRY;
return 0;
diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp
index e8100524fae..e6a4b082018 100644
--- a/TAO/examples/Simple/echo/server.cpp
+++ b/TAO/examples/Simple/echo/server.cpp
@@ -27,18 +27,17 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
}
}
- ACE_CATCH (CORBA::SystemException, sysex)
+ ACE_CATCH (CORBA::UserException, userex)
{
- ACE_UNUSED_ARG (sysex);
- ACE_TRY_ENV.print_exception ("System Exception");
+ ACE_PRINT_EXCEPTION (userex,"User Exception");
return -1;
}
- ACE_CATCH (CORBA::UserException, userex)
+ ACE_CATCH (CORBA::SystemException, sysex)
{
- ACE_UNUSED_ARG (userex);
- ACE_TRY_ENV.print_exception ("User Exception");
+ ACE_PRINT_EXCEPTION (sysex, "System Exception");
return -1;
}
+
ACE_ENDTRY;
return 0;
diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp
index 6b710f67f48..d30839e572b 100644
--- a/TAO/examples/Simple/time/server.cpp
+++ b/TAO/examples/Simple/time/server.cpp
@@ -27,20 +27,17 @@ main (int argc, char *argv[])
ACE_TRY_CHECK;
}
}
- ACE_CATCH (CORBA::SystemException, sysex)
+ ACE_CATCH (CORBA::UserException, userex)
{
- ACE_UNUSED_ARG (sysex);
- ACE_TRY_ENV.print_exception ("System Exception");
+ ACE_PRINT_EXCEPTION (userex,"User Exception in main");
return -1;
}
- ACE_CATCH (CORBA::UserException, userex)
+ ACE_CATCH (CORBA::SystemException, sysex)
{
- ACE_UNUSED_ARG (userex);
- ACE_TRY_ENV.print_exception ("User Exception");
+ ACE_PRINT_EXCEPTION (sysex,"System Exception in main");
return -1;
}
ACE_ENDTRY;
-
return 0;
}