summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-23 07:19:04 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-23 07:19:04 +0000
commite5d92c3b29e701262617bc8c54d963bffb3eaea6 (patch)
tree4ea41af24e4942f5f025a8b1b53a03b9ab430a38
parent865c4dc1f99491088354bd37c6af20e47fd604bd (diff)
downloadATCD-e5d92c3b29e701262617bc8c54d963bffb3eaea6.tar.gz
ChangeLogTag:Fri Jul 23 02:13:44 1999 Nanbor Wang <nanbor@cs.wustl.edu>
-rw-r--r--TAO/tao/ORB_Core.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 128405b1dd8..ccc45690712 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -547,11 +547,21 @@ TAO_ORB_Core::init (int &argc, char *argv[])
// objects. Valid arguments are: "yes" and "no". Default is
// yes.
{
+ int yes_implies_global = 0;
arg_shifter.consume_arg ();
if (arg_shifter.is_parameter_next ())
{
char *opt = arg_shifter.get_current ();
- if (ACE_OS::strcasecmp (opt, "YES") == 0 ||
+ if (ACE_OS::strcasecmp (opt, "YES") == 0)
+ {
+ yes_implies_global = 1;
+ ACE_DEBUG ((LM_DEBUG,
+ "Warning: using '-ORBCollocation YES' is obsolete "
+ "and implies '-ORBCollocation global'"
+ " Please use '-ORBCollocation global' instead.\n"));
+ }
+
+ if (yes_implies_global ||
ACE_OS::strcasecmp (opt, "global") == 0)
{
this->opt_for_collocation_ = 1;