summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-03 04:56:20 +0000
committeriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-03 04:56:20 +0000
commitb0504185d18cc827281e10cb266d337ecbec0f61 (patch)
treed09bfb49a288f9c0d3ffc4525a62c55d2bad4806
parent4692099df3438d06cdad242a8d2792a1446c1729 (diff)
downloadATCD-b0504185d18cc827281e10cb266d337ecbec0f61.tar.gz
Merged revisions 81219,81221 via svnmerge from
https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/ACE ........ r81219 | iliyan | 2008-04-02 15:23:32 -0500 (Wed, 02 Apr 2008) | 1 line ChangeLogTag: Wed Apr 2 20:22:50 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com> ........ r81221 | jtc | 2008-04-02 16:41:45 -0500 (Wed, 02 Apr 2008) | 1 line ChangeLogTag: Wed Apr 2 21:40:00 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> ........
-rw-r--r--ACE/ChangeLog17
-rw-r--r--ACE/configure.ac6
2 files changed, 19 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 81d0c8831fc..c4a400f9965 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,18 @@
+Wed Apr 2 21:40:00 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * configure.ac:
+
+ Fix typo in ACE_HAS_BSWAP_{16,32,64} feature tests.
+ This to Thomas Girard <thomas dot g dot girard at free dot fr>
+ for reporting this.
+
+Wed Apr 2 20:22:50 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
+
+ * ace/Intrusive_Auto_Ptr.h:
+ * ace/Intrusive_Auto_Ptr.inl:
+
+ Correcting a problem with VC71
+
Wed Apr 2 11:06:30 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com>
* bin/tao_orb_tests.lst:
@@ -303,7 +318,7 @@ Thu Mar 27 14:07:27 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com>
* configure.ac:
- #include <byteswap.h> in HAS_BSWAP_{16,32,64} feature tests.
+ #include <byteswap.h> in ACE_HAS_BSWAP_{16,32,64} feature tests.
Resolves bugzilla issue #3134.
Thu Mar 27 12:54:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/ACE/configure.ac b/ACE/configure.ac
index e31c36de7f0..d136a7c8e5d 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -3446,21 +3446,21 @@ ACE_CHECK_LACKS_FUNCS(bsearch)
ACE_CHECK_HAS_DEFINES([bswap16])
if test "$ace_cv_defined_bswap16" = no; then
ACE_CHECK_HAS_DEFINES([bswap_16],[],[],[
-#if ACE_HAS_BYTESEX_H
+#if ACE_HAS_BYTESWAP_H
#include <byteswap.h>
#endif])
fi
ACE_CHECK_HAS_DEFINES([bswap32])
if test "$ace_cv_defined_bswap32" = no; then
ACE_CHECK_HAS_DEFINES([bswap_32],[],[],[
-#if ACE_HAS_BYTESEX_H
+#if ACE_HAS_BYTESWAP_H
#include <byteswap.h>
#endif])
fi
ACE_CHECK_HAS_DEFINES([bswap64])
if test "$ace_cv_defined_bswap64" = no; then
ACE_CHECK_HAS_DEFINES([bswap_64],[],[],[
-#if ACE_HAS_BYTESEX_H
+#if ACE_HAS_BYTESWAP_H
#include <byteswap.h>
#endif])
fi