summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-22 19:04:58 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-22 19:04:58 +0000
commitcf71b1fb386913fb24d77160e9a0a9c622df8773 (patch)
tree69a8f8bdec6b68cbad2bb67c6e94ea8b39072e0c
parenteeee4ceb078bb94256c611a7acbc6dbd3f797db1 (diff)
downloadATCD-cf71b1fb386913fb24d77160e9a0a9c622df8773.tar.gz
ChangeLogTag: Thu Jul 22 14:03:26 1999 David L. Levine <levine@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c16
-rw-r--r--TAO/performance-tests/Pluggable/server.cpp9
2 files changed, 16 insertions, 9 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 6bb5b59e702..e08f6d835a6 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,9 +1,17 @@
+Thu Jul 22 14:03:26 1999 David L. Levine <levine@cs.wustl.edu>
+
+ * performance-tests/Pluggable/server.cpp (main): removed
+ ACE_NOTREACHED wrapper from final return 0 statement,
+ and removed the return 0 in the main try block. This
+ avoids a warning from Green Hills that the main ()
+ could return without a value. Not any more.
+
Thu Jul 22 11:06:44 1999 Nanbor Wang <nanbor@cs.wustl.edu>
- * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
- (visit_interface): I should use obj.in() to pass the object
- into _uncheck_narrow(). Thanks to David and Carlos for pointing
- this out.
+ * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+ (visit_interface): I should use obj.in() to pass the object
+ into _uncheck_narrow(). Thanks to David and Carlos for pointing
+ this out.
Thu Jul 22 07:21:03 1999 David L. Levine <levine@cs.wustl.edu>
diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp
index e9b86f8e4bd..657fce2b66d 100644
--- a/TAO/performance-tests/Pluggable/server.cpp
+++ b/TAO/performance-tests/Pluggable/server.cpp
@@ -19,8 +19,8 @@ main (int argc, char *argv[])
ACE_TRY
{
- int status = pp_test_server.init (argc,
- argv,
+ int status = pp_test_server.init (argc,
+ argv,
ACE_TRY_ENV);
ACE_TRY_CHECK;
@@ -35,8 +35,6 @@ main (int argc, char *argv[])
pp_test_server.run (ACE_TRY_ENV);
ACE_TRY_CHECK;
}
-
- return 0;
}
ACE_CATCH (CORBA::SystemException, sysex)
{
@@ -54,5 +52,6 @@ main (int argc, char *argv[])
}
ACE_ENDTRY;
ACE_TIMEPROBE_PRINT;
- ACE_NOTREACHED (return 0;)
+
+ return 0;
}