summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2002-01-09 16:14:01 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2002-01-09 16:14:01 +0000
commit625cabb63a8e7bd0c0c4cb07e8a21ba67f8f637a (patch)
tree3f042042bbb30219fd3dba81da1d91a52bc1e357
parent4cb260c4cf563cd0cec4cdbdae7b481c82061d1b (diff)
downloadATCD-625cabb63a8e7bd0c0c4cb07e8a21ba67f8f637a.tar.gz
ChangeLogTag:Wed Jan 9 00:48:48 2002 Don Hinton <dhinton@gmx.net>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a6
-rw-r--r--TAO/docs/Options.html4
-rw-r--r--THANKS1
-rw-r--r--ace/OS_String.cpp1
4 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index bf7e0ec281e..215d6c72037 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Wed Jan 9 08:46:58 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
+
+ * docs/Options.html: Clarified the use of the -ORBDottedDecimalAddresses
+ option. Thanks to Michael Gillmann <michael.gillmann@infor.de> for
+ motivating this.
+
Tue Jan 8 16:20:37 2002 Jeff Parsons <parsons@cs.wustl.edu>
* TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index ec031e87b40..099dd91ceae 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -343,7 +343,9 @@ the ORB.
<TR>
<TD><CODE>-ORBDottedDecimalAddresses</CODE> <EM>boolean (0|1)</EM></TD>
<TD><A name="-ORBDottedDecimalAddresses"></a> Use the dotted decimal
- notation for addresses. By default domain names are used in IORs.</TD>
+ notation for addresses. This option helps to work around
+ broken DNS implementations and may also reduce the time spent
+ resolving IP addresses. By default domain names are used in IORs.</TD>
</TR>
<TR>
<TD><CODE>-ORBInitRef</CODE> <EM>ObjectId=IOR</EM></TD>
diff --git a/THANKS b/THANKS
index 00a2995d8ca..6afbc02ba11 100644
--- a/THANKS
+++ b/THANKS
@@ -1411,6 +1411,7 @@ Brian Olson <bolson@rtlogic.com>
Roy Sharon <roysharon@hotmail.com>
Charlie Grames <charlie.grames@windriver.com>
Tom Howard <tom_howard@yahoo.com>
+Michael Gillmann <michael.gillmann@infor.de>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp
index 9855d75cde1..de0cf1e01df 100644
--- a/ace/OS_String.cpp
+++ b/ace/OS_String.cpp
@@ -21,7 +21,6 @@ ACE_RCSID (ace, OS_String, "$Id$")
extern "C" wchar_t *wcsdup __P ((__const wchar_t *__s));
#endif /* ACE_LACKS_WCSDUP_PROTOTYPE */
-
const char *
ACE_OS_String::strnstr (const char *s1, const char *s2, size_t len2)
{