summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-04-10 11:30:37 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-04-10 11:30:37 +0000
commit3c24ff5b3b6b62f8ea9691315f2322a09e7c64b8 (patch)
tree4f6af1b9a0fff4123beb25f2a9c3f824553fd768
parentce08e9a3fbdf6996f1ff0735c3b1d9cad36d2c82 (diff)
downloadATCD-3c24ff5b3b6b62f8ea9691315f2322a09e7c64b8.tar.gz
ChangeLogtag:Thu Apr 10 06:27:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/tao/orbconf.h5
-rw-r--r--TAO/tao/params.cpp2
3 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 471f69cc9db..e51c8714f3a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Apr 10 06:27:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * tao/orbconf.h:
+ * tao/params.cpp: Added a compile time option to configure the
+ DefaultInitRef. It was hardcoded to mcast://:::
+
+ Thanks to Carlos O'Ryan for the patch. This shold fix BUG 1488.
+
Thu Apr 10 000:08:15 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* tao/TAO_Static.dsp:
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 79904a5bdeb..91aacacbd5b 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -822,5 +822,10 @@ enum TAO_Policy_Scope
# define TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY 1
#endif /* TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY */
+/// By default we use multicast lookup
+#if !defined(TAO_DEFAULT_INIT_REFERENCE_INITIALIZER)
+# define TAO_DEFAULT_INIT_REFERENCE_INITIALIZER "mcast://:::"
+#endif /* TAO_DEFAULT_INIT_REFERENCE_INITIALIZER */
+
#include "ace/post.h"
#endif /* TAO_ORBCONF_H */
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index d0e56191dc9..20836a5255a 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -14,7 +14,7 @@ ACE_RCSID (tao,
TAO_ORB_Parameters::TAO_ORB_Parameters (void)
: endpoints_list_ (),
mcast_discovery_endpoint_ (),
- default_init_ref_ ("mcast://:::"),
+ default_init_ref_ (TAO_DEFAULT_INIT_REFERENCE_INITIALIZER),
sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
nodelay_ (1),