summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2006-07-20 15:20:48 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2006-07-20 15:20:48 +0000
commitd831e0877bfdd7b5763f45a1a5ff079f6cd72f17 (patch)
tree721b25ee3428852ee42242fa9cd28b6a13ec0ec3
parent20a77c9dc9f8d8741f95ed73b66348093d4fe996 (diff)
downloadATCD-d831e0877bfdd7b5763f45a1a5ff079f6cd72f17.tar.gz
ChangeLogTag:Thu
-rw-r--r--ACE-INSTALL.html5
-rw-r--r--ChangeLog18
-rw-r--r--ace/Basic_Types.h9
-rw-r--r--ace/Configuration.cpp5
4 files changed, 29 insertions, 8 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index bea7794d7c8..d28687d65d6 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -2626,8 +2626,9 @@ documentation on MPC.<P>
A common usage for creating a Windows workspace containing just the
core ACE and TAO libraries and executables is the following:
-<pre><code> C:> cd %TAO_ROOT% C:> %ACE_ROOT%\bin\mwc.pl -type vc71
-TAO_ACE.mwc </pre></code>
+<pre><code>
+C:> cd %TAO_ROOT% C:> %ACE_ROOT%\bin\mwc.pl -type vc71 TAO_ACE.mwc
+</pre></code>
Replace vc71 with whatever project type you want to use. On Linux and
other UNIX platform it's even easier: <P>
diff --git a/ChangeLog b/ChangeLog
index 916d1becb20..bc2dd8bc87d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Thu Jul 20 15:19:30 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
+
+ * ace/Basic_Types.h: Added
+
+ # include "ace/os_include/netinet/os_in.h" // Get ntohl()
+
+ to fix the problems introduced with
+
+ Wed Jul 19 22:46:51 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>
+
+Thu Jul 20 15:01:32 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
+
+ * ace/Configuration.cpp: Made
+ ACE_Configuration_ExtId::operator==() and
+ ACE_Configuration_ExtId::operator!=() case insensitive. Thanks
+ to Domingos Monteiro <d dot monteiro at netia dot net> for this
+ contribution.
+
Thu Jul 20 09:57:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/MakeProjectCreator/config/tao_no_iiop.mpb:
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index a8c079c32bd..469cf14e8bf 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -55,10 +55,11 @@
# endif /* ACE_LACKS_PRAGMA_ONCE */
// Pull in definitions
-# include "ace/os_include/os_limits.h" // Integer limits
-# include "ace/os_include/os_float.h" // Floating point limits
-# include "ace/os_include/os_stdlib.h" // Other types
-# include "ace/os_include/os_stddef.h" // Get ptrdiff_t - see further comments below
+# include "ace/os_include/os_limits.h" // Integer limits
+# include "ace/os_include/os_float.h" // Floating point limits
+# include "ace/os_include/os_stdlib.h" // Other types
+# include "ace/os_include/os_stddef.h" // Get ptrdiff_t - see further comments below
+# include "ace/os_include/netinet/os_in.h" // Get ntohl()
# if defined(ACE_LACKS_LONGLONG_T)
# include "ace/os_include/os_stdio.h" // For long long emulation
diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp
index 70b74fcb1f8..07e1eb0a12b 100644
--- a/ace/Configuration.cpp
+++ b/ace/Configuration.cpp
@@ -3,6 +3,7 @@
#include "ace/Auto_Ptr.h"
#include "ace/SString.h"
#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_strings.h"
// Can remove this when import_config and export_config are removed from
// ACE_Configuration. They're deprecated at ACE 5.2.
@@ -1189,13 +1190,13 @@ ACE_Configuration_ExtId& ACE_Configuration_ExtId::operator= (const ACE_Configura
bool
ACE_Configuration_ExtId::operator== (const ACE_Configuration_ExtId& rhs) const
{
- return (ACE_OS::strcmp (name_, rhs.name_) == 0);
+ return (ACE_OS::strcasecmp (name_, rhs.name_) == 0);
}
bool
ACE_Configuration_ExtId::operator!= (const ACE_Configuration_ExtId& rhs) const
{
- return (ACE_OS::strcmp (name_, rhs.name_) != 0);
+ return (ACE_OS::strcasecmp (name_, rhs.name_) != 0);
}
u_long