diff options
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Array_Base.h | 3 | ||||
| -rw-r--r-- | ace/Atomic_Op_T.cpp | 1 | ||||
| -rw-r--r-- | ace/Message_Queue.cpp | 17 | ||||
| -rw-r--r-- | ace/OS.cpp | 4 | ||||
| -rw-r--r-- | ace/OS.h | 2 | ||||
| -rw-r--r-- | ace/Thread_Adapter.cpp | 4 | ||||
| -rw-r--r-- | ace/config-vxworks5.x.h | 1 |
7 files changed, 19 insertions, 13 deletions
diff --git a/ace/Array_Base.h b/ace/Array_Base.h index bb389be7b07..5da6ea346ae 100644 --- a/ace/Array_Base.h +++ b/ace/Array_Base.h @@ -23,8 +23,7 @@ #include "ace/Global_Macros.h" #include "ace/OS.h" - -class ACE_Allocator; +#include "ace/Malloc_Base.h" // Forward declaration. template <class T> class ACE_Array_Iterator; diff --git a/ace/Atomic_Op_T.cpp b/ace/Atomic_Op_T.cpp index d2bf65c73c5..e9c7f5a9cb4 100644 --- a/ace/Atomic_Op_T.cpp +++ b/ace/Atomic_Op_T.cpp @@ -2,6 +2,7 @@ #define ACE_ATOMIC_OP_T_C #include "ace/Atomic_Op_T.h" +#include "ace/Log_Msg.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp index cd5a8c4a80a..1a35c1939fa 100644 --- a/ace/Message_Queue.cpp +++ b/ace/Message_Queue.cpp @@ -4,6 +4,7 @@ #define ACE_MESSAGE_QUEUE_C #include "ace/Message_Queue.h" +#include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) #include "ace/Message_Queue.i" @@ -22,18 +23,18 @@ ACE_Message_Queue_Vx::dump (void) const { ACE_TRACE ("ACE_Message_Queue_Vx::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - switch (this->state_) + switch (this->state_) { case ACE_Message_Queue_Base::ACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("state = ACTIVATED\n"))); break; case ACE_Message_Queue_Base::DEACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("state = DEACTIVATED\n"))); break; case ACE_Message_Queue_Base::PULSED: - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("state = PULSED\n"))); break; } @@ -472,18 +473,18 @@ ACE_Message_Queue_NT::dump (void) const ACE_TRACE ("ACE_Message_Queue_NT::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - switch (this->state_) + switch (this->state_) { case ACE_Message_Queue_Base::ACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("state = ACTIVATED\n"))); break; case ACE_Message_Queue_Base::DEACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("state = DEACTIVATED\n"))); break; case ACE_Message_Queue_Base::PULSED: - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("state = PULSED\n"))); break; } diff --git a/ace/OS.cpp b/ace/OS.cpp index 40291b5a335..6912d72b646 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -4752,6 +4752,10 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr) addr->s_addr = ip_addr; // Network byte ordered return 1; } +#elif defined (VXWORKS) + // inet_aton() returns 0 upon failure, not -1 since -1 is a valid + // address (255.255.255.255). + ACE_OSCALL_RETURN (::inet_aton ((char*)host_name, addr), int, 0); #else // inet_aton() returns 0 upon failure, not -1 since -1 is a valid // address (255.255.255.255). @@ -1855,7 +1855,7 @@ typedef u_int ACE_thread_key_t; # include /**/ <sysLib.h> # include /**/ <taskLib.h> # include /**/ <taskHookLib.h> - +# include /**/ <inetLib.h> extern "C" struct sockaddr_un { short sun_family; // AF_UNIX. diff --git a/ace/Thread_Adapter.cpp b/ace/Thread_Adapter.cpp index 7647112fe6c..0fef397baf2 100644 --- a/ace/Thread_Adapter.cpp +++ b/ace/Thread_Adapter.cpp @@ -97,8 +97,8 @@ ACE_THR_FUNC_RETURN ACE_Thread_Adapter::invoke_i (void) { // Extract the arguments. - ACE_THR_FUNC_INTERNAL func = ACE_reinterpret_cast (ACE_THR_FUNC_INTERNAL, - this->user_func_); + ACE_THR_FUNC func = ACE_reinterpret_cast (ACE_THR_FUNC, + this->user_func_); void *arg = this->arg_; #if defined (ACE_WIN32) && defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index 240ed0692e2..e5713d6ab64 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -50,6 +50,7 @@ // Processor type, if necessary. Green Hills defines "ppc". # if defined (ppc) # define ACE_HAS_POWERPC_TIMER +# define ACE_LACKS_CLEARERR # elif defined (i386) || defined (__i386__) // If running an Intel, assume that it's a Pentium so that // ACE_OS::gethrtime () can use the RDTSC instruction. If |