summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-07-20 14:21:40 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-07-20 14:21:40 +0000
commit4c288d4da9937d7cb3d43f0f1127c4c21c6d3cdd (patch)
treeb652f64e78af412bd574eac9ce3c0e0ffa3c6173
parentc1d49d9c07e8bd0998a742651f238e4c3b0f748f (diff)
downloadATCD-4c288d4da9937d7cb3d43f0f1127c4c21c6d3cdd.tar.gz
ChangeLogTag: Sat Jul 20 09:19:15 2002 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/TAO_IDL/ast/ast_constant.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h2
-rw-r--r--TAO/tests/AMH_Exceptions/server.cpp4
4 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 81d5057ac50..a2a414506b4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jul 20 09:19:15 2002 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * TAO_IDL/ast/ast_constant.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h:
+ * tests/AMH_Exceptions/server.cpp (main): Fixed warnings in TRU 64
+ builds.
+
Sat Jul 20 09:08:17 2002 Balachandran Natarajan <bala@cs.wustl.edu>
* tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp: Fixed a
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
index 85252705bc4..10bbdc580bb 100644
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO/TAO_IDL/ast/ast_constant.cpp
@@ -120,7 +120,7 @@ AST_Constant::exprtype_to_string (AST_Expression::ExprType et)
case AST_Expression::EV_longdouble:
return "LongDouble";
default:
- return 0;
+ break;
}
return 0;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
index ab275a0af05..0641c6173af 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
@@ -47,7 +47,7 @@ namespace TAO_PG
const PortableGroup::Properties & overrides,
PortableGroup::Properties &properties);
-};
+}
#include "ace/post.h"
#endif /* TAO_PG_PROPERTY_UTILS_H */
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 5bac09cfe96..b9d2117ef69 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -165,8 +165,6 @@ ST_AMH_Server::start_orb_and_poa (void)
poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
-
- return 0;
}
ACE_CATCHANY
{
@@ -251,4 +249,6 @@ main (int argc, char *argv[])
amh_server.register_servant (&servant);
amh_server.run_event_loop ();
+
+ return 0;
}