summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2002-11-27 20:50:58 +0000
committerSteve Huston <shuston@riverace.com>2002-11-27 20:50:58 +0000
commit19730207ea3b277dd9d1fb94bb129a7574f67262 (patch)
tree2ec13c879fc85db35bed171287054f47d84036c0
parentc9e4ee576e404820c3fe1c9bc1835b5540553bdc (diff)
downloadATCD-19730207ea3b277dd9d1fb94bb129a7574f67262.tar.gz
ChangeLogTag:Wed Nov 27 15:47:41 2002 Steve Huston <shuston@riverace.com>
-rw-r--r--ACEXML/common/Env.i1
-rw-r--r--ACEXML/common/FileCharStream.cpp1
-rw-r--r--ACEXML/common/NamespaceSupport.h1
-rw-r--r--ACEXML/common/StrCharStream.cpp1
-rw-r--r--ACEXML/parser/parser/Entity_Manager.h1
-rw-r--r--ChangeLog23
-rw-r--r--ChangeLogs/ChangeLog-03a23
-rw-r--r--ace/POSIX_Proactor.cpp1
-rw-r--r--ace/Sock_Connect.cpp6
-rw-r--r--ace/config-aix5.1.h5
10 files changed, 60 insertions, 3 deletions
diff --git a/ACEXML/common/Env.i b/ACEXML/common/Env.i
index e293188810b..95c3f41c8aa 100644
--- a/ACEXML/common/Env.i
+++ b/ACEXML/common/Env.i
@@ -1,5 +1,6 @@
// -*- C++ -*- $Id$
+#include "ace/Log_Msg.h" /* to get ACE_ASSERT */
#include "ACEXML/common/Exception.h"
ACEXML_INLINE ACEXML_Exception *
diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp
index 07aaa2ee97c..a30c7003ab9 100644
--- a/ACEXML/common/FileCharStream.cpp
+++ b/ACEXML/common/FileCharStream.cpp
@@ -2,6 +2,7 @@
#include "ACEXML/common/FileCharStream.h"
#include "ace/ACE.h"
+#include "ace/Log_Msg.h"
ACEXML_FileCharStream::ACEXML_FileCharStream (void)
: filename_ (0), encoding_ (0), size_ (0), infile_ (NULL), peek_ (0)
diff --git a/ACEXML/common/NamespaceSupport.h b/ACEXML/common/NamespaceSupport.h
index 83d78a3c58d..7d2c7bf10ac 100644
--- a/ACEXML/common/NamespaceSupport.h
+++ b/ACEXML/common/NamespaceSupport.h
@@ -24,6 +24,7 @@
#include "ace/Functor.h"
#include "ace/Hash_Map_Manager.h"
#include "ace/Containers_T.h"
+#include "ace/Synch.h"
typedef ACE_Hash_Map_Entry<ACEXML_String,
ACEXML_String> ACEXML_NS_CONTEXT_ENTRY;
diff --git a/ACEXML/common/StrCharStream.cpp b/ACEXML/common/StrCharStream.cpp
index 046511407c2..887fc6a4b7d 100644
--- a/ACEXML/common/StrCharStream.cpp
+++ b/ACEXML/common/StrCharStream.cpp
@@ -3,6 +3,7 @@
#include "ACEXML/common/StrCharStream.h"
#include "ACEXML/common/Encoding.h"
#include "ace/ACE.h"
+#include "ace/Log_Msg.h"
ACEXML_StrCharStream::ACEXML_StrCharStream (void)
: start_ (0), ptr_ (0), end_ (0), encoding_ (0)
diff --git a/ACEXML/parser/parser/Entity_Manager.h b/ACEXML/parser/parser/Entity_Manager.h
index 7d2f4ef9b6e..9bcfcc443a3 100644
--- a/ACEXML/parser/parser/Entity_Manager.h
+++ b/ACEXML/parser/parser/Entity_Manager.h
@@ -22,6 +22,7 @@
#include "ACEXML/common/XML_Types.h"
#include "ace/Hash_Map_Manager.h"
+#include "ace/Synch.h"
typedef ACE_Hash_Map_Entry<ACEXML_String,
ACEXML_String> ACEXML_ENTITY_ENTRY;
diff --git a/ChangeLog b/ChangeLog
index 3ea625142a0..b241e59f650 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Wed Nov 27 15:47:41 2002 Steve Huston <shuston@riverace.com>
+
+ * ace/config-aix5.1.h: Add #define ACE_HAS_AIO_CALLS, but commented
+ out. AIX did things differently enough here to be a real problem.
+ It should be possible to get AIO working on AIX 5, but it will
+ take some real work.
+
+ * ace/POSIX_Proactor.cpp: Add #include "ace/ACE.h"
+
+ * ace/Sock_Connect.cpp: Visual Age C++ 6 still needs to hack to
+ get the templates built correctly :-( Changed the compile-time check
+ to an alleged Visual Age C++ 7 to see if they get it right then.
+
+ * ACEXML/common/Env.i: Add missing #include "ace/Log_Msg.h" to pick
+ up ACE_ASSERT.
+
+ * ACEXML/common/FileCharStream.cpp:
+ * ACEXML/common/StrCharStream.cpp: Add missing #include "ace/Log_Msg.h"
+
+ * ACEXML/common/NamespaceSupport.h:
+ * ACEXML/parser/parser/Entity_Manager.h: Add missing #include
+ "ace/Synch.h"
+
Wed Nov 27 07:23:30 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
* bin/auto_run_tests.lst: Two new tests cannot run in single
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 3ea625142a0..b241e59f650 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,26 @@
+Wed Nov 27 15:47:41 2002 Steve Huston <shuston@riverace.com>
+
+ * ace/config-aix5.1.h: Add #define ACE_HAS_AIO_CALLS, but commented
+ out. AIX did things differently enough here to be a real problem.
+ It should be possible to get AIO working on AIX 5, but it will
+ take some real work.
+
+ * ace/POSIX_Proactor.cpp: Add #include "ace/ACE.h"
+
+ * ace/Sock_Connect.cpp: Visual Age C++ 6 still needs to hack to
+ get the templates built correctly :-( Changed the compile-time check
+ to an alleged Visual Age C++ 7 to see if they get it right then.
+
+ * ACEXML/common/Env.i: Add missing #include "ace/Log_Msg.h" to pick
+ up ACE_ASSERT.
+
+ * ACEXML/common/FileCharStream.cpp:
+ * ACEXML/common/StrCharStream.cpp: Add missing #include "ace/Log_Msg.h"
+
+ * ACEXML/common/NamespaceSupport.h:
+ * ACEXML/parser/parser/Entity_Manager.h: Add missing #include
+ "ace/Synch.h"
+
Wed Nov 27 07:23:30 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
* bin/auto_run_tests.lst: Two new tests cannot run in single
diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp
index 97b450474a8..83e29e0bd03 100644
--- a/ace/POSIX_Proactor.cpp
+++ b/ace/POSIX_Proactor.cpp
@@ -5,6 +5,7 @@
#if defined (ACE_HAS_AIO_CALLS)
+#include "ace/ACE.h"
#include "ace/Task_T.h"
#include "ace/Log_Msg.h"
#include "ace/Object_Manager.h"
diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp
index b9f9dd973a1..08c5827ee4c 100644
--- a/ace/Sock_Connect.cpp
+++ b/ace/Sock_Connect.cpp
@@ -30,15 +30,15 @@ extern "C" {
int ACE_Sock_Connect::ipv6_enabled_ = -1;
#endif /* ACE_HAS_IPV6 */
-// This is a hack to work around a problem with Visual Age C++ 5 on AIX.
+// This is a hack to work around a problem with Visual Age C++ 5 and 6 on AIX.
// Without this, the compiler auto-instantiates the ACE_Auto_Array_Ptr for
// ifreq (contained in this module) but only adds the #include for <net/if.h>
// and not the one for <sys/socket.h> which is also needed. Although we
// don't need the template defined here, it makes the compiler pull in
// <sys/socket.h> and the build runs clean.
#if defined (AIX) && defined (__IBMCPP__) && (__IBMCPP__ >= 500)
-# if (__IBMCPP__ >= 600)
-# error Recheck this hack to see if version 6 fixed it!
+# if (__IBMCPP__ >= 700)
+# error Recheck this hack to see if version 7 fixed it!
# endif
static ACE_Auto_Array_Ptr<sockaddr> force_compiler_to_include_socket_h;
#endif /* AIX && __IBMCPP__ >= 500 */
diff --git a/ace/config-aix5.1.h b/ace/config-aix5.1.h
index dcf37bff4b2..c31eebd07fb 100644
--- a/ace/config-aix5.1.h
+++ b/ace/config-aix5.1.h
@@ -4,5 +4,10 @@
#include "ace/config-aix-4.x.h"
+// AIX 5.1 has AIO, but it doesn't have the same API as other POSIX
+// systems, and the semantics of operations are a bit different. Will take
+// some real work to get this going.
+//#define ACE_HAS_AIO_CALLS
+
// I think this is correct, but needs to be verified... -Steve Huston
#define ACE_HAS_SIGTIMEDWAIT