diff options
232 files changed, 776 insertions, 960 deletions
diff --git a/ace/ACE.cpp b/ace/ACE.cpp index f8c7c741748..1b22b453ab0 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -2,10 +2,6 @@ #include "ace/ACE.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/ACE.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - #include "ace/Basic_Types.h" #include "ace/Handle_Set.h" #include "ace/Auto_Ptr.h" @@ -27,6 +23,10 @@ #include "ace/OS_NS_ctype.h" #include "ace/OS_TLI.h" +#if !defined (__ACE_INLINE__) +#include "ace/ACE.i" +#endif /* __ACE_INLINE__ */ + #if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT) # include "ace/OS_NS_poll.h" #endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */ diff --git a/ace/ACE.h b/ace/ACE.h index 157e5d0a918..a45281b7829 100644 --- a/ace/ACE.h +++ b/ace/ACE.h @@ -783,9 +783,9 @@ private: static char debug_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/ACE.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #if defined (acelog2) # define log2 acelog2 diff --git a/ace/ACE.i b/ace/ACE.i index 8fbb978dc49..9e28d4ea321 100644 --- a/ace/ACE.i +++ b/ace/ACE.i @@ -8,7 +8,7 @@ // Wrappers for methods that have been moved to ACE_OS. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::read_n (ACE_HANDLE handle, void *buf, size_t len, @@ -20,7 +20,7 @@ ACE::read_n (ACE_HANDLE handle, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::write_n (ACE_HANDLE handle, const void *buf, size_t len, @@ -32,7 +32,7 @@ ACE::write_n (ACE_HANDLE handle, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::recv_n (ACE_HANDLE handle, void *buf, size_t len, @@ -57,7 +57,7 @@ ACE::recv_n (ACE_HANDLE handle, #if defined (ACE_HAS_TLI) -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::t_rcv_n (ACE_HANDLE handle, void *buf, size_t len, @@ -82,7 +82,7 @@ ACE::t_rcv_n (ACE_HANDLE handle, #endif /* ACE_HAS_TLI */ -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::recv_n (ACE_HANDLE handle, void *buf, size_t len, @@ -102,7 +102,7 @@ ACE::recv_n (ACE_HANDLE handle, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::recvv_n (ACE_HANDLE handle, iovec *iov, int iovcnt, @@ -122,7 +122,7 @@ ACE::recvv_n (ACE_HANDLE handle, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::send_n (ACE_HANDLE handle, const void *buf, size_t len, @@ -147,7 +147,7 @@ ACE::send_n (ACE_HANDLE handle, #if defined (ACE_HAS_TLI) -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::t_snd_n (ACE_HANDLE handle, const void *buf, size_t len, @@ -172,7 +172,7 @@ ACE::t_snd_n (ACE_HANDLE handle, #endif /* ACE_HAS_TLI */ -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::send_n (ACE_HANDLE handle, const void *buf, size_t len, @@ -192,7 +192,7 @@ ACE::send_n (ACE_HANDLE handle, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::sendv_n (ACE_HANDLE handle, const iovec *iov, int iovcnt, @@ -212,7 +212,7 @@ ACE::sendv_n (ACE_HANDLE handle, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len) { #if defined (ACE_WIN32) || defined (ACE_PSOS) || defined (HPUX) @@ -222,7 +222,7 @@ ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len) #endif /* ACE_WIN32 */ } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len) { #if defined (ACE_WIN32) || defined (ACE_PSOS) || defined (ACE_OPENVMS) @@ -232,7 +232,7 @@ ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len) #endif /* ACE_WIN32 */ } -ASYS_INLINE int +ACE_INLINE int ACE::handle_read_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { @@ -243,7 +243,7 @@ ACE::handle_read_ready (ACE_HANDLE handle, 0); } -ASYS_INLINE int +ACE_INLINE int ACE::handle_write_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { @@ -254,7 +254,7 @@ ACE::handle_write_ready (ACE_HANDLE handle, 0); } -ASYS_INLINE int +ACE_INLINE int ACE::handle_exception_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { @@ -265,7 +265,7 @@ ACE::handle_exception_ready (ACE_HANDLE handle, 1); } -ASYS_INLINE void +ACE_INLINE void ACE::unique_name (const void *object, ACE_TCHAR *name, size_t length) @@ -273,7 +273,7 @@ ACE::unique_name (const void *object, ACE_OS::unique_name (object, name, length); } -ASYS_INLINE u_long +ACE_INLINE u_long ACE::log2 (u_long num) { u_long log = 0; @@ -286,14 +286,14 @@ ACE::log2 (u_long num) return log; } -ASYS_INLINE ACE_TCHAR +ACE_INLINE ACE_TCHAR ACE::nibble2hex (u_int n) { // @@ UNICODE does this work? return ACE::hex_chars_[n & 0x0f]; } -ASYS_INLINE u_char +ACE_INLINE u_char ACE::hex2byte (ACE_TCHAR c) { if (isdigit (c)) @@ -304,13 +304,13 @@ ACE::hex2byte (ACE_TCHAR c) return (u_char) (10 + c - ACE_LIB_TEXT ('A')); } -ASYS_INLINE char +ACE_INLINE char ACE::debug (void) { return ACE::debug_; } -ASYS_INLINE void +ACE_INLINE void ACE::debug (char c) { ACE::debug_ = c; diff --git a/ace/ATM_Acceptor.h b/ace/ATM_Acceptor.h index cdace37d809..aac2121c5b1 100644 --- a/ace/ATM_Acceptor.h +++ b/ace/ATM_Acceptor.h @@ -23,7 +23,6 @@ #if defined (ACE_HAS_ATM) -#include "ace/Time_Value.h" #include "ace/ATM_Stream.h" #include "ace/ATM_Params.h" #include "ace/ATM_QoS.h" @@ -40,6 +39,9 @@ typedef ACE_SOCK_Acceptor ATM_Acceptor; typedef ACE_TLI_Acceptor ATM_Acceptor; #endif // ACE_HAS_FORE_ATM_WS2 || ACE_HAS_LINUX_ATM +// Forward declarations. +class ACE_Time_Value + /** * @class ACE_ATM_Acceptor * diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp index 3d7c5c0a60b..f0de9f9dfa7 100644 --- a/ace/Asynch_Acceptor.cpp +++ b/ace/Asynch_Acceptor.cpp @@ -16,6 +16,7 @@ ACE_RCSID(ace, Asynch_Acceptor, "$Id$") // This only works on platforms that support async i/o. #include "ace/OS_Errno.h" +#include "ace/OS_NS_sys_socket.h" #include "ace/Log_Msg.h" #include "ace/Message_Block.h" #include "ace/INET_Addr.h" diff --git a/ace/Based_Pointer_Repository.cpp b/ace/Based_Pointer_Repository.cpp index ee336de4535..739bff251a2 100644 --- a/ace/Based_Pointer_Repository.cpp +++ b/ace/Based_Pointer_Repository.cpp @@ -125,7 +125,7 @@ template class ACE_Map_Iterator_Base<void *, size_t, ACE_Null_Mutex>; #pragma instantiate ACE_Map_Iterator<void *, size_t, ACE_Null_Mutex> #pragma instantiate ACE_Map_Reverse_Iterator<void *, size_t, ACE_Null_Mutex> #pragma instantiate ACE_Map_Iterator_Base<void *, size_t, ACE_Null_Mutex> -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (VXWORKS)) +#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> * ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Condition_Recursive_Thread_Mutex.cpp b/ace/Condition_Recursive_Thread_Mutex.cpp index cbae2a44c10..0542fa4ec9b 100644 --- a/ace/Condition_Recursive_Thread_Mutex.cpp +++ b/ace/Condition_Recursive_Thread_Mutex.cpp @@ -13,10 +13,6 @@ #if defined (ACE_HAS_THREADS) -#if !defined (__ACE_INLINE__) -#include "ace/Condition_Recursive_Thread_Mutex.inl" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_HAS_DUMP) # include "ace/Log_Msg.h" #endif /* ACE_HAS_DUMP */ @@ -35,7 +31,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const // ACE_TRACE ("ACE_Condition<MUTEX>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - // No dump method for ACE_cond_t even in emulated mode. + // No dump method for ACE_cond_t even in emulated mode. // cond_.dump (); this->mutex_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); diff --git a/ace/Condition_Recursive_Thread_Mutex.h b/ace/Condition_Recursive_Thread_Mutex.h index e05fd910fa6..9d5fcecdd82 100644 --- a/ace/Condition_Recursive_Thread_Mutex.h +++ b/ace/Condition_Recursive_Thread_Mutex.h @@ -106,10 +106,6 @@ public: ACE_Condition<ACE_Recursive_Thread_Mutex> (m) {} }; -#if defined (__ACE_INLINE__) -#include "ace/Condition_Recursive_Thread_Mutex.inl" -#endif /* __ACE_INLINE__ */ - #endif /* !ACE_HAS_THREADS */ #include /**/ "ace/post.h" diff --git a/ace/Condition_Recursive_Thread_Mutex.inl b/ace/Condition_Recursive_Thread_Mutex.inl deleted file mode 100644 index f4f84bd4f2e..00000000000 --- a/ace/Condition_Recursive_Thread_Mutex.inl +++ /dev/null @@ -1,3 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index 08c874050e4..219df1ded44 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -7,6 +7,10 @@ // ACE_Configuration. They're deprecated at ACE 5.2. #include "ace/Configuration_Import_Export.h" +#if !defined (ACE_LACKS_ACCESS) +# include "ace/OS_NS_unistd.h" +#endif /* ACE_LACKS_ACCESS */ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) #if defined (ACE_HAS_THREADS) diff --git a/ace/DEV.cpp b/ace/DEV.cpp index 613b47c0ebc..b40b5113b93 100644 --- a/ace/DEV.cpp +++ b/ace/DEV.cpp @@ -4,12 +4,12 @@ #include "ace/DEV.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV.i" -#endif - #include "ace/OS_NS_unistd.h" +#if !defined (__ACE_INLINE__) +#include "ace/DEV.i" +#endif /* __ACE_INLINE__ */ + ACE_RCSID(ace, DEV, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_DEV) @@ -22,7 +22,7 @@ ACE_DEV::dump (void) const #endif /* ACE_HAS_DUMP */ } -// This is the do-nothing constructor. +// This is the do-nothing constructor. ACE_DEV::ACE_DEV (void) { diff --git a/ace/DEV.h b/ace/DEV.h index 8c3491994c7..dce727e02bd 100644 --- a/ace/DEV.h +++ b/ace/DEV.h @@ -66,9 +66,9 @@ protected: ACE_DEV (void); }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/DEV.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_DEV_H */ diff --git a/ace/DEV.i b/ace/DEV.i index 529824f129c..91246710423 100644 --- a/ace/DEV.i +++ b/ace/DEV.i @@ -1,9 +1,7 @@ /* -*- C++ -*- */ // $Id$ -// DEV.i - -ASYS_INLINE int +ACE_INLINE int ACE_DEV::disable (int signum) const { #if defined (ACE_WIN32) diff --git a/ace/DEV_Connector.cpp b/ace/DEV_Connector.cpp index 0800a8677b6..14b3bf90a86 100644 --- a/ace/DEV_Connector.cpp +++ b/ace/DEV_Connector.cpp @@ -3,12 +3,12 @@ #include "ace/DEV_Connector.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/DEV_Connector.i" -#endif - #include "ace/Handle_Ops.h" +#if !defined (__ACE_INLINE__) +#include "ace/DEV_Connector.i" +#endif /* __ACE_INLINE__ */ + ACE_RCSID(ace, DEV_Connector, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Connector) @@ -27,17 +27,17 @@ ACE_DEV_Connector::ACE_DEV_Connector (void) } int -ACE_DEV_Connector::connect (ACE_DEV_IO &new_io, +ACE_DEV_Connector::connect (ACE_DEV_IO &new_io, const ACE_DEV_Addr &remote_sap, ACE_Time_Value *timeout, - const ACE_Addr &, + const ACE_Addr &, int, int flags, int perms) { ACE_TRACE ("ACE_DEV_Connector::connect"); - ACE_HANDLE handle = ACE_Handle_Ops::handle_timed_open (timeout, + ACE_HANDLE handle = ACE_Handle_Ops::handle_timed_open (timeout, remote_sap.get_path_name (), flags, perms); new_io.set_handle (handle); diff --git a/ace/DEV_Connector.h b/ace/DEV_Connector.h index f7e24de15c9..16c0da5da84 100644 --- a/ace/DEV_Connector.h +++ b/ace/DEV_Connector.h @@ -16,6 +16,7 @@ #include "ace/DEV_IO.h" #include "ace/Log_Msg.h" +#include "ace/os_include/os_fcntl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -96,9 +97,9 @@ public: typedef ACE_DEV_IO PEER_STREAM; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/DEV_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_DEV_CONNECTOR_H */ diff --git a/ace/DEV_Connector.i b/ace/DEV_Connector.i index 8b2af2372f0..798639197b4 100644 --- a/ace/DEV_Connector.i +++ b/ace/DEV_Connector.i @@ -1,10 +1,10 @@ /* -*- C++ -*- */ // $Id$ -// Creates a Local ACE_DEV. +// Creates a Local ACE_DEV. -ASYS_INLINE -ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io, +ACE_INLINE +ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io, const ACE_DEV_Addr &remote_sap, ACE_Time_Value *timeout, const ACE_Addr &local_sap, @@ -13,14 +13,14 @@ ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io, int perms) { ACE_TRACE ("ACE_DEV_Connector::ACE_DEV_Connector"); - if (this->connect (new_io, remote_sap, timeout, local_sap, + if (this->connect (new_io, remote_sap, timeout, local_sap, reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("address %s, %p\n"), + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("address %s, %p\n"), remote_sap.get_path_name (), ACE_LIB_TEXT ("ACE_DEV_IO"))); } -ASYS_INLINE int +ACE_INLINE int ACE_DEV_Connector::reset_new_handle (ACE_HANDLE handle) { ACE_UNUSED_ARG (handle); diff --git a/ace/DEV_IO.cpp b/ace/DEV_IO.cpp index 95ad587312c..47e8bb308fd 100644 --- a/ace/DEV_IO.cpp +++ b/ace/DEV_IO.cpp @@ -4,9 +4,9 @@ #include "ace/DEV_IO.h" #include "ace/Log_Msg.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/DEV_IO.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, DEV_IO, "$Id$") diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h index 4ce521ce51a..2c626dd3b9b 100644 --- a/ace/DEV_IO.h +++ b/ace/DEV_IO.h @@ -170,9 +170,9 @@ private: ACE_DEV_Addr addr_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/DEV_IO.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_DEV_IO_H */ diff --git a/ace/DEV_IO.i b/ace/DEV_IO.i index 26b7dad7368..309ea6c6cde 100644 --- a/ace/DEV_IO.i +++ b/ace/DEV_IO.i @@ -4,13 +4,15 @@ // DEV_IO.i #include "ace/OS_NS_sys_uio.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_Memory.h" #include "ace/ACE.h" // Send exactly N bytes from BUF to this device. Keeping trying until // this many bytes are sent. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::send_n (const void *buf, size_t n) const { ACE_TRACE ("ACE_DEV_IO::send_n"); @@ -20,7 +22,7 @@ ACE_DEV_IO::send_n (const void *buf, size_t n) const // Receive exactly N bytes from this file into BUF. Keep trying until // this many bytes are received. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::recv_n (void *buf, size_t n, const ACE_Time_Value *timeout, size_t *bt) const @@ -43,35 +45,35 @@ ACE_DEV_IO::recv_n (void *buf, size_t n, #endif /*ACE_WIN32*/ } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::send (const void *buf, size_t n) const { ACE_TRACE ("ACE_DEV_IO::send"); return ACE_OS::write (this->get_handle (), (const char *) buf, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::recv (void *buf, size_t n) const { ACE_TRACE ("ACE_DEV_IO::recv"); return ACE_OS::read (this->get_handle (), (char *) buf, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::send (const iovec iov[], size_t n) const { ACE_TRACE ("ACE_DEV_IO::send"); return ACE_OS::writev (this->get_handle (), iov, static_cast<int> (n)); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::recv (iovec iov[], size_t n) const { ACE_TRACE ("ACE_DEV_IO::recv"); return ACE_OS::readv (this->get_handle (), iov, static_cast<int> (n)); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::send (const void *buf, size_t n, ACE_OVERLAPPED *overlapped) const { @@ -81,7 +83,7 @@ ACE_DEV_IO::send (const void *buf, size_t n, overlapped); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::recv (void *buf, size_t n, ACE_OVERLAPPED *overlapped) const { @@ -91,28 +93,28 @@ ACE_DEV_IO::recv (void *buf, size_t n, } #if defined (ACE_HAS_STREAM_PIPES) -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *band, int *flags) const { ACE_TRACE ("ACE_DEV_IO::recv"); return ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int band, int flags) const { ACE_TRACE ("ACE_DEV_IO::send"); return ACE_OS::putpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *flags) const { ACE_TRACE ("ACE_DEV_IO::recv"); return ACE_OS::getmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_DEV_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags) const { ACE_TRACE ("ACE_DEV_IO::send"); diff --git a/ace/Date_Time.cpp b/ace/Date_Time.cpp index 7eaa91b3f15..89f57c4077f 100644 --- a/ace/Date_Time.cpp +++ b/ace/Date_Time.cpp @@ -3,8 +3,8 @@ #include "ace/Date_Time.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/Date_Time.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Date_Time, "$Id$") diff --git a/ace/Date_Time.h b/ace/Date_Time.h index 0a564e84c50..049569228d6 100644 --- a/ace/Date_Time.h +++ b/ace/Date_Time.h @@ -113,9 +113,9 @@ private: long wday_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/Date_Time.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_DATE_TIME_H */ diff --git a/ace/Date_Time.i b/ace/Date_Time.i index 3ac2b5edb46..4dbc8ecc657 100644 --- a/ace/Date_Time.i +++ b/ace/Date_Time.i @@ -8,7 +8,7 @@ #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_time.h" -ASYS_INLINE void +ACE_INLINE void ACE_Date_Time::update (const ACE_Time_Value& timevalue) { #if defined (ACE_HAS_WINCE) @@ -41,7 +41,7 @@ ACE_Date_Time::update (const ACE_Time_Value& timevalue) #endif /* ACE_HAS_WINCE */ } -ASYS_INLINE void +ACE_INLINE void ACE_Date_Time::update (void) { ACE_TRACE ("ACE_Date_Time::update"); @@ -49,14 +49,14 @@ ACE_Date_Time::update (void) update(ACE_OS::gettimeofday ()); } -ASYS_INLINE +ACE_INLINE ACE_Date_Time::ACE_Date_Time (void) { ACE_TRACE ("ACE_Date_Time::ACE_Date_Time"); this->update (); } -ASYS_INLINE +ACE_INLINE ACE_Date_Time::ACE_Date_Time (const ACE_Time_Value& timevalue) { ACE_TRACE ("ACE_Date_Time::ACE_Date_Time: timevalue"); @@ -64,7 +64,7 @@ ACE_Date_Time::ACE_Date_Time (const ACE_Time_Value& timevalue) } // Constructor with init values, no check for validy -ASYS_INLINE +ACE_INLINE ACE_Date_Time::ACE_Date_Time (long day, long month, long year, @@ -88,7 +88,7 @@ ACE_Date_Time::ACE_Date_Time (long day, // set/get portions of ACE_Date_Time, no check for validy // get day -ASYS_INLINE long +ACE_INLINE long ACE_Date_Time::day (void) const { ACE_TRACE ("ACE_Date_Time::day"); @@ -96,7 +96,7 @@ ACE_Date_Time::day (void) const } // set day -ASYS_INLINE void +ACE_INLINE void ACE_Date_Time::day (long day) { ACE_TRACE ("ACE_Date_Time::day"); @@ -104,7 +104,7 @@ ACE_Date_Time::day (long day) } // get month -ASYS_INLINE long +ACE_INLINE long ACE_Date_Time::month (void) const { ACE_TRACE ("ACE_Date_Time::month"); @@ -112,7 +112,7 @@ ACE_Date_Time::month (void) const } // set month -ASYS_INLINE void +ACE_INLINE void ACE_Date_Time::month (long month) { ACE_TRACE ("ACE_Date_Time::month"); @@ -120,7 +120,7 @@ ACE_Date_Time::month (long month) } // get year -ASYS_INLINE long +ACE_INLINE long ACE_Date_Time::year (void) const { ACE_TRACE ("ACE_Date_Time::year"); @@ -128,7 +128,7 @@ ACE_Date_Time::year (void) const } // set year -ASYS_INLINE void +ACE_INLINE void ACE_Date_Time::year (long year) { ACE_TRACE ("ACE_Date_Time::year"); @@ -136,7 +136,7 @@ ACE_Date_Time::year (long year) } // get hour -ASYS_INLINE long +ACE_INLINE long ACE_Date_Time::hour (void) const { ACE_TRACE ("ACE_Date_Time::hour"); @@ -144,7 +144,7 @@ ACE_Date_Time::hour (void) const } // set hour -ASYS_INLINE void +ACE_INLINE void ACE_Date_Time::hour (long hour) { ACE_TRACE ("ACE_Date_Time::hour"); @@ -152,7 +152,7 @@ ACE_Date_Time::hour (long hour) } // get minute -ASYS_INLINE long +ACE_INLINE long ACE_Date_Time::minute (void) const { ACE_TRACE ("ACE_Date_Time::minute"); @@ -160,7 +160,7 @@ ACE_Date_Time::minute (void) const } // set minute -ASYS_INLINE void +ACE_INLINE void ACE_Date_Time::minute (long minute) { ACE_TRACE ("ACE_Date_Time::minute"); @@ -168,7 +168,7 @@ ACE_Date_Time::minute (long minute) } // get second -ASYS_INLINE long +ACE_INLINE long ACE_Date_Time::second (void) const { ACE_TRACE ("ACE_Date_Time::second"); @@ -176,7 +176,7 @@ ACE_Date_Time::second (void) const } // set second -ASYS_INLINE void +ACE_INLINE void ACE_Date_Time::second (long second) { ACE_TRACE ("ACE_Date_Time::second"); @@ -184,7 +184,7 @@ ACE_Date_Time::second (long second) } // get microsec -ASYS_INLINE long +ACE_INLINE long ACE_Date_Time::microsec (void) const { ACE_TRACE ("ACE_Date_Time::microsec"); @@ -192,7 +192,7 @@ ACE_Date_Time::microsec (void) const } // set microsec -ASYS_INLINE void +ACE_INLINE void ACE_Date_Time::microsec (long microsec) { ACE_TRACE ("ACE_Date_Time::microsec"); @@ -200,7 +200,7 @@ ACE_Date_Time::microsec (long microsec) } // get wday -ASYS_INLINE long +ACE_INLINE long ACE_Date_Time::weekday (void) const { ACE_TRACE ("ACE_Date_Time::weekday"); @@ -208,7 +208,7 @@ ACE_Date_Time::weekday (void) const } // set wday -ASYS_INLINE void +ACE_INLINE void ACE_Date_Time::weekday (long wday) { ACE_TRACE ("ACE_Date_Time::weekday"); diff --git a/ace/Dev_Poll_Reactor.cpp b/ace/Dev_Poll_Reactor.cpp index 23b1d2b2641..d1c4ab3a73c 100644 --- a/ace/Dev_Poll_Reactor.cpp +++ b/ace/Dev_Poll_Reactor.cpp @@ -983,14 +983,6 @@ ACE_Dev_Poll_Reactor::set_sig_handler (ACE_Sig_Handler *signal_handler) } int -ACE_Dev_Poll_Reactor::set_timer_queue (ACE_Timer_Queue *tq) -{ - // @note This method is deprecated. - - return this->timer_queue (tq); -} - -int ACE_Dev_Poll_Reactor::timer_queue (ACE_Timer_Queue *tq) { if (this->delete_timer_queue_ && this->timer_queue_) diff --git a/ace/Dev_Poll_Reactor.h b/ace/Dev_Poll_Reactor.h index 4509c4fdf82..a6d49426a4e 100644 --- a/ace/Dev_Poll_Reactor.h +++ b/ace/Dev_Poll_Reactor.h @@ -521,13 +521,6 @@ public: /// Use a user specified signal handler instead. virtual int set_sig_handler (ACE_Sig_Handler *signal_handler); - /// Set a user specified timer queue. - /** - * @note This method is deprecated. - * @see timer_queue - */ - virtual int set_timer_queue (ACE_Timer_Queue *tq); - /// Set a user-specified timer queue. virtual int timer_queue (ACE_Timer_Queue *tq); diff --git a/ace/Dirent_Selector.inl b/ace/Dirent_Selector.inl index 577c4db4584..894971076ed 100644 --- a/ace/Dirent_Selector.inl +++ b/ace/Dirent_Selector.inl @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ ACE_INLINE int diff --git a/ace/Dynamic.cpp b/ace/Dynamic.cpp index 14fa9ec538e..ebca028eba3 100644 --- a/ace/Dynamic.cpp +++ b/ace/Dynamic.cpp @@ -38,7 +38,7 @@ ACE_Dynamic::instance (void) #pragma instantiate ACE_TSS<ACE_Dynamic> # endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */ -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (VXWORKS)) +#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex> * ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex>::singleton_; diff --git a/ace/Dynamic_Service_Base.i b/ace/Dynamic_Service_Base.i deleted file mode 100644 index 6318deb79a0..00000000000 --- a/ace/Dynamic_Service_Base.i +++ /dev/null @@ -1,2 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ diff --git a/ace/Event_Handler.i b/ace/Event_Handler.i index 6ecccb4b1db..d07de45a072 100644 --- a/ace/Event_Handler.i +++ b/ace/Event_Handler.i @@ -1,8 +1,6 @@ /* -*- C++ -*- */ // $Id$ -// Event_Handler.i - ACE_INLINE ACE_Notification_Buffer::~ACE_Notification_Buffer (void) { diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp index 3a24e81d6e8..6c428a4dbe9 100644 --- a/ace/FIFO.cpp +++ b/ace/FIFO.cpp @@ -11,6 +11,7 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_sys_stat.h" +#include "ace/OS_NS_fcntl.h" ACE_RCSID(ace, FIFO, "$Id$") diff --git a/ace/FIFO_Recv.cpp b/ace/FIFO_Recv.cpp index 3b877dfe5db..e517fb4b5b2 100644 --- a/ace/FIFO_Recv.cpp +++ b/ace/FIFO_Recv.cpp @@ -3,10 +3,11 @@ #include "ace/FIFO_Recv.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_fcntl.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/FIFO_Recv.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, FIFO_Recv, "$Id$") @@ -24,7 +25,7 @@ ACE_FIFO_Recv::dump (void) const #endif /* ACE_HAS_DUMP */ } -int +int ACE_FIFO_Recv::close (void) { ACE_TRACE ("ACE_FIFO_Recv::close"); @@ -53,7 +54,7 @@ ACE_FIFO_Recv::open (const ACE_TCHAR *fifo_name, return -1; else if (this->disable (ACE_NONBLOCK) == -1) return -1; - else if (persistent + else if (persistent && (this->aux_handle_ = ACE_OS::open (fifo_name, O_WRONLY, 0, sa)) == ACE_INVALID_HANDLE) return -1; else diff --git a/ace/FIFO_Recv.h b/ace/FIFO_Recv.h index 1a0687d8767..d9cd3e979d9 100644 --- a/ace/FIFO_Recv.h +++ b/ace/FIFO_Recv.h @@ -72,9 +72,9 @@ private: ACE_HANDLE aux_handle_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/FIFO_Recv.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/ace/FIFO_Recv.i b/ace/FIFO_Recv.i index 29d951b044d..5817a486624 100644 --- a/ace/FIFO_Recv.i +++ b/ace/FIFO_Recv.i @@ -4,15 +4,16 @@ // FIFO_Recv.i #include "ace/ACE.h" +#include "ace/OS_NS_unistd.h" -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FIFO_Recv::recv (void *buf, size_t len) { ACE_TRACE ("ACE_FIFO_Recv::recv"); return ACE_OS::read (this->get_handle (), (char *) buf, len); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FIFO_Recv::recv_n (void *buf, size_t n) { ACE_TRACE ("ACE_FIFO_Recv::recv_n"); diff --git a/ace/FIFO_Recv_Msg.cpp b/ace/FIFO_Recv_Msg.cpp index 2c01f948e54..b9094fe00f2 100644 --- a/ace/FIFO_Recv_Msg.cpp +++ b/ace/FIFO_Recv_Msg.cpp @@ -3,12 +3,12 @@ #include "ace/FIFO_Recv_Msg.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Recv_Msg.i" -#endif - #include "ace/Log_Msg.h" +#if !defined (__ACE_INLINE__) +#include "ace/FIFO_Recv_Msg.i" +#endif /* __ACE_INLINE__ */ + ACE_RCSID(ace, FIFO_Recv_Msg, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv_Msg) diff --git a/ace/FIFO_Recv_Msg.h b/ace/FIFO_Recv_Msg.h index 197b5ad2f02..7b0760022d9 100644 --- a/ace/FIFO_Recv_Msg.h +++ b/ace/FIFO_Recv_Msg.h @@ -126,9 +126,9 @@ public: ACE_ALLOC_HOOK_DECLARE; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/FIFO_Recv_Msg.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_FIFO_RECV_MSG_H */ diff --git a/ace/FIFO_Recv_Msg.i b/ace/FIFO_Recv_Msg.i index 4e67e63ad97..c5a81e02a62 100644 --- a/ace/FIFO_Recv_Msg.i +++ b/ace/FIFO_Recv_Msg.i @@ -5,8 +5,13 @@ // FIFO_Recv_Msg.i #include "ace/Min_Max.h" +#include "ace/OS_NS_stropts.h" -ASYS_INLINE ssize_t +#if !defined (ACE_HAS_STREAM_PIPES) +#include "ace/OS_NS_unistd.h" +#endif + +ACE_INLINE ssize_t ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) { ACE_TRACE ("ACE_FIFO_Recv_Msg::recv"); @@ -60,7 +65,7 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) #endif /* ACE_HAS_STREAM_PIPES */ } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FIFO_Recv_Msg::recv (void *buf, size_t max_len) { ACE_TRACE ("ACE_FIFO_Recv_Msg::recv"); @@ -70,7 +75,7 @@ ACE_FIFO_Recv_Msg::recv (void *buf, size_t max_len) } #if defined (ACE_HAS_STREAM_PIPES) -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf *data, ACE_Str_Buf *cntl, int *flags) @@ -85,7 +90,7 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf *data, return (cntl == 0 ? 0 : cntl->len) + (data == 0 ? 0 : data->len); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FIFO_Recv_Msg::recv (int *band, ACE_Str_Buf *data, ACE_Str_Buf *cntl, diff --git a/ace/FIFO_Send.cpp b/ace/FIFO_Send.cpp index 6f07cc69d88..35d242e4a1f 100644 --- a/ace/FIFO_Send.cpp +++ b/ace/FIFO_Send.cpp @@ -4,9 +4,9 @@ #include "ace/FIFO_Send.h" #include "ace/Log_Msg.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/FIFO_Send.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, FIFO_Send, "$Id$") diff --git a/ace/FIFO_Send.h b/ace/FIFO_Send.h index 19c1278dd74..5146635fbe6 100644 --- a/ace/FIFO_Send.h +++ b/ace/FIFO_Send.h @@ -62,9 +62,9 @@ public: ACE_ALLOC_HOOK_DECLARE; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/FIFO_Send.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/ace/FIFO_Send.i b/ace/FIFO_Send.i index 9b85feb9902..eb503d9b831 100644 --- a/ace/FIFO_Send.i +++ b/ace/FIFO_Send.i @@ -4,15 +4,16 @@ // FIFO_Send.i #include "ace/ACE.h" +#include "ace/OS_NS_unistd.h" -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FIFO_Send::send (const void *buf, size_t len) { ACE_TRACE ("ACE_FIFO_Send::send"); - return ACE_OS::write (this->get_handle (), (const char *) buf, len); + return ACE_OS::write (this->get_handle (), (const char *) buf, len); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FIFO_Send::send_n (const void *buf, size_t n) { ACE_TRACE ("ACE_FIFO_Send::send_n"); diff --git a/ace/FIFO_Send_Msg.cpp b/ace/FIFO_Send_Msg.cpp index a28182625da..f3048ec3cf0 100644 --- a/ace/FIFO_Send_Msg.cpp +++ b/ace/FIFO_Send_Msg.cpp @@ -2,13 +2,13 @@ #include "ace/FIFO_Send_Msg.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FIFO_Send_Msg.i" -#endif - #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_uio.h" +#if !defined (__ACE_INLINE__) +#include "ace/FIFO_Send_Msg.i" +#endif /* __ACE_INLINE__ */ + ACE_RCSID(ace, FIFO_Send_Msg, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send_Msg) diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h index e7428aae153..f614a60065e 100644 --- a/ace/FIFO_Send_Msg.h +++ b/ace/FIFO_Send_Msg.h @@ -75,9 +75,9 @@ public: ACE_ALLOC_HOOK_DECLARE; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/FIFO_Send_Msg.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_FIFO_SEND_MSG_H */ diff --git a/ace/FIFO_Send_Msg.i b/ace/FIFO_Send_Msg.i index bbfee9a6767..34bb88aabc3 100644 --- a/ace/FIFO_Send_Msg.i +++ b/ace/FIFO_Send_Msg.i @@ -2,8 +2,9 @@ // // $Id$ +#include "ace/OS_NS_stropts.h" -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FIFO_Send_Msg::send (const void *buf, size_t len) { ACE_TRACE ("ACE_FIFO_Send_Msg::send"); @@ -13,7 +14,7 @@ ACE_FIFO_Send_Msg::send (const void *buf, size_t len) } #if defined (ACE_HAS_STREAM_PIPES) -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FIFO_Send_Msg::send (const ACE_Str_Buf *data, const ACE_Str_Buf *cntl, int flags) @@ -28,7 +29,7 @@ ACE_FIFO_Send_Msg::send (const ACE_Str_Buf *data, return (cntl == 0 ? 0 : cntl->len) + (data == 0 ? 0 : data->len); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FIFO_Send_Msg::send (int band, const ACE_Str_Buf *data, const ACE_Str_Buf *cntl, diff --git a/ace/FILE.cpp b/ace/FILE.cpp index a2734680901..b652c3da0ae 100644 --- a/ace/FILE.cpp +++ b/ace/FILE.cpp @@ -6,13 +6,13 @@ #include "ace/FILE.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE.i" -#endif - #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_stat.h" +#if !defined (__ACE_INLINE__) +#include "ace/FILE.i" +#endif /* __ACE_INLINE__ */ + ACE_RCSID(ace, FILE, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_FILE) diff --git a/ace/FILE.h b/ace/FILE.h index 4e08ed07026..814c2e4f0f6 100644 --- a/ace/FILE.h +++ b/ace/FILE.h @@ -135,9 +135,9 @@ protected: ACE_FILE_Addr addr_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/FILE.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_FILE_H */ diff --git a/ace/FILE.i b/ace/FILE.i index cf1f4986479..934f5d7aa98 100644 --- a/ace/FILE.i +++ b/ace/FILE.i @@ -1,9 +1,7 @@ /* -*- C++ -*- */ // $Id$ -// FILE.i - -ASYS_INLINE int +ACE_INLINE int ACE_FILE::disable (int signum) const { #if defined (ACE_WIN32) diff --git a/ace/FILE_Connector.cpp b/ace/FILE_Connector.cpp index db1dd6ab256..bbdf638aba2 100644 --- a/ace/FILE_Connector.cpp +++ b/ace/FILE_Connector.cpp @@ -3,10 +3,11 @@ #include "ace/FILE_Connector.h" #include "ace/Handle_Ops.h" +#include "ace/OS_NS_stdlib.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/FILE_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, FILE_Connector, "$Id$") diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h index dce66145743..0a10d4f02ec 100644 --- a/ace/FILE_Connector.h +++ b/ace/FILE_Connector.h @@ -16,6 +16,7 @@ #include "ace/FILE_IO.h" #include "ace/Log_Msg.h" +#include "ace/os_include/os_fcntl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,7 +32,7 @@ * the end of the file initially during open, but it is not * re-positioned at the end prior to each write, as specified by * POSIX. This is generally good enough for typical situations, but - * it is ``not quite right'' in its semantics. + * it is ``not quite right'' in its semantics. */ class ACE_Export ACE_FILE_Connector { @@ -102,9 +103,9 @@ public: typedef ACE_FILE_IO PEER_STREAM; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/FILE_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_FILE_CONNECTOR_H */ diff --git a/ace/FILE_Connector.i b/ace/FILE_Connector.i index ccb5985899f..5a3e909072d 100644 --- a/ace/FILE_Connector.i +++ b/ace/FILE_Connector.i @@ -5,7 +5,7 @@ // Creates a Local ACE_FILE. -ASYS_INLINE +ACE_INLINE ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, const ACE_FILE_Addr &remote_sap, ACE_Time_Value *timeout, @@ -24,7 +24,7 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, ACE_LIB_TEXT ("ACE_FILE_IO"))); } -ASYS_INLINE int +ACE_INLINE int ACE_FILE_Connector::reset_new_handle (ACE_HANDLE handle) { ACE_UNUSED_ARG (handle); diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp index d2cdd7d4f28..d5fe949fd28 100644 --- a/ace/FILE_IO.cpp +++ b/ace/FILE_IO.cpp @@ -3,12 +3,13 @@ #include "ace/FILE_IO.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/FILE_IO.i" -#endif - #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_stat.h" +#include "ace/OS_Memory.h" + +#if !defined (__ACE_INLINE__) +#include "ace/FILE_IO.i" +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, FILE_IO, "$Id$") diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h index 5373e3666f6..03796837338 100644 --- a/ace/FILE_IO.h +++ b/ace/FILE_IO.h @@ -154,9 +154,9 @@ public: typedef ACE_FILE_Addr PEER_ADDR; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/FILE_IO.i" -#endif /* !defined (ACE_LACKS_INLINE_FUNCTIONS) */ +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_FILE_IO_H */ diff --git a/ace/FILE_IO.i b/ace/FILE_IO.i index 7100c980032..01db8d9ad1a 100644 --- a/ace/FILE_IO.i +++ b/ace/FILE_IO.i @@ -5,8 +5,9 @@ #include "ace/ACE.h" #include "ace/OS_NS_sys_uio.h" +#include "ace/OS_NS_unistd.h" -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::sendv_n (const iovec iov[], int n) const { ACE_TRACE ("ACE_FILE_IO::sendv_n"); @@ -15,7 +16,7 @@ ACE_FILE_IO::sendv_n (const iovec iov[], int n) const n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::send_n (const ACE_Message_Block *message_block, const ACE_Time_Value *timeout, size_t *bytes_transferred) @@ -29,7 +30,7 @@ ACE_FILE_IO::send_n (const ACE_Message_Block *message_block, // Recv an n byte message from the file. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::recvv_n (iovec iov[], int n) const { ACE_TRACE ("ACE_FILE_IO::recvv_n"); @@ -42,7 +43,7 @@ ACE_FILE_IO::recvv_n (iovec iov[], int n) const // Send an <iovec> of size <n> to the file. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::sendv (const iovec iov[], int n) const { ACE_TRACE ("ACE_FILE_IO::sendv"); @@ -52,7 +53,7 @@ ACE_FILE_IO::sendv (const iovec iov[], int n) const // Send exactly N bytes from BUF to this file. Keeping trying until // this many bytes are sent. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::send_n (const void *buf, size_t n) const { ACE_TRACE ("ACE_FILE_IO::send_n"); @@ -62,35 +63,35 @@ ACE_FILE_IO::send_n (const void *buf, size_t n) const // Receive exactly N bytes from this file into BUF. Keep trying until // this many bytes are received. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::recv_n (void *buf, size_t n) const { ACE_TRACE ("ACE_FILE_IO::recv_n"); return ACE::read_n (this->get_handle (), buf, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::send (const void *buf, size_t n) const { ACE_TRACE ("ACE_FILE_IO::send"); return ACE_OS::write (this->get_handle (), (const char *) buf, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::recv (void *buf, size_t n) const { ACE_TRACE ("ACE_FILE_IO::recv"); return ACE_OS::read (this->get_handle (), (char *) buf, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::send (const iovec iov[], int n) const { ACE_TRACE ("ACE_FILE_IO::send"); return ACE_OS::writev (this->get_handle (), iov, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::recv (iovec iov[], int n) const { ACE_TRACE ("ACE_FILE_IO::recv"); @@ -98,35 +99,35 @@ ACE_FILE_IO::recv (iovec iov[], int n) const } #if defined (ACE_HAS_STREAM_PIPES) -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *band, int *flags) const { ACE_TRACE ("ACE_FILE_IO::recv"); return ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int band, int flags) const { ACE_TRACE ("ACE_FILE_IO::send"); return ACE_OS::putpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *flags) const { ACE_TRACE ("ACE_FILE_IO::recv"); return ACE_OS::getmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags) const { ACE_TRACE ("ACE_FILE_IO::send"); return ACE_OS::putmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::send (const void *buf, size_t n, ACE_OVERLAPPED *overlapped) const { @@ -136,7 +137,7 @@ ACE_FILE_IO::send (const void *buf, size_t n, overlapped); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_FILE_IO::recv (void *buf, size_t n, ACE_OVERLAPPED *overlapped) const { diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp index 260a5858072..8d3ded1a4b6 100644 --- a/ace/Filecache.cpp +++ b/ace/Filecache.cpp @@ -7,6 +7,8 @@ #include "ace/Guard_T.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_time.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_fcntl.h" ACE_RCSID(ace, Filecache, "$Id$") diff --git a/ace/FlReactor.h b/ace/FlReactor.h index 01d67c6453d..d0c7867bc7a 100644 --- a/ace/FlReactor.h +++ b/ace/FlReactor.h @@ -103,10 +103,6 @@ private: ACE_FlReactor &operator = (const ACE_FlReactor &); }; -#if defined(__ACE_INLINE__) -#include "ace/FlReactor.i" -#endif /* __ACE_INLINE__ */ - #endif /* ACE_HAS_FL */ #include /**/ "ace/post.h" diff --git a/ace/FlReactor.i b/ace/FlReactor.i deleted file mode 100644 index 74e88caa0c5..00000000000 --- a/ace/FlReactor.i +++ /dev/null @@ -1,2 +0,0 @@ -// $Id$ - diff --git a/ace/Flag_Manip.cpp b/ace/Flag_Manip.cpp index 11e4022484e..e4b2b87db26 100644 --- a/ace/Flag_Manip.cpp +++ b/ace/Flag_Manip.cpp @@ -2,15 +2,15 @@ #include "ace/Flag_Manip.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/Flag_Manip.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - #if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL) # include "ace/OS_NS_stropts.h" # include "ace/OS_NS_errno.h" #endif /* ACE_WIN32 || VXWORKS || ACE_LACKS_FCNTL */ +#if !defined (__ACE_INLINE__) +#include "ace/Flag_Manip.i" +#endif /* __ACE_INLINE__ */ + #if defined (CYGWIN32) # include "ace/os_include/os_termios.h" #endif /* CYGWIN32 */ diff --git a/ace/Flag_Manip.h b/ace/Flag_Manip.h index 1d5c5723209..a28dcc41088 100644 --- a/ace/Flag_Manip.h +++ b/ace/Flag_Manip.h @@ -40,13 +40,11 @@ class ACE_Export ACE_Flag_Manip /// Return the current setting of flags associated with <handle>. static int get_flags (ACE_HANDLE handle); - - }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/Flag_Manip.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_FLAG_MANIP_H */ diff --git a/ace/Flag_Manip.i b/ace/Flag_Manip.i index 4207cebb6be..3eb4b236023 100644 --- a/ace/Flag_Manip.i +++ b/ace/Flag_Manip.i @@ -5,7 +5,7 @@ #include "ace/OS_NS_fcntl.h" -ASYS_INLINE int +ACE_INLINE int ACE_Flag_Manip::get_flags (ACE_HANDLE handle) { ACE_TRACE ("ACE_Flag_Manip::get_flags"); diff --git a/ace/Framework_Component_T.cpp b/ace/Framework_Component_T.cpp index 4efef1ce831..cbaf65463d8 100644 --- a/ace/Framework_Component_T.cpp +++ b/ace/Framework_Component_T.cpp @@ -5,10 +5,6 @@ #include "ace/Framework_Component_T.h" -#if !defined (__ACE_INLINE__) -#include "ace/Framework_Component_T.inl" -#endif /* __ACE_INLINE__ */ - ACE_RCSID(ace, Framework_Component_T, "$Id$") template <class Concrete> diff --git a/ace/Framework_Component_T.h b/ace/Framework_Component_T.h index 0094a42054d..226fabbd432 100644 --- a/ace/Framework_Component_T.h +++ b/ace/Framework_Component_T.h @@ -21,14 +21,14 @@ /** * @class ACE_Framework_Component_T * - * @brief This class inherits the interface of the abstract - * ACE_Framework_Component class and is instantiated with the + * @brief This class inherits the interface of the abstract + * ACE_Framework_Component class and is instantiated with the * implementation of the concrete component class <class Concrete>. * * This design is similar to the Adapter and Decorator patterns * from the ``Gang of Four'' book. Note that <class Concrete> * need not inherit from a common class since ACE_Framework_Component - * provides the uniform virtual interface! (implementation based on + * provides the uniform virtual interface! (implementation based on * ACE_Dumpable_Adapter in <ace/Dump_T.h>. */ template <class Concrete> @@ -54,10 +54,6 @@ public: ACE_Framework_Repository::instance ()->register_component \ (new ACE_Framework_Component_T<CLASS> (INSTANCE)); -#if defined (__ACE_INLINE__) -#include "ace/Framework_Component_T.inl" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Framework_Component_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/ace/Framework_Component_T.inl b/ace/Framework_Component_T.inl deleted file mode 100644 index af30c0dde5d..00000000000 --- a/ace/Framework_Component_T.inl +++ /dev/null @@ -1,4 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Framework_Component_T.inl diff --git a/ace/Handle_Ops.cpp b/ace/Handle_Ops.cpp index f2fbefa9177..e58ebfb6f26 100644 --- a/ace/Handle_Ops.cpp +++ b/ace/Handle_Ops.cpp @@ -2,10 +2,6 @@ #include "ace/Handle_Ops.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/Handle_Ops.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - #include "ace/OS_NS_errno.h" #include "ace/OS_NS_fcntl.h" #include "ace/Time_Value.h" diff --git a/ace/Handle_Ops.h b/ace/Handle_Ops.h index aa72f23aecc..66bdf4dfa34 100644 --- a/ace/Handle_Ops.h +++ b/ace/Handle_Ops.h @@ -45,10 +45,6 @@ public: LPSECURITY_ATTRIBUTES sa = 0); }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/Handle_Ops.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - #include /**/ "ace/post.h" #endif /* ACE_HANDLE_OPS_H */ diff --git a/ace/Handle_Ops.i b/ace/Handle_Ops.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/ace/Handle_Ops.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/ace/IO_SAP.cpp b/ace/IO_SAP.cpp index 3dbdb650b1f..b6b661810ce 100644 --- a/ace/IO_SAP.cpp +++ b/ace/IO_SAP.cpp @@ -3,15 +3,16 @@ #include "ace/IO_SAP.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/IO_SAP.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - #include "ace/Log_Msg.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_fcntl.h" #include "ace/os_include/os_signal.h" +#if !defined (__ACE_INLINE__) +#include "ace/IO_SAP.i" +#endif /* __ACE_INLINE__ */ + ACE_RCSID(ace, IO_SAP, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_IO_SAP) diff --git a/ace/IO_SAP.h b/ace/IO_SAP.h index b9bab9b1e48..099e5d8f988 100644 --- a/ace/IO_SAP.h +++ b/ace/IO_SAP.h @@ -16,6 +16,7 @@ #include /**/ "ace/pre.h" #include "ace/Flag_Manip.h" +#include "ace/os_include/sys/os_types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -82,9 +83,9 @@ private: static pid_t pid_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/IO_SAP.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_IO_SAP_H */ diff --git a/ace/IO_SAP.i b/ace/IO_SAP.i index e6b1dfd9dd5..d120cd91b17 100644 --- a/ace/IO_SAP.i +++ b/ace/IO_SAP.i @@ -5,15 +5,15 @@ #include "ace/OS_NS_stropts.h" -ASYS_INLINE +ACE_INLINE ACE_IO_SAP::~ACE_IO_SAP (void) { ACE_TRACE ("ACE_IO_SAP::~ACE_IO_SAP"); } -// Used to return the underlying handle_. +// Used to return the underlying handle_. -ASYS_INLINE ACE_HANDLE +ACE_INLINE ACE_HANDLE ACE_IO_SAP::get_handle (void) const { ACE_TRACE ("ACE_IO_SAP::get_handle"); @@ -22,16 +22,16 @@ ACE_IO_SAP::get_handle (void) const // Used to set the underlying handle_. -ASYS_INLINE void +ACE_INLINE void ACE_IO_SAP::set_handle (ACE_HANDLE handle) { ACE_TRACE ("ACE_IO_SAP::set_handle"); this->handle_ = handle; } -// Provides access to the ACE_OS::ioctl system call. +// Provides access to the ACE_OS::ioctl system call. -ASYS_INLINE int +ACE_INLINE int ACE_IO_SAP::control (int cmd, void *arg) const { ACE_TRACE ("ACE_IO_SAP::control"); diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp index 24152f87ad2..4e4682c00cb 100644 --- a/ace/IPC_SAP.cpp +++ b/ace/IPC_SAP.cpp @@ -2,14 +2,15 @@ #include "ace/IPC_SAP.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/IPC_SAP.i" -#endif - #include "ace/Log_Msg.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_signal.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_fcntl.h" + +#if !defined (__ACE_INLINE__) +#include "ace/IPC_SAP.i" +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, IPC_SAP, "$Id$") diff --git a/ace/IPC_SAP.h b/ace/IPC_SAP.h index 60113e5518b..f7ff3f0f57b 100644 --- a/ace/IPC_SAP.h +++ b/ace/IPC_SAP.h @@ -15,6 +15,7 @@ #include /**/ "ace/pre.h" #include "ace/Flag_Manip.h" +#include "ace/os_include/sys/os_types.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -76,9 +77,9 @@ private: static pid_t pid_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/IPC_SAP.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_IPC_SAP_H */ diff --git a/ace/IPC_SAP.i b/ace/IPC_SAP.i index 1d2c53b2783..69a5befa3b1 100644 --- a/ace/IPC_SAP.i +++ b/ace/IPC_SAP.i @@ -5,33 +5,33 @@ #include "ace/OS_NS_stropts.h" -// Used to return the underlying handle_. +// Used to return the underlying handle_. -ASYS_INLINE +ACE_INLINE ACE_IPC_SAP::~ACE_IPC_SAP (void) { // ACE_TRACE ("ACE_IPC_SAP::~ACE_IPC_SAP"); } -ASYS_INLINE ACE_HANDLE +ACE_INLINE ACE_HANDLE ACE_IPC_SAP::get_handle (void) const { ACE_TRACE ("ACE_IPC_SAP::get_handle"); return this->handle_; } -// Used to set the underlying handle_. +// Used to set the underlying handle_. -ASYS_INLINE void +ACE_INLINE void ACE_IPC_SAP::set_handle (ACE_HANDLE handle) { ACE_TRACE ("ACE_IPC_SAP::set_handle"); this->handle_ = handle; } -// Provides access to the ACE_OS::ioctl system call. +// Provides access to the ACE_OS::ioctl system call. -ASYS_INLINE int +ACE_INLINE int ACE_IPC_SAP::control (int cmd, void *arg) const { ACE_TRACE ("ACE_IPC_SAP::control"); diff --git a/ace/Init_ACE.cpp b/ace/Init_ACE.cpp index 87fece39bde..d58574d07c3 100644 --- a/ace/Init_ACE.cpp +++ b/ace/Init_ACE.cpp @@ -2,10 +2,6 @@ #include "ace/Object_Manager.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/Init_ACE.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - ACE_RCSID (ace, Init_ACE, "$Id$") diff --git a/ace/Init_ACE.h b/ace/Init_ACE.h index c5707ae76af..487fe4da176 100644 --- a/ace/Init_ACE.h +++ b/ace/Init_ACE.h @@ -60,10 +60,6 @@ private: static unsigned int init_fini_count_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/Init_ACE.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - #include /**/ "ace/post.h" #endif /* ACE_INIT_ACE_H */ diff --git a/ace/Init_ACE.i b/ace/Init_ACE.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/ace/Init_ACE.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/ace/LSOCK.cpp b/ace/LSOCK.cpp index 5a0e87bd8c3..67b1236efc1 100644 --- a/ace/LSOCK.cpp +++ b/ace/LSOCK.cpp @@ -9,9 +9,9 @@ ACE_RCSID(ace, LSOCK, "$Id$") #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_socket.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/LSOCK.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK) diff --git a/ace/LSOCK.h b/ace/LSOCK.h index 2e2ee11cc49..662e8604d02 100644 --- a/ace/LSOCK.h +++ b/ace/LSOCK.h @@ -56,7 +56,7 @@ protected: /// Default constructor. ACE_LSOCK (void); - /// Initialize based on <handle> + /// Initialize based on @a handle. ACE_LSOCK (ACE_HANDLE handle); /// Get handle. @@ -70,9 +70,9 @@ private: ACE_HANDLE aux_handle_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/LSOCK.i" -#endif +#endif /* __ACE_INLINE__ */ #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ #include /**/ "ace/post.h" diff --git a/ace/LSOCK.i b/ace/LSOCK.i index c5b0057fa0e..fcd0e6887fc 100644 --- a/ace/LSOCK.i +++ b/ace/LSOCK.i @@ -1,11 +1,9 @@ /* -*- C++ -*- */ // $Id$ -// LSOCK.i +// Simple-minded constructor. -// Simple-minded constructor. - -ASYS_INLINE +ACE_INLINE ACE_LSOCK::ACE_LSOCK (void) : aux_handle_ (ACE_INVALID_HANDLE) { @@ -14,7 +12,7 @@ ACE_LSOCK::ACE_LSOCK (void) // Sets the underlying file descriptor. -ASYS_INLINE void +ACE_INLINE void ACE_LSOCK::set_handle (ACE_HANDLE handle) { ACE_TRACE ("ACE_LSOCK::set_handle"); @@ -23,16 +21,16 @@ ACE_LSOCK::set_handle (ACE_HANDLE handle) // Gets the underlying file descriptor. -ASYS_INLINE ACE_HANDLE +ACE_INLINE ACE_HANDLE ACE_LSOCK::get_handle (void) const { ACE_TRACE ("ACE_LSOCK::get_handle"); return this->aux_handle_; } -// Sets the underlying file descriptor. +// Sets the underlying file descriptor. -ASYS_INLINE +ACE_INLINE ACE_LSOCK::ACE_LSOCK (ACE_HANDLE handle) : aux_handle_ (handle) { diff --git a/ace/LSOCK_Acceptor.cpp b/ace/LSOCK_Acceptor.cpp index 67c86e446c3..7d700f5e566 100644 --- a/ace/LSOCK_Acceptor.cpp +++ b/ace/LSOCK_Acceptor.cpp @@ -1,10 +1,12 @@ -// LSOCK_Acceptor.cpp // $Id$ #include "ace/LSOCK_Acceptor.h" + #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) #include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_socket.h" ACE_RCSID(ace, LSOCK_Acceptor, "$Id$") @@ -12,7 +14,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Acceptor) // Return the local endpoint address. -int +int ACE_LSOCK_Acceptor::get_local_addr (ACE_Addr &a) const { ACE_TRACE ("ACE_LSOCK_Acceptor::get_local_addr"); @@ -44,24 +46,24 @@ ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor (void) } int -ACE_LSOCK_Acceptor::open (const ACE_Addr &remote_sap, - int reuse_addr, - int protocol_family, - int backlog, +ACE_LSOCK_Acceptor::open (const ACE_Addr &remote_sap, + int reuse_addr, + int protocol_family, + int backlog, int protocol) { ACE_TRACE ("ACE_LSOCK_Acceptor::open"); this->local_addr_ = *((ACE_UNIX_Addr *) &remote_sap); // This is a gross hack... - return ACE_SOCK_Acceptor::open (remote_sap, reuse_addr, + return ACE_SOCK_Acceptor::open (remote_sap, reuse_addr, protocol_family, backlog, protocol); } // General purpose routine for performing server ACE_SOCK creation. -ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor (const ACE_Addr &remote_sap, - int reuse_addr, - int protocol_family, - int backlog, +ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor (const ACE_Addr &remote_sap, + int reuse_addr, + int protocol_family, + int backlog, int protocol) { ACE_TRACE ("ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor"); @@ -78,7 +80,7 @@ ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor (const ACE_Addr &remote_sap, int ACE_LSOCK_Acceptor::accept (ACE_LSOCK_Stream &new_stream, - ACE_Addr *remote_addr, + ACE_Addr *remote_addr, ACE_Time_Value *timeout, int restart, int reset_new_handle) const @@ -105,14 +107,14 @@ ACE_LSOCK_Acceptor::accept (ACE_LSOCK_Stream &new_stream, new_stream.set_handle (ACE_OS::accept (this->get_handle (), addr, &len)); - while (new_stream.get_handle () == ACE_INVALID_HANDLE + while (new_stream.get_handle () == ACE_INVALID_HANDLE && restart != 0 && errno == EINTR && timeout == 0); // Reset the size of the addr, which is only necessary for UNIX // domain sockets. - if (new_stream.get_handle () != ACE_INVALID_HANDLE + if (new_stream.get_handle () != ACE_INVALID_HANDLE && remote_addr != 0) remote_addr->set_size (len); } @@ -130,7 +132,7 @@ ACE_LSOCK_Acceptor::remove (void) { ACE_TRACE ("ACE_LSOCK_Acceptor::remove"); int result = this->close (); - return ACE_OS::unlink (this->local_addr_.get_path_name ()) == -1 + return ACE_OS::unlink (this->local_addr_.get_path_name ()) == -1 || result == -1 ? -1 : 0; } diff --git a/ace/LSOCK_CODgram.cpp b/ace/LSOCK_CODgram.cpp index 42f2c9eb324..080970a6f08 100644 --- a/ace/LSOCK_CODgram.cpp +++ b/ace/LSOCK_CODgram.cpp @@ -8,9 +8,9 @@ ACE_RCSID(ace, LSOCK_CODgram, "$Id$") -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/LSOCK_CODgram.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_CODgram) @@ -30,13 +30,13 @@ ACE_LSOCK_CODgram::dump (void) const /* Here's the general-purpose open routine. */ int -ACE_LSOCK_CODgram::open (const ACE_Addr &remote, - const ACE_Addr &local, - int protocol_family, +ACE_LSOCK_CODgram::open (const ACE_Addr &remote, + const ACE_Addr &local, + int protocol_family, int protocol) { ACE_TRACE ("ACE_LSOCK_CODgram::open"); - if (ACE_SOCK_CODgram::open (remote, local, protocol_family, + if (ACE_SOCK_CODgram::open (remote, local, protocol_family, protocol) == -1) return -1; ACE_LSOCK::set_handle (this->get_handle ()); @@ -45,13 +45,13 @@ ACE_LSOCK_CODgram::open (const ACE_Addr &remote, /* Create a local ACE_SOCK datagram. */ -ACE_LSOCK_CODgram::ACE_LSOCK_CODgram (const ACE_Addr &remote, - const ACE_Addr &local, - int protocol_family, +ACE_LSOCK_CODgram::ACE_LSOCK_CODgram (const ACE_Addr &remote, + const ACE_Addr &local, + int protocol_family, int protocol) { ACE_TRACE ("ACE_LSOCK_CODgram::ACE_LSOCK_CODgram"); - if (this->open (remote, local, protocol_family, + if (this->open (remote, local, protocol_family, protocol) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_LSOCK_CODgram"))); } diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h index f1361d197f1..1025c6fadbd 100644 --- a/ace/LSOCK_CODgram.h +++ b/ace/LSOCK_CODgram.h @@ -65,9 +65,9 @@ public: ACE_ALLOC_HOOK_DECLARE; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/LSOCK_CODgram.i" -#endif +#endif /* __ACE_INLINE__ */ #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ #include /**/ "ace/post.h" diff --git a/ace/LSOCK_CODgram.i b/ace/LSOCK_CODgram.i index 80a6071770c..48c7280459f 100644 --- a/ace/LSOCK_CODgram.i +++ b/ace/LSOCK_CODgram.i @@ -1,17 +1,15 @@ /* -*- C++ -*- */ // $Id$ -// LSOCK_CODgram.i +// Do nothing constructor. -// Do nothing constructor. - -ASYS_INLINE +ACE_INLINE ACE_LSOCK_CODgram::ACE_LSOCK_CODgram (void) { ACE_TRACE ("ACE_LSOCK_CODgram::ACE_LSOCK_CODgram"); } -ASYS_INLINE void +ACE_INLINE void ACE_LSOCK_CODgram::set_handle (ACE_HANDLE h) { ACE_TRACE ("ACE_LSOCK_CODgram::set_handle"); @@ -19,7 +17,7 @@ ACE_LSOCK_CODgram::set_handle (ACE_HANDLE h) this->ACE_LSOCK::set_handle (h); } -ASYS_INLINE ACE_HANDLE +ACE_INLINE ACE_HANDLE ACE_LSOCK_CODgram::get_handle (void) const { ACE_TRACE ("ACE_LSOCK_CODgram::get_handle"); diff --git a/ace/LSOCK_Connector.cpp b/ace/LSOCK_Connector.cpp index 382e5ab3685..43aa65246c4 100644 --- a/ace/LSOCK_Connector.cpp +++ b/ace/LSOCK_Connector.cpp @@ -1,4 +1,3 @@ -// LSOCK_Connector.cpp // $Id$ #include "ace/LSOCK_Connector.h" @@ -8,9 +7,9 @@ ACE_RCSID(ace, LSOCK_Connector, "$Id$") -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/LSOCK_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Connector) @@ -32,8 +31,8 @@ ACE_LSOCK_Connector::ACE_LSOCK_Connector (void) } // Establish a connection. -ACE_LSOCK_Connector::ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream, - const ACE_UNIX_Addr &remote_sap, +ACE_LSOCK_Connector::ACE_LSOCK_Connector (ACE_LSOCK_Stream &new_stream, + const ACE_UNIX_Addr &remote_sap, ACE_Time_Value *timeout, const ACE_Addr &local_sap, int reuse_addr, diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h index 9e4bf34701d..bff88675e18 100644 --- a/ace/LSOCK_Connector.h +++ b/ace/LSOCK_Connector.h @@ -78,9 +78,9 @@ public: ACE_ALLOC_HOOK_DECLARE; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/LSOCK_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ #include /**/ "ace/post.h" diff --git a/ace/LSOCK_Connector.i b/ace/LSOCK_Connector.i index 1f3d6781771..3638a687297 100644 --- a/ace/LSOCK_Connector.i +++ b/ace/LSOCK_Connector.i @@ -1,13 +1,11 @@ /* -*- C++ -*- */ // $Id$ -// LSOCK_Connector.i - // Establish a connection. -ASYS_INLINE int -ACE_LSOCK_Connector::connect (ACE_LSOCK_Stream &new_stream, - const ACE_UNIX_Addr &remote_sap, +ACE_INLINE int +ACE_LSOCK_Connector::connect (ACE_LSOCK_Stream &new_stream, + const ACE_UNIX_Addr &remote_sap, ACE_Time_Value *timeout, const ACE_Addr &local_sap, int reuse_addr, @@ -15,8 +13,8 @@ ACE_LSOCK_Connector::connect (ACE_LSOCK_Stream &new_stream, int perms) { ACE_TRACE ("ACE_LSOCK_Connector::connect"); - int result = ACE_SOCK_Connector::connect (new_stream, remote_sap, - timeout, local_sap, + int result = ACE_SOCK_Connector::connect (new_stream, remote_sap, + timeout, local_sap, reuse_addr, flags, perms); if (result != -1) // This is necessary due to the weird inheritance relationships of ACE_LSOCK_Stream. diff --git a/ace/LSOCK_Dgram.cpp b/ace/LSOCK_Dgram.cpp index 0ef6755e0a9..f31f5e56d73 100644 --- a/ace/LSOCK_Dgram.cpp +++ b/ace/LSOCK_Dgram.cpp @@ -7,9 +7,9 @@ ACE_RCSID(ace, LSOCK_Dgram, "$Id$") -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/LSOCK_Dgram.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Dgram) @@ -26,7 +26,7 @@ ACE_LSOCK_Dgram::dump (void) const #endif /* ACE_HAS_DUMP */ } -// The "do nothing" constructor. +// The "do nothing" constructor. ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (void) { @@ -36,28 +36,28 @@ ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (void) // Here's the general-purpose open routine. int -ACE_LSOCK_Dgram::open (const ACE_Addr &local, - int protocol_family, +ACE_LSOCK_Dgram::open (const ACE_Addr &local, + int protocol_family, int protocol) { ACE_TRACE ("ACE_LSOCK_Dgram::open"); if (ACE_SOCK_Dgram::open (local, - protocol_family, + protocol_family, protocol) == -1) return -1; ACE_LSOCK::set_handle (this->ACE_SOCK_Dgram::get_handle ()); return 0; } -// Create a local ACE_SOCK datagram. +// Create a local ACE_SOCK datagram. -ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (const ACE_Addr &local, - int protocol_family, +ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (const ACE_Addr &local, + int protocol_family, int protocol) { ACE_TRACE ("ACE_LSOCK_Dgram::ACE_LSOCK_Dgram"); - if (this->open (local, - protocol_family, + if (this->open (local, + protocol_family, protocol) == -1) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h index 5a1fe40110d..ad7ed1afddc 100644 --- a/ace/LSOCK_Dgram.h +++ b/ace/LSOCK_Dgram.h @@ -62,9 +62,9 @@ public: ACE_ALLOC_HOOK_DECLARE; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/LSOCK_Dgram.i" -#endif +#endif /* __ACE_INLINE__ */ #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ #include /**/ "ace/post.h" diff --git a/ace/LSOCK_Dgram.i b/ace/LSOCK_Dgram.i index ffc1890d12b..14c415ceaa8 100644 --- a/ace/LSOCK_Dgram.i +++ b/ace/LSOCK_Dgram.i @@ -3,7 +3,7 @@ // LSOCK_Dgram.i -ASYS_INLINE void +ACE_INLINE void ACE_LSOCK_Dgram::set_handle (ACE_HANDLE h) { ACE_TRACE ("ACE_LSOCK_Dgram::set_handle"); @@ -11,7 +11,7 @@ ACE_LSOCK_Dgram::set_handle (ACE_HANDLE h) this->ACE_LSOCK::set_handle (h); } -ASYS_INLINE ACE_HANDLE +ACE_INLINE ACE_HANDLE ACE_LSOCK_Dgram::get_handle (void) const { ACE_TRACE ("ACE_LSOCK_Dgram::get_handle"); diff --git a/ace/LSOCK_Stream.cpp b/ace/LSOCK_Stream.cpp index 6340d3d57e4..3af27239ec4 100644 --- a/ace/LSOCK_Stream.cpp +++ b/ace/LSOCK_Stream.cpp @@ -5,12 +5,13 @@ #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) #include "ace/Log_Msg.h" +#include "ace/OS_NS_sys_socket.h" ACE_RCSID(ace, LSOCK_Stream, "$Id$") -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/LSOCK_Stream.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Stream) @@ -60,8 +61,8 @@ ACE_LSOCK_Stream::dump (void) const // handle. ssize_t -ACE_LSOCK_Stream::send_msg (const iovec iov[], - size_t n, +ACE_LSOCK_Stream::send_msg (const iovec iov[], + size_t n, ACE_HANDLE handle) { ACE_TRACE ("ACE_LSOCK_Stream::send_msg"); @@ -89,7 +90,7 @@ ACE_LSOCK_Stream::send_msg (const iovec iov[], send_msg.msg_accrightslen = sizeof handle; #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */ - return ACE_OS::sendmsg (this->ACE_SOCK_Stream::get_handle (), + return ACE_OS::sendmsg (this->ACE_SOCK_Stream::get_handle (), &send_msg, 0); } @@ -97,8 +98,8 @@ ACE_LSOCK_Stream::send_msg (const iovec iov[], // handle. ssize_t -ACE_LSOCK_Stream::recv_msg (iovec iov[], - size_t n, +ACE_LSOCK_Stream::recv_msg (iovec iov[], + size_t n, ACE_HANDLE &handle) { ACE_TRACE ("ACE_LSOCK_Stream::recv_msg"); @@ -107,7 +108,7 @@ ACE_LSOCK_Stream::recv_msg (iovec iov[], char cmsgbuf[ACE_BSD_CONTROL_MSG_LEN]; cmsghdr *cmsgptr = (cmsghdr *) cmsgbuf; #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */ - + recv_msg.msg_iov = (iovec *) iov; recv_msg.msg_iovlen = n; recv_msg.msg_name = 0; @@ -116,7 +117,7 @@ ACE_LSOCK_Stream::recv_msg (iovec iov[], #if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG) recv_msg.msg_control = cmsgbuf; recv_msg.msg_controllen = sizeof cmsgbuf; - ssize_t result = ACE_OS::recvmsg (this->ACE_SOCK_Stream::get_handle (), + ssize_t result = ACE_OS::recvmsg (this->ACE_SOCK_Stream::get_handle (), &recv_msg, 0); handle = *(ACE_HANDLE*) CMSG_DATA (cmsgptr) ; return result; @@ -124,7 +125,7 @@ ACE_LSOCK_Stream::recv_msg (iovec iov[], recv_msg.msg_accrights = (char *) &handle; recv_msg.msg_accrightslen = sizeof handle; - return ACE_OS::recvmsg (this->ACE_SOCK_Stream::get_handle (), + return ACE_OS::recvmsg (this->ACE_SOCK_Stream::get_handle (), &recv_msg, 0); #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */ } diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h index d1c2434f114..c1089322583 100644 --- a/ace/LSOCK_Stream.h +++ b/ace/LSOCK_Stream.h @@ -69,9 +69,9 @@ public: int get_remote_addr (ACE_Addr &) const; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/LSOCK_Stream.i" -#endif +#endif /* __ACE_INLINE__ */ #endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ #include /**/ "ace/post.h" diff --git a/ace/LSOCK_Stream.i b/ace/LSOCK_Stream.i index 6ee0a6f90c7..7b94768e3c7 100644 --- a/ace/LSOCK_Stream.i +++ b/ace/LSOCK_Stream.i @@ -1,12 +1,10 @@ /* -*- C++ -*- */ // $Id$ -// LSOCK_Stream.i - // Sets both the file descriptors... Overrides handle from the base // classes. -ASYS_INLINE void +ACE_INLINE void ACE_LSOCK_Stream::set_handle (ACE_HANDLE fd) { ACE_TRACE ("ACE_LSOCK_Stream::set_handle"); @@ -14,7 +12,7 @@ ACE_LSOCK_Stream::set_handle (ACE_HANDLE fd) this->ACE_LSOCK::set_handle (fd); } -ASYS_INLINE ACE_HANDLE +ACE_INLINE ACE_HANDLE ACE_LSOCK_Stream::get_handle (void) const { ACE_TRACE ("ACE_LSOCK_Stream::get_handle"); diff --git a/ace/Lib_Find.h b/ace/Lib_Find.h index fbb7a0eae69..fefcce6439b 100644 --- a/ace/Lib_Find.h +++ b/ace/Lib_Find.h @@ -99,9 +99,5 @@ class ACE_Export ACE_Lib_Find #endif /* ACE_HAS_WCHAR */ }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/Lib_Find.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - #include /**/ "ace/post.h" #endif /* ACE_LIB_FIND_H */ diff --git a/ace/Lib_Find.i b/ace/Lib_Find.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/ace/Lib_Find.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index ca0151370a4..3b058d04b6f 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -18,6 +18,7 @@ #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_wchar.h" #include "ace/OS_NS_signal.h" +#include "ace/OS_NS_unistd.h" #if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE != 0) # include "ace/Object_Manager_Base.h" diff --git a/ace/Log_Msg_NT_Event_Log.cpp b/ace/Log_Msg_NT_Event_Log.cpp index 4ff80f11d7f..1d51bbad03b 100644 --- a/ace/Log_Msg_NT_Event_Log.cpp +++ b/ace/Log_Msg_NT_Event_Log.cpp @@ -8,6 +8,7 @@ #include "ace/Log_Msg.h" #include "ace/Log_Record.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" ACE_RCSID(ace, Log_Msg_NT_Event_Log, "$Id$") diff --git a/ace/Log_Msg_UNIX_Syslog.cpp b/ace/Log_Msg_UNIX_Syslog.cpp index 82a15b48bdf..9957ae90575 100644 --- a/ace/Log_Msg_UNIX_Syslog.cpp +++ b/ace/Log_Msg_UNIX_Syslog.cpp @@ -8,6 +8,7 @@ #include "ace/Log_Msg.h" #include "ace/Log_Msg_UNIX_Syslog.h" #include "ace/Log_Record.h" +#include "ace/OS_NS_string.h" #include "ace/os_include/os_syslog.h" // NOTE: diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp index c9df01d2b7c..e1ba6af5a1d 100644 --- a/ace/Log_Record.cpp +++ b/ace/Log_Record.cpp @@ -2,15 +2,15 @@ #include "ace/Log_Record.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -# include "ace/Log_Record.i" -#endif - #include "ace/Log_Msg.h" #include "ace/ACE.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_time.h" +#if !defined (__ACE_INLINE__) +# include "ace/Log_Record.i" +#endif /* __ACE_INLINE__ */ + #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) // FUZZ: disable check_for_streams_include # include "ace/streams.h" diff --git a/ace/Log_Record.h b/ace/Log_Record.h index 6d92f1ef9eb..3a4af02cf6b 100644 --- a/ace/Log_Record.h +++ b/ace/Log_Record.h @@ -193,9 +193,9 @@ private: static const ACE_TCHAR *priority_names_[]; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/Log_Record.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_LOG_RECORD_H */ diff --git a/ace/Log_Record.i b/ace/Log_Record.i index c30d974e313..b670116ce00 100644 --- a/ace/Log_Record.i +++ b/ace/Log_Record.i @@ -1,18 +1,17 @@ /* -*- C++ -*- */ // $Id$ -// Log_Record.i #include "ace/Global_Macros.h" #include "ace/os_include/arpa/os_inet.h" #include "ace/Time_Value.h" #include "ace/OS_NS_string.h" -ASYS_INLINE +ACE_INLINE ACE_Log_Record::~ACE_Log_Record (void) { } -ASYS_INLINE void +ACE_INLINE void ACE_Log_Record::encode (void) { ACE_TRACE ("ACE_Log_Record::encode"); @@ -25,7 +24,7 @@ ACE_Log_Record::encode (void) this->pid_ = htonl (this->pid_); } -ASYS_INLINE void +ACE_INLINE void ACE_Log_Record::decode (void) { ACE_TRACE ("ACE_Log_Record::decode"); @@ -39,42 +38,42 @@ ACE_Log_Record::decode (void) this->length_ = ntohl (this->length_); } -ASYS_INLINE long +ACE_INLINE long ACE_Log_Record::type (void) const { ACE_TRACE ("ACE_Log_Record::type"); return (long) this->type_; } -ASYS_INLINE void +ACE_INLINE void ACE_Log_Record::type (long t) { ACE_TRACE ("ACE_Log_Record::type"); this->type_ = (ACE_UINT32) t; } -ASYS_INLINE long +ACE_INLINE long ACE_Log_Record::length (void) const { ACE_TRACE ("ACE_Log_Record::length"); return (long) this->length_; } -ASYS_INLINE void +ACE_INLINE void ACE_Log_Record::length (long l) { ACE_TRACE ("ACE_Log_Record::length"); this->length_ = static_cast<ACE_UINT32> (l); } -ASYS_INLINE ACE_Time_Value +ACE_INLINE ACE_Time_Value ACE_Log_Record::time_stamp (void) const { ACE_TRACE ("ACE_Log_Record::time_stamp"); return ACE_Time_Value ((long) this->secs_, (long) this->usecs_); } -ASYS_INLINE void +ACE_INLINE void ACE_Log_Record::time_stamp (const ACE_Time_Value &ts) { ACE_TRACE ("ACE_Log_Record::time_stamp"); @@ -82,28 +81,28 @@ ACE_Log_Record::time_stamp (const ACE_Time_Value &ts) this->usecs_ = (ACE_UINT32) ts.usec (); } -ASYS_INLINE long +ACE_INLINE long ACE_Log_Record::pid (void) const { ACE_TRACE ("ACE_Log_Record::pid"); return (long) this->pid_; } -ASYS_INLINE void +ACE_INLINE void ACE_Log_Record::pid (long p) { ACE_TRACE ("ACE_Log_Record::pid"); this->pid_ = (ACE_UINT32) p; } -ASYS_INLINE const ACE_TCHAR * +ACE_INLINE const ACE_TCHAR * ACE_Log_Record::msg_data (void) const { ACE_TRACE ("ACE_Log_Record::msg_data"); return this->msg_data_; } -ASYS_INLINE size_t +ACE_INLINE size_t ACE_Log_Record::msg_data_len (void) const { ACE_TRACE ("ACE_Log_Record::msg_data_len"); diff --git a/ace/Logging_Strategy.cpp b/ace/Logging_Strategy.cpp index 133cf427c93..e6082f71397 100644 --- a/ace/Logging_Strategy.cpp +++ b/ace/Logging_Strategy.cpp @@ -12,6 +12,7 @@ #include "ace/Reactor.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(lib, Logging_Strategy, "$Id$") @@ -231,7 +232,7 @@ ACE_Logging_Strategy::ACE_Logging_Strategy (void) ACE_TCHAR[MAXPATHLEN + 1]); // Get the temporary directory - if (ACE_Lib_Find::get_temp_dir + if (ACE_Lib_Find::get_temp_dir (this->filename_, MAXPATHLEN - 7) == -1) // 7 for "logfile" { @@ -256,7 +257,7 @@ ACE_Logging_Strategy::fini (void) delete [] this->logger_key_; delete [] this->program_name_; - if (this->reactor () && + if (this->reactor () && this->interval_ > 0 && this->max_size_ > 0) this->reactor ()->cancel_timer (this); @@ -315,12 +316,12 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[]) ofstream *output_file = 0; // Create a new ofstream to direct output to the file. if (wipeout_logfile_) - ACE_NEW_RETURN + ACE_NEW_RETURN (output_file, ofstream (ACE_TEXT_ALWAYS_CHAR (this->filename_)), -1); else - ACE_NEW_RETURN + ACE_NEW_RETURN (output_file, ofstream (ACE_TEXT_ALWAYS_CHAR (this->filename_), ios::app | ios::out), @@ -341,9 +342,9 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[]) { if (this->reactor () == 0) // Use singleton. - this->reactor (ACE_Reactor::instance ()); + this->reactor (ACE_Reactor::instance ()); - this->reactor ()->schedule_timer + this->reactor ()->schedule_timer (this, 0, ACE_Time_Value (this->interval_), ACE_Time_Value (this->interval_)); @@ -382,7 +383,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, ACE_OS::fclose (output_file); // We'll call msg_ostream() modifier later. #else - ofstream *output_file = + ofstream *output_file = (ofstream *) this->log_msg_->msg_ostream (); output_file->close (); #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ @@ -467,7 +468,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, } else { - if (fixed_number_ && count_>max_file_number_) + if (fixed_number_ && count_>max_file_number_) count_ = 1; // start over from 1 ACE_OS::sprintf (backup, @@ -509,7 +510,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, return 0; } -void +void ACE_Logging_Strategy::log_msg (ACE_Log_Msg *log_msg) { this->log_msg_ = log_msg; diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp index a54a7325831..dc5fc35d68c 100644 --- a/ace/MEM_Acceptor.cpp +++ b/ace/MEM_Acceptor.cpp @@ -5,11 +5,13 @@ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/MEM_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/OS_NS_unistd.h" + +#if !defined (__ACE_INLINE__) +#include "ace/MEM_Acceptor.i" +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, MEM_Acceptor, "$Id$") diff --git a/ace/MEM_Acceptor.h b/ace/MEM_Acceptor.h index fd561521b76..cef32124920 100644 --- a/ace/MEM_Acceptor.h +++ b/ace/MEM_Acceptor.h @@ -176,9 +176,9 @@ private: ACE_MEM_IO::Signal_Strategy preferred_strategy_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/MEM_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/MEM_Acceptor.i b/ace/MEM_Acceptor.i index 07d723c813d..d7e3f66f18f 100644 --- a/ace/MEM_Acceptor.i +++ b/ace/MEM_Acceptor.i @@ -1,9 +1,7 @@ /* -*- C++ -*- */ // $Id$ -// MEM_Acceptor.i - -ASYS_INLINE int +ACE_INLINE int ACE_MEM_Acceptor::open (const ACE_Addr &local_sap, ACE_Protocol_Info *protocolinfo, ACE_SOCK_GROUP g, @@ -18,7 +16,7 @@ ACE_MEM_Acceptor::open (const ACE_Addr &local_sap, backlog, protocol); } -ASYS_INLINE int +ACE_INLINE int ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_addr, ACE_Time_Value *timeout, @@ -30,7 +28,7 @@ ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, } #if !defined (ACE_HAS_WINCE) -ASYS_INLINE int +ACE_INLINE int ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, ACE_Accept_QoS_Params qos_params, ACE_Addr *remote_addr, @@ -43,7 +41,7 @@ ACE_MEM_Acceptor::accept (ACE_SOCK_Stream &new_stream, } #endif // ACE_HAS_WINCE -ASYS_INLINE int +ACE_INLINE int ACE_MEM_Acceptor::get_local_addr (ACE_MEM_Addr &sap) const { ACE_INET_Addr temp; @@ -53,13 +51,13 @@ ACE_MEM_Acceptor::get_local_addr (ACE_MEM_Addr &sap) const return 0; } -ASYS_INLINE const ACE_TCHAR * +ACE_INLINE const ACE_TCHAR * ACE_MEM_Acceptor::mmap_prefix (void) const { return this->mmap_prefix_; } -ASYS_INLINE void +ACE_INLINE void ACE_MEM_Acceptor::mmap_prefix (const ACE_TCHAR *prefix) { if (prefix == 0) @@ -72,25 +70,25 @@ ACE_MEM_Acceptor::mmap_prefix (const ACE_TCHAR *prefix) } } -ASYS_INLINE ACE_MEM_IO::Signal_Strategy +ACE_INLINE ACE_MEM_IO::Signal_Strategy ACE_MEM_Acceptor::preferred_strategy (void) const { return this->preferred_strategy_; } -ASYS_INLINE void +ACE_INLINE void ACE_MEM_Acceptor::preferred_strategy (ACE_MEM_IO::Signal_Strategy strategy) { this->preferred_strategy_ = strategy; } -ASYS_INLINE void +ACE_INLINE void ACE_MEM_Acceptor::init_buffer_size (off_t bytes) { this->malloc_options_.minimum_bytes_ = bytes; } -ASYS_INLINE ACE_MEM_SAP::MALLOC_OPTIONS & +ACE_INLINE ACE_MEM_SAP::MALLOC_OPTIONS & ACE_MEM_Acceptor::malloc_options (void) { // @@ This function has been deprecated and will be removed in the diff --git a/ace/MEM_Connector.cpp b/ace/MEM_Connector.cpp index 7722c35d60b..76055af6fcf 100644 --- a/ace/MEM_Connector.cpp +++ b/ace/MEM_Connector.cpp @@ -7,9 +7,9 @@ ACE_RCSID(ace, MEM_Connector, "$Id$") #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/MEM_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Connector) diff --git a/ace/MEM_Connector.h b/ace/MEM_Connector.h index ac086e9c35a..78829dde268 100644 --- a/ace/MEM_Connector.h +++ b/ace/MEM_Connector.h @@ -139,7 +139,7 @@ public: void preferred_strategy (ACE_MEM_IO::Signal_Strategy strategy); /// Accessor to underlying malloc options. - /// This method has been deprecated. + /// @deprecated This method has been deprecated. ACE_MEM_SAP::MALLOC_OPTIONS &malloc_options (void); // = Meta-type info @@ -164,9 +164,9 @@ private: ACE_MEM_IO::Signal_Strategy preferred_strategy_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/MEM_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/MEM_Connector.i b/ace/MEM_Connector.i index d1b06cce369..15bf7c9ee75 100644 --- a/ace/MEM_Connector.i +++ b/ace/MEM_Connector.i @@ -5,19 +5,19 @@ // Establish a connection. -ASYS_INLINE ACE_MEM_IO::Signal_Strategy +ACE_INLINE ACE_MEM_IO::Signal_Strategy ACE_MEM_Connector::preferred_strategy (void) const { return this->preferred_strategy_; } -ASYS_INLINE void +ACE_INLINE void ACE_MEM_Connector::preferred_strategy (ACE_MEM_IO::Signal_Strategy strategy) { this->preferred_strategy_ = strategy; } -ASYS_INLINE ACE_MEM_SAP::MALLOC_OPTIONS & +ACE_INLINE ACE_MEM_SAP::MALLOC_OPTIONS & ACE_MEM_Connector::malloc_options (void) { // @@ This function has been deprecated and will be removed in the diff --git a/ace/MEM_IO.cpp b/ace/MEM_IO.cpp index 1a47bd5d45f..abe94666726 100644 --- a/ace/MEM_IO.cpp +++ b/ace/MEM_IO.cpp @@ -6,9 +6,9 @@ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/MEM_IO.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, MEM_IO, "$Id$") diff --git a/ace/MEM_IO.h b/ace/MEM_IO.h index 5317a2dc87d..f22c94f10de 100644 --- a/ace/MEM_IO.h +++ b/ace/MEM_IO.h @@ -294,9 +294,9 @@ private: ssize_t cur_offset_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/MEM_IO.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/MEM_IO.i b/ace/MEM_IO.i index 2f98ab2c273..f1b92817e1c 100644 --- a/ace/MEM_IO.i +++ b/ace/MEM_IO.i @@ -5,20 +5,20 @@ #include "ace/OS_NS_string.h" -ASYS_INLINE +ACE_INLINE ACE_Reactive_MEM_IO::ACE_Reactive_MEM_IO () { } #if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM) -ASYS_INLINE +ACE_INLINE ACE_MT_MEM_IO::Simple_Queue::Simple_Queue (void) : mq_ (0), malloc_ (0) { } -ASYS_INLINE +ACE_INLINE ACE_MT_MEM_IO::ACE_MT_MEM_IO () { this->recv_channel_.sema_ = 0; @@ -27,14 +27,14 @@ ACE_MT_MEM_IO::ACE_MT_MEM_IO () this->send_channel_.lock_ = 0; } -ASYS_INLINE +ACE_INLINE ACE_MT_MEM_IO::Simple_Queue::Simple_Queue (MQ_Struct *mq) : mq_ (mq), malloc_ (0) { } -ASYS_INLINE int +ACE_INLINE int ACE_MT_MEM_IO::Simple_Queue::init (MQ_Struct *mq, ACE_MEM_SAP::MALLOC_TYPE *malloc) { @@ -47,7 +47,7 @@ ACE_MT_MEM_IO::Simple_Queue::init (MQ_Struct *mq, } #endif /* ACE_WIN32 || !_ACE_USE_SV_SEM */ -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_Reactive_MEM_IO::get_buf_len (const off_t off, ACE_MEM_SAP_Node *&buf) { #if !defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) @@ -74,7 +74,7 @@ ACE_Reactive_MEM_IO::get_buf_len (const off_t off, ACE_MEM_SAP_Node *&buf) } // Send an n byte message to the connected socket. -ASYS_INLINE +ACE_INLINE ACE_MEM_IO::ACE_MEM_IO (void) : deliver_strategy_ (0), recv_buffer_ (0), @@ -84,7 +84,7 @@ ACE_MEM_IO::ACE_MEM_IO (void) // ACE_TRACE ("ACE_MEM_IO::ACE_MEM_IO"); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_IO::fetch_recv_buf (int flag, const ACE_Time_Value *timeout) { ACE_TRACE ("ACE_MEM_IO::fetch_recv_buf"); @@ -112,13 +112,13 @@ ACE_MEM_IO::fetch_recv_buf (int flag, const ACE_Time_Value *timeout) return retv; } -ASYS_INLINE +ACE_INLINE ACE_MEM_IO::~ACE_MEM_IO (void) { delete this->deliver_strategy_; } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_IO::send (const void *buf, size_t len, int flags, @@ -142,7 +142,7 @@ ACE_MEM_IO::send (const void *buf, timeout); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_IO::recv (void *buf, size_t len, int flags, @@ -177,7 +177,7 @@ ACE_MEM_IO::recv (void *buf, return count; } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_IO::send (const void *buf, size_t n, int flags) { ACE_TRACE ("ACE_MEM_IO::send"); @@ -186,7 +186,7 @@ ACE_MEM_IO::send (const void *buf, size_t n, int flags) // Recv an n byte message from the connected socket. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_IO::recv (void *buf, size_t n, int flags) { ACE_TRACE ("ACE_MEM_IO::recv"); @@ -195,7 +195,7 @@ ACE_MEM_IO::recv (void *buf, size_t n, int flags) // Send an n byte message to the connected socket. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_IO::send (const void *buf, size_t n) { ACE_TRACE ("ACE_MEM_IO::send"); @@ -204,7 +204,7 @@ ACE_MEM_IO::send (const void *buf, size_t n) // Recv an n byte message from the connected socket. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_IO::recv (void *buf, size_t n) { ACE_TRACE ("ACE_MEM_IO::recv"); @@ -212,7 +212,7 @@ ACE_MEM_IO::recv (void *buf, size_t n) return this->recv (buf, n, 0); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_IO::recv (void *buf, size_t len, const ACE_Time_Value *timeout) @@ -221,7 +221,7 @@ ACE_MEM_IO::recv (void *buf, return this->recv (buf, len, 0, timeout); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_IO::send (const void *buf, size_t len, const ACE_Time_Value *timeout) diff --git a/ace/MEM_SAP.cpp b/ace/MEM_SAP.cpp index 9caf5fe0a39..ebc4c8c3bc5 100644 --- a/ace/MEM_SAP.cpp +++ b/ace/MEM_SAP.cpp @@ -4,9 +4,9 @@ #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/MEM_SAP.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, MEM_SAP, "$Id$") diff --git a/ace/MEM_SAP.h b/ace/MEM_SAP.h index d7add40fb14..c726e16fb3f 100644 --- a/ace/MEM_SAP.h +++ b/ace/MEM_SAP.h @@ -151,9 +151,9 @@ protected: ACE_MEM_SAP (void); }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/MEM_SAP.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/MEM_SAP.i b/ace/MEM_SAP.i index 172231e303d..4b9483725b2 100644 --- a/ace/MEM_SAP.i +++ b/ace/MEM_SAP.i @@ -1,11 +1,9 @@ /* -*- C++ -*- */ // $Id$ -// MEM_SAP.i - #include "ace/RW_Thread_Mutex.h" -ASYS_INLINE +ACE_INLINE ACE_MEM_SAP_Node::ACE_MEM_SAP_Node (size_t cap) : capacity_ (cap), size_ (0), @@ -13,25 +11,25 @@ ACE_MEM_SAP_Node::ACE_MEM_SAP_Node (size_t cap) { } -ASYS_INLINE size_t +ACE_INLINE size_t ACE_MEM_SAP_Node::size (void) const { return this->size_; } -ASYS_INLINE size_t +ACE_INLINE size_t ACE_MEM_SAP_Node::capacity (void) const { return this->capacity_; } -ASYS_INLINE void * +ACE_INLINE void * ACE_MEM_SAP_Node::data (void) { return this + 1; } -ASYS_INLINE +ACE_INLINE ACE_MEM_SAP::~ACE_MEM_SAP (void) { // ACE_TRACE ("ACE_MEM_SAP::~ACE_MEM_SAP"); @@ -39,7 +37,7 @@ ACE_MEM_SAP::~ACE_MEM_SAP (void) } -ASYS_INLINE ACE_MEM_SAP_Node * +ACE_INLINE ACE_MEM_SAP_Node * ACE_MEM_SAP::acquire_buffer (const ssize_t size) { ACE_TRACE ("ACE_MEM_SAP::acquire_buffer"); @@ -56,7 +54,7 @@ ACE_MEM_SAP::acquire_buffer (const ssize_t size) return buf; } -ASYS_INLINE int +ACE_INLINE int ACE_MEM_SAP::release_buffer (ACE_MEM_SAP_Node *buf) { ACE_TRACE ("ACE_MEM_SAP::release_buffer"); diff --git a/ace/MEM_Stream.cpp b/ace/MEM_Stream.cpp index 99a3c29467c..5758b2bd12a 100644 --- a/ace/MEM_Stream.cpp +++ b/ace/MEM_Stream.cpp @@ -4,9 +4,10 @@ #include "ace/MEM_Stream.h" #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -#if defined (ACE_LACKS_INLINE_FUNCTIONS) + +#if !defined (__ACE_INLINE__) #include "ace/MEM_Stream.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, MEM_Stream, "$Id$") diff --git a/ace/MEM_Stream.h b/ace/MEM_Stream.h index 276d0fad292..d61b4c8992e 100644 --- a/ace/MEM_Stream.h +++ b/ace/MEM_Stream.h @@ -139,9 +139,9 @@ public: ACE_ALLOC_HOOK_DECLARE; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/MEM_Stream.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ diff --git a/ace/MEM_Stream.i b/ace/MEM_Stream.i index 07f68fafdd0..b92d4c7471f 100644 --- a/ace/MEM_Stream.i +++ b/ace/MEM_Stream.i @@ -1,30 +1,29 @@ /* -*- C++ -*- */ // $Id$ -// MEM_Stream.i - #include "ace/MEM_Stream.h" +#include "ace/OS_NS_sys_socket.h" -ASYS_INLINE +ACE_INLINE ACE_MEM_Stream::ACE_MEM_Stream (void) { // ACE_TRACE ("ACE_MEM_Stream::ACE_MEM_Stream"); } -ASYS_INLINE +ACE_INLINE ACE_MEM_Stream::ACE_MEM_Stream (ACE_HANDLE h) { // ACE_TRACE ("ACE_MEM_Stream::ACE_MEM_Stream"); this->set_handle (h); } -ASYS_INLINE +ACE_INLINE ACE_MEM_Stream::~ACE_MEM_Stream (void) { // ACE_TRACE ("ACE_MEM_Stream::~ACE_MEM_Stream"); } -ASYS_INLINE int +ACE_INLINE int ACE_MEM_Stream::close_reader (void) { ACE_TRACE ("ACE_MEM_Stream::close_reader"); @@ -36,7 +35,7 @@ ACE_MEM_Stream::close_reader (void) // Shut down just the writing end of a ACE_SOCK. -ASYS_INLINE int +ACE_INLINE int ACE_MEM_Stream::close_writer (void) { ACE_TRACE ("ACE_MEM_Stream::close_writer"); @@ -46,33 +45,33 @@ ACE_MEM_Stream::close_writer (void) return 0; } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::send_n (const void *buf, int n) { return this->send (buf, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::recv_n (void *buf, int n) { return this->recv (buf, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::send_n (const void *buf, int n, int flags) { return this->send (buf, n, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::recv_n (void *buf, int n, int flags) { return this->recv (buf, n, flags); } #if 0 -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::recv_n (void *buf, size_t len, int flags, @@ -86,7 +85,7 @@ ACE_MEM_Stream::recv_n (void *buf, timeout); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::recv_n (void *buf, size_t len, const ACE_Time_Value *timeout) const @@ -98,7 +97,7 @@ ACE_MEM_Stream::recv_n (void *buf, timeout); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::recvv_n (iovec iov[], size_t n, const ACE_Time_Value *timeout) const @@ -110,7 +109,7 @@ ACE_MEM_Stream::recvv_n (iovec iov[], timeout); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::send_n (const void *buf, size_t len, int flags, @@ -124,7 +123,7 @@ ACE_MEM_Stream::send_n (const void *buf, timeout); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::send_n (const void *buf, size_t len, const ACE_Time_Value *timeout) const @@ -136,7 +135,7 @@ ACE_MEM_Stream::send_n (const void *buf, timeout); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::sendv_n (iovec iov[], size_t n, const ACE_Time_Value *timeout) const @@ -148,7 +147,7 @@ ACE_MEM_Stream::sendv_n (iovec iov[], timeout); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::send_urg (const void *ptr, size_t len, const ACE_Time_Value *timeout) const @@ -161,7 +160,7 @@ ACE_MEM_Stream::send_urg (const void *ptr, timeout); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_MEM_Stream::recv_urg (void *ptr, size_t len, const ACE_Time_Value *timeout) const diff --git a/ace/Makefile.am b/ace/Makefile.am index a49343a9cb2..17d9bc14712 100644 --- a/ace/Makefile.am +++ b/ace/Makefile.am @@ -1091,7 +1091,6 @@ INLINE_FILES = \ DEV_IO.i \ Dirent.i \ Dynamic.i \ - Dynamic_Service_Base.i \ Dynamic_Service.i \ Env_Value_T.i \ Event_Handler.i \ @@ -1106,25 +1105,21 @@ INLINE_FILES = \ FILE.i \ FILE_IO.i \ Flag_Manip.i \ - FlReactor.i \ Free_List.i \ Functor.i \ Functor_String.inl \ Functor_T.i \ Get_Opt.i \ Handle_Gobbler.i \ - Handle_Ops.i \ Handle_Set.i \ Hash_Cache_Map_Manager_T.i \ Hash_Map_Manager_T.i \ Hash_Map_With_Allocator_T.i \ High_Res_Timer.i \ INET_Addr.i \ - Init_ACE.i \ IO_SAP.i \ IOStream_T.i \ IPC_SAP.i \ - Lib_Find.i \ Local_Tokens.i \ Log_Record.i \ LSOCK_CODgram.i \ @@ -1150,7 +1145,6 @@ INLINE_FILES = \ Message_Block_T.i \ Message_Queue.i \ Message_Queue_T.i \ - Metrics_Cache.i \ Metrics_Cache_T.i \ Module.i \ Msg_WFMO_Reactor.i \ @@ -1165,7 +1159,6 @@ INLINE_FILES = \ Parse_Node.i \ PI_Malloc.i \ Pipe.i \ - POSIX_Asynch_IO.i \ POSIX_CB_Proactor.i \ POSIX_Proactor.i \ Proactor.i \ @@ -1217,13 +1210,10 @@ INLINE_FILES = \ SV_Semaphore_Complex.i \ SV_Semaphore_Simple.i \ SV_Shared_Memory.i \ - Synch.i \ Synch_Options.i \ - Synch_T.i \ Task_Ex_T.i \ Task.i \ Task_T.i \ - Test_and_Set.i \ Thread.i \ Thread_Manager.i \ Timeprobe.i \ @@ -1256,7 +1246,6 @@ INLINE_FILES = \ CDR_Base.inl \ Cleanup.inl \ Codeset_Registry.inl \ - Condition_Recursive_Thread_Mutex.inl \ Condition_Thread_Mutex.inl \ Condition_T.inl \ Dev_Poll_Reactor.inl \ @@ -1264,7 +1253,6 @@ INLINE_FILES = \ Event.inl \ File_Lock.inl \ Framework_Component.inl \ - Framework_Component_T.inl \ Guard_T.inl \ Hashable.inl \ Intrusive_List.inl \ @@ -1274,8 +1262,6 @@ INLINE_FILES = \ Manual_Event.inl \ Mutex.inl \ Notification_Strategy.inl \ - Object_Manager_Base.inl \ - OS_Dirent.inl \ OS_Errno.inl \ OS_Log_Msg_Attributes.inl \ OS_Memory.inl \ @@ -1312,7 +1298,6 @@ INLINE_FILES = \ OS_NS_unistd.inl \ OS_NS_wchar.inl \ OS_String.inl \ - OS_Thread_Adapter.inl \ OS_TLI.inl \ Process_Mutex.inl \ Process_Semaphore.inl \ diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp index 5ff2ca0b4bc..758c9a7302c 100644 --- a/ace/Memory_Pool.cpp +++ b/ace/Memory_Pool.cpp @@ -14,6 +14,7 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_stat.h" #include "ace/OS_NS_sys_shm.h" +#include "ace/OS_NS_unistd.h" #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) #include "ace/Based_Pointer_T.h" diff --git a/ace/Metrics_Cache.cpp b/ace/Metrics_Cache.cpp index a901fa53bb5..f9a28c800f6 100644 --- a/ace/Metrics_Cache.cpp +++ b/ace/Metrics_Cache.cpp @@ -10,10 +10,6 @@ ACE_RCSID(ace, Metrics_Cache, "Metrics_Cache.cpp,v 4.18 1998/07/11 08:53:56 gonz #if defined (ACE_COMPILE_TIMEPROBES) -#if !defined (__ACE_INLINE__) -#include "ace/Metrics_Cache.i" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Metrics_Cache.h b/ace/Metrics_Cache.h index 5ef4208421f..2ec8c69344b 100644 --- a/ace/Metrics_Cache.h +++ b/ace/Metrics_Cache.h @@ -70,7 +70,7 @@ METRICS_PTR->report_##NAME##_stop(X); \ * * @param METRICS_PTR - Pointer to a initialized metrics cache * @param NAME - Name of defining function (e.g. ACE: enqueue/dequeue) - * @param X - Argument (ACE: u_int, TAO: RtecScheduler::handle_t) + * @param X - Argument (ACE: u_int, TAO: RtecScheduler::handle_t) */ # define PAUSE_DISPATCH_METRIC(METRICS_PTR,NAME,X) \ do { if((METRICS_PTR->metrics_enabled())) { \ @@ -85,7 +85,7 @@ METRICS_PTR->report_##NAME##_suspend(X); \ * * @param METRICS_PTR - Pointer to a initialized metrics cache * @param NAME - Name of defining function (e.g. ACE: enqueue/dequeue) - * @param X - Argument (ACE: u_int, TAO: RtecScheduler::handle_t) + * @param X - Argument (ACE: u_int, TAO: RtecScheduler::handle_t) */ # define RESUME_DISPATCH_METRIC(METRICS_PTR,NAME,X) \ do { if((METRICS_PTR->metrics_enabled())) { \ @@ -107,10 +107,6 @@ do { if((METRICS_PTR->metrics_enabled())) { \ METRICS_PTR->report_##NAME##_stop(); \ } } while (0) -#if defined (__ACE_INLINE__) -#include "ace/Metrics_Cache.i" -#endif /* __ACE_INLINE__ */ - #include "ace/Metrics_Cache_T.h" #include "ace/Singleton.h" diff --git a/ace/Metrics_Cache.i b/ace/Metrics_Cache.i deleted file mode 100644 index 74e88caa0c5..00000000000 --- a/ace/Metrics_Cache.i +++ /dev/null @@ -1,2 +0,0 @@ -// $Id$ - diff --git a/ace/Multihomed_INET_Addr.i b/ace/Multihomed_INET_Addr.i index 9cfb8ab2b9e..71ec578a177 100644 --- a/ace/Multihomed_INET_Addr.i +++ b/ace/Multihomed_INET_Addr.i @@ -1,8 +1,6 @@ /* -*- C++ -*- */ // $Id$ -// Multihomed_INET_Addr.i - // Accessor implementations ACE_INLINE size_t diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp index 009c58cab53..a490e919ed4 100644 --- a/ace/Naming_Context.cpp +++ b/ace/Naming_Context.cpp @@ -8,6 +8,7 @@ #include "ace/Memory_Pool.h" #include "ace/RW_Process_Mutex.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" #if defined (ACE_HAS_TRACE) # include "ace/OS_NS_strings.h" #endif /* ACE_HAS_TRACE */ diff --git a/ace/OS_Dirent.cpp b/ace/OS_Dirent.cpp index 8ca959263ed..a985c999068 100644 --- a/ace/OS_Dirent.cpp +++ b/ace/OS_Dirent.cpp @@ -4,7 +4,3 @@ ACE_RCSID(ace, OS_Dirent, "$Id$") -#if !defined (ACE_HAS_INLINED_OSCALLS) -# include "ace/OS_Dirent.inl" -#endif /* ACE_HAS_INLINED_OS_CALLS */ - diff --git a/ace/OS_Dirent.h b/ace/OS_Dirent.h index 34a5f58675b..1dddf694f6c 100644 --- a/ace/OS_Dirent.h +++ b/ace/OS_Dirent.h @@ -28,13 +28,5 @@ #include "ace/OS_NS_dirent.h" -# if defined (ACE_HAS_INLINED_OSCALLS) -# if defined (ACE_INLINE) -# undef ACE_INLINE -# endif /* ACE_INLINE */ -# define ACE_INLINE inline -# include "ace/OS_Dirent.inl" -# endif /* ACE_HAS_INLINED_OSCALLS */ - #include /**/ "ace/post.h" #endif /* ACE_OS_DIRENT_H */ diff --git a/ace/OS_Dirent.inl b/ace/OS_Dirent.inl deleted file mode 100644 index 7f2b3228624..00000000000 --- a/ace/OS_Dirent.inl +++ /dev/null @@ -1,3 +0,0 @@ -// -*- C++ -*- -// $Id$ - diff --git a/ace/OS_Log_Msg_Attributes.inl b/ace/OS_Log_Msg_Attributes.inl index d79e7fe90f8..3ece871ea06 100644 --- a/ace/OS_Log_Msg_Attributes.inl +++ b/ace/OS_Log_Msg_Attributes.inl @@ -1,3 +1,4 @@ +/* -*- C++ -*- */ // $Id$ ACE_INLINE diff --git a/ace/OS_Thread_Adapter.cpp b/ace/OS_Thread_Adapter.cpp index 745facaf9a9..85f8caf1670 100644 --- a/ace/OS_Thread_Adapter.cpp +++ b/ace/OS_Thread_Adapter.cpp @@ -6,10 +6,6 @@ ACE_RCSID (ace, OS_Thread_Adapter, "$Id$") -#if !defined (ACE_HAS_INLINED_OSCALLS) -# include "ace/OS_Thread_Adapter.inl" -#endif /* ACE_HAS_INLINED_OS_CALLS */ - #include "ace/Thread_Hook.h" #include "ace/Object_Manager_Base.h" #include "ace/Global_Macros.h" diff --git a/ace/OS_Thread_Adapter.h b/ace/OS_Thread_Adapter.h index 72e37081919..73ad99989e6 100644 --- a/ace/OS_Thread_Adapter.h +++ b/ace/OS_Thread_Adapter.h @@ -66,13 +66,5 @@ private: friend class ACE_Thread_Adapter_Has_Private_Destructor; }; -# if defined (ACE_HAS_INLINED_OSCALLS) -# if defined (ACE_INLINE) -# undef ACE_INLINE -# endif /* ACE_INLINE */ -# define ACE_INLINE inline -# include "ace/OS_Thread_Adapter.inl" -# endif /* ACE_HAS_INLINED_OSCALLS */ - #include /**/ "ace/post.h" #endif /* ACE_THREAD_ADAPTER_H */ diff --git a/ace/OS_Thread_Adapter.inl b/ace/OS_Thread_Adapter.inl deleted file mode 100644 index cfa1da318d3..00000000000 --- a/ace/OS_Thread_Adapter.inl +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/ace/Obchunk.i b/ace/Obchunk.i index 510c511d4f9..bffb7626155 100644 --- a/ace/Obchunk.i +++ b/ace/Obchunk.i @@ -1,8 +1,6 @@ /* -*- C++ -*- */ // $Id$ -// Obchunk.i - ACE_INLINE ACE_Obchunk::~ACE_Obchunk (void) { diff --git a/ace/Object_Manager_Base.cpp b/ace/Object_Manager_Base.cpp index c0d59cb4233..2e01dd24749 100644 --- a/ace/Object_Manager_Base.cpp +++ b/ace/Object_Manager_Base.cpp @@ -5,10 +5,6 @@ ACE_RCSID(ace, Object_Manager_Base, "$Id$") -#if !defined (ACE_HAS_INLINED_OSCALLS) -# include "ace/Object_Manager_Base.inl" -#endif /* ACE_HAS_INLINED_OS_CALLS */ - #include "ace/OS_Memory.h" #include "ace/OS_NS_Thread.h" #include "ace/OS_NS_sys_socket.h" diff --git a/ace/Object_Manager_Base.h b/ace/Object_Manager_Base.h index 9a1338b1fa9..5619b3af323 100644 --- a/ace/Object_Manager_Base.h +++ b/ace/Object_Manager_Base.h @@ -248,13 +248,5 @@ public: friend void ACE_OS_Object_Manager_Internal_Exit_Hook (); }; -# if defined (ACE_HAS_INLINED_OSCALLS) -# if defined (ACE_INLINE) -# undef ACE_INLINE -# endif /* ACE_INLINE */ -# define ACE_INLINE inline -# include "ace/Object_Manager_Base.inl" -# endif /* ACE_HAS_INLINED_OSCALLS */ - #include /**/ "ace/post.h" #endif /* ACE_OBJECT_MANAGER_BASE_H */ diff --git a/ace/Object_Manager_Base.inl b/ace/Object_Manager_Base.inl deleted file mode 100644 index c130d6682b1..00000000000 --- a/ace/Object_Manager_Base.inl +++ /dev/null @@ -1,2 +0,0 @@ -// -*- C++ -*- -// $Id$ diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp index 67e609eb424..224f0850b0a 100644 --- a/ace/POSIX_Asynch_IO.cpp +++ b/ace/POSIX_Asynch_IO.cpp @@ -4,10 +4,6 @@ #if defined (ACE_HAS_AIO_CALLS) -#if !defined (__ACE_INLINE__) -#include "ace/POSIX_Asynch_IO.i" -#endif /* __ACE_INLINE__ */ - #include "ace/ACE.h" #include "ace/Proactor.h" #include "ace/Message_Block.h" diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h index f89ede37951..e9f5f2d9c21 100644 --- a/ace/POSIX_Asynch_IO.h +++ b/ace/POSIX_Asynch_IO.h @@ -1204,7 +1204,7 @@ public: * @a message_block->total_length bytes will be sent, beginning at the * read pointer. The @a message_block read pointer will be updated to * reflect the sent bytes if the send operation is successful completed. - * + * * Priority of the operation is specified by @a priority. On POSIX, * this is supported. Works like @c nice in Unix. Negative values are not * allowed. 0 means priority of the operation same as the process @@ -1314,10 +1314,5 @@ protected: }; - -#if defined (__ACE_INLINE__) -#include "ace/POSIX_Asynch_IO.i" -#endif /* __ACE_INLINE__ */ - #endif /* ACE_HAS_AIO_CALLS */ #endif /* ACE_POSIX_ASYNCH_IO_H */ diff --git a/ace/POSIX_Asynch_IO.i b/ace/POSIX_Asynch_IO.i deleted file mode 100644 index 6318deb79a0..00000000000 --- a/ace/POSIX_Asynch_IO.i +++ /dev/null @@ -1,2 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ diff --git a/ace/Parse_Node.i b/ace/Parse_Node.i index 0728118ea80..538ca6ee430 100644 --- a/ace/Parse_Node.i +++ b/ace/Parse_Node.i @@ -1,8 +1,6 @@ /* -*- C++ -*- */ // $Id$ -// Parse_Node.i - ACE_INLINE ACE_Suspend_Node::~ACE_Suspend_Node (void) { diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp index 44798756127..befb32285ff 100644 --- a/ace/Pipe.cpp +++ b/ace/Pipe.cpp @@ -4,11 +4,11 @@ #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" #include "ace/Log_Msg.h" -#include "ace/os_include/netinet/os_tcp.h" +#include "ace/OS_NS_sys_socket.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/Pipe.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Pipe, "$Id$") diff --git a/ace/Pipe.h b/ace/Pipe.h index 2a466db1a8b..2da7e685f6b 100644 --- a/ace/Pipe.h +++ b/ace/Pipe.h @@ -81,9 +81,9 @@ private: ACE_HANDLE handles_[2]; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/Pipe.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/ace/Pipe.i b/ace/Pipe.i index 35074670827..64a5ee4049c 100644 --- a/ace/Pipe.i +++ b/ace/Pipe.i @@ -1,25 +1,23 @@ /* -*- C++ -*- */ // $Id$ -// Pipe.i - #include "ace/Global_Macros.h" -ASYS_INLINE +ACE_INLINE ACE_Pipe::~ACE_Pipe (void) { ACE_TRACE ("ACE_Pipe::~ACE_Pipe"); // Notice that the destructor doesn't close the handles for you. } -ASYS_INLINE ACE_HANDLE +ACE_INLINE ACE_HANDLE ACE_Pipe::read_handle (void) const { ACE_TRACE ("ACE_Pipe::read_handle"); return this->handles_[0]; } - -ASYS_INLINE ACE_HANDLE + +ACE_INLINE ACE_HANDLE ACE_Pipe::write_handle (void) const { ACE_TRACE ("ACE_Pipe::write_handle"); diff --git a/ace/Process.cpp b/ace/Process.cpp index edb83e5e86a..492d664ce5a 100644 --- a/ace/Process.cpp +++ b/ace/Process.cpp @@ -14,10 +14,11 @@ #include "ace/OS_NS_sys_socket.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_string.h" +#include "ace/Time_Value.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID (ace, Process, "$Id$") - // This function acts as a signal handler for SIGCHLD. We don't really want // to do anything with the signal - it's just needed to interrupt a sleep. // See wait() for more info. diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp index 454ab7e5c82..1c765247878 100644 --- a/ace/Process_Manager.cpp +++ b/ace/Process_Manager.cpp @@ -17,6 +17,7 @@ #include "ace/OS_NS_sys_wait.h" #include "ace/OS_NS_signal.h" #include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID (ace, Process_Manager, diff --git a/ace/Process_Mutex.h b/ace/Process_Mutex.h index e9b4e487e54..69a295e3225 100644 --- a/ace/Process_Mutex.h +++ b/ace/Process_Mutex.h @@ -36,6 +36,9 @@ # include "ace/Mutex.h" #endif /* ACE_HAS_SYSV_IPC && !ACE_USES_MUTEX_FOR_PROCESS_MUTEX */ +// Forward declarations +class ACE_Time_Value; + /** * @class ACE_Process_Mutex * @@ -57,12 +60,12 @@ * Also, if you require the ability to do a timed @c acquire(), you must * set @c ACE_USES_MUTEX_FOR_PROCESS_MUTEX, as timed acquire does not * work with System V semaphores. - * @attention Currently there is also the operational difference between - * pthreads and semaphores based @c. For semaphore base @c the semaphore + * @attention Currently there is also the operational difference between + * pthreads and semaphores based @c. For semaphore base @c the semaphore * is destroyed after the last instance of @c in OS. In contrary, pthread based - * @c is destroyed when the owner, namely the process which created the - * first instance of @c destroys the mutex. For protable applications it is better - * to always ensure that the owner of the mutex destroys it after the + * @c is destroyed when the owner, namely the process which created the + * first instance of @c destroys the mutex. For protable applications it is better + * to always ensure that the owner of the mutex destroys it after the * other processes. */ class ACE_Export ACE_Process_Mutex diff --git a/ace/Process_Semaphore.cpp b/ace/Process_Semaphore.cpp index bf6a0d7ac7b..88355398384 100644 --- a/ace/Process_Semaphore.cpp +++ b/ace/Process_Semaphore.cpp @@ -2,6 +2,7 @@ #include "ace/Process_Semaphore.h" #include "ace/Log_Msg.h" +#include "ace/OS_Memory.h" #if !defined (__ACE_INLINE__) #include "ace/Process_Semaphore.inl" diff --git a/ace/RW_Process_Mutex.cpp b/ace/RW_Process_Mutex.cpp index 9670b0df16c..a0d0b15a2af 100644 --- a/ace/RW_Process_Mutex.cpp +++ b/ace/RW_Process_Mutex.cpp @@ -12,6 +12,10 @@ ACE_RCSID(ace, RW_Process_Mutex, "$Id$") #include "ace/Malloc_T.h" +#if defined (ACE_WIN32) +#include "ace/OS_NS_fcntl.h" +#endif /* ACE_WIN32 */ + ACE_ALLOC_HOOK_DEFINE(ACE_RW_Process_Mutex) const ACE_TCHAR * diff --git a/ace/Reactor.h b/ace/Reactor.h index 8e68d1188f0..f55b9d89eda 100644 --- a/ace/Reactor.h +++ b/ace/Reactor.h @@ -233,11 +233,6 @@ public: /// Use a user specified signal handler instead. virtual int set_sig_handler (ACE_Sig_Handler *signal_handler); - // = The following method is deprecated. - /// @deprecated Use <timer_queue> instead. - /// Set a user specified timer queue. - virtual int set_timer_queue (ACE_Timer_Queue *tq); - /// Set a user-specified timer queue. virtual int timer_queue (ACE_Timer_Queue *tq); diff --git a/ace/Reactor.i b/ace/Reactor.i index 30d3802b96f..8ecd5261b3f 100644 --- a/ace/Reactor.i +++ b/ace/Reactor.i @@ -141,12 +141,6 @@ ACE_Reactor::timer_queue (ACE_Timer_Queue *tq) return this->implementation ()->timer_queue (tq); } -ACE_INLINE int -ACE_Reactor::set_timer_queue (ACE_Timer_Queue *tq) -{ - return this->timer_queue (tq); -} - ACE_INLINE ACE_Timer_Queue * ACE_Reactor::timer_queue (void) const { diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h index bae4d637020..40fc4f750cc 100644 --- a/ace/Reactor_Impl.h +++ b/ace/Reactor_Impl.h @@ -145,10 +145,6 @@ public: /// Use a user specified signal handler instead. virtual int set_sig_handler (ACE_Sig_Handler *signal_handler) = 0; - /// @deprecated The following method is deprecated. Use <timer_queue> instead. - /// Set a user specified timer queue. - virtual int set_timer_queue (ACE_Timer_Queue *tq) = 0; - /// Set a user-specified timer queue. virtual int timer_queue (ACE_Timer_Queue *tq) = 0; diff --git a/ace/Reactor_Notification_Strategy.inl b/ace/Reactor_Notification_Strategy.inl index b9fb2811526..260ec1d960a 100644 --- a/ace/Reactor_Notification_Strategy.inl +++ b/ace/Reactor_Notification_Strategy.inl @@ -1,5 +1,6 @@ /* -*- C++ -*- */ // $Id$ + ACE_INLINE ACE_Reactor * ACE_Reactor_Notification_Strategy::reactor (void) { diff --git a/ace/Reactor_Timer_Interface.h b/ace/Reactor_Timer_Interface.h index 3e2263ec104..614da69db7f 100644 --- a/ace/Reactor_Timer_Interface.h +++ b/ace/Reactor_Timer_Interface.h @@ -15,8 +15,6 @@ #include /**/ "ace/pre.h" -#include "ace/Time_Value.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/ace/Registry.cpp b/ace/Registry.cpp index 232143e6db7..dcac2651071 100644 --- a/ace/Registry.cpp +++ b/ace/Registry.cpp @@ -9,6 +9,7 @@ ACE_RCSID (ace, #if defined (ACE_WIN32) # include "ace/os_include/os_netdb.h" +# include "ace/OS_NS_unistd.h" // Funky macro to deal with strange error passing semantics // of Win32 Reg*() functions diff --git a/ace/SOCK.h b/ace/SOCK.h index e266f5639bb..b4e69d16e3c 100644 --- a/ace/SOCK.h +++ b/ace/SOCK.h @@ -22,6 +22,7 @@ #include "ace/Addr.h" #include "ace/IPC_SAP.h" +#include "ace/OS_NS_stropts.h" /** * @class ACE_SOCK diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp index 2affdc3ea4d..b7c3b5fd80d 100644 --- a/ace/SOCK_Acceptor.cpp +++ b/ace/SOCK_Acceptor.cpp @@ -5,6 +5,8 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/os_include/os_fcntl.h" #if !defined (__ACE_INLINE__) #include "ace/SOCK_Acceptor.i" diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h index e2239c15fba..d68a3294482 100644 --- a/ace/SOCK_Acceptor.h +++ b/ace/SOCK_Acceptor.h @@ -20,7 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Time_Value.h" +class ACE_Time_Value; +class ACE_Accept_QoS_Params; /** * @class ACE_SOCK_Acceptor diff --git a/ace/SOCK_Acceptor.i b/ace/SOCK_Acceptor.i index e745595eb1c..db6fa00f4ba 100644 --- a/ace/SOCK_Acceptor.i +++ b/ace/SOCK_Acceptor.i @@ -1,8 +1,6 @@ /* -*- C++ -*- */ // $Id$ -// SOCK_Acceptor.i - ACE_INLINE ACE_SOCK_Acceptor::~ACE_SOCK_Acceptor (void) { diff --git a/ace/SOCK_CODgram.cpp b/ace/SOCK_CODgram.cpp index c7af4bd69d3..4eb2ba7c21b 100644 --- a/ace/SOCK_CODgram.cpp +++ b/ace/SOCK_CODgram.cpp @@ -3,6 +3,7 @@ #include "ace/SOCK_CODgram.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_sys_socket.h" #if !defined (__ACE_INLINE__) #include "ace/SOCK_CODgram.i" diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp index 43e09fd8fb4..6a1bd9fae6b 100644 --- a/ace/SOCK_Connector.cpp +++ b/ace/SOCK_Connector.cpp @@ -4,6 +4,9 @@ #include "ace/SOCK_Connector.h" #include "ace/INET_Addr.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/os_include/os_fcntl.h" #if !defined (ACE_HAS_WINCE) #include "ace/OS_QoS.h" diff --git a/ace/SOCK_Connector.h b/ace/SOCK_Connector.h index 25a96412500..c2b39026b23 100644 --- a/ace/SOCK_Connector.h +++ b/ace/SOCK_Connector.h @@ -20,7 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Time_Value.h" +class ACE_QoS_Params; +class ACE_Time_Value; /** * @class ACE_SOCK_Connector diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index e48df19dbb2..abecdef94b3 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -5,6 +5,7 @@ #include "ace/INET_Addr.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" +#include "ace/OS_Memory.h" #include "ace/OS_NS_sys_select.h" #include "ace/os_include/net/os_if.h" diff --git a/ace/SOCK_Dgram_Bcast.cpp b/ace/SOCK_Dgram_Bcast.cpp index 9483808ea89..ddfcb1f407a 100644 --- a/ace/SOCK_Dgram_Bcast.cpp +++ b/ace/SOCK_Dgram_Bcast.cpp @@ -7,10 +7,11 @@ #include "ace/OS_NS_string.h" #include "ace/os_include/net/os_if.h" #include "ace/OS_NS_netdb.h" +#include "ace/OS_Memory.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/SOCK_Dgram_Bcast.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, SOCK_Dgram_Bcast, "$Id$") diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h index 216acc5a041..5b72a117d70 100644 --- a/ace/SOCK_Dgram_Bcast.h +++ b/ace/SOCK_Dgram_Bcast.h @@ -127,9 +127,9 @@ private: int get_remote_addr (ACE_Addr &) const; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SOCK_Dgram_Bcast.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_SOCK_DGRAM_BCAST_H */ diff --git a/ace/SOCK_Dgram_Bcast.i b/ace/SOCK_Dgram_Bcast.i index 47c6cbe9645..85c3312ef9d 100644 --- a/ace/SOCK_Dgram_Bcast.i +++ b/ace/SOCK_Dgram_Bcast.i @@ -3,12 +3,12 @@ #include "ace/OS_NS_sys_socket.h" -ASYS_INLINE +ACE_INLINE ACE_Bcast_Node::~ACE_Bcast_Node (void) { } -ASYS_INLINE +ACE_INLINE ACE_SOCK_Dgram_Bcast::~ACE_SOCK_Dgram_Bcast (void) { ACE_TRACE ("ACE_SOCK_Dgram_Bcast::~ACE_SOCK_Dgram_Bcast"); @@ -17,7 +17,7 @@ ACE_SOCK_Dgram_Bcast::~ACE_SOCK_Dgram_Bcast (void) // Broadcast an N byte datagram to ADDR (note that addr must be // preassigned to the broadcast address of the subnet...) -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Dgram_Bcast::send (const void *buf, size_t n, const ACE_Addr &addr, diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp index 02dacf0cd9e..58c495a984c 100644 --- a/ace/SOCK_Dgram_Mcast.cpp +++ b/ace/SOCK_Dgram_Mcast.cpp @@ -1,16 +1,16 @@ -// SOCK_Dgram_Mcast.cpp +// $Id$ #include "ace/SOCK_Dgram_Mcast.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_Dgram_Mcast.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - #include "ace/OS_NS_string.h" #include "ace/OS_NS_errno.h" #include "ace/os_include/net/os_if.h" #include "ace/os_include/arpa/os_inet.h" +#if !defined (__ACE_INLINE__) +#include "ace/SOCK_Dgram_Mcast.i" +#endif /* __ACE_INLINE__ */ + ACE_RCSID (ace, SOCK_Dgram_Mcast, "$Id$") diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h index b95ca966fee..8c1bce01b7f 100644 --- a/ace/SOCK_Dgram_Mcast.h +++ b/ace/SOCK_Dgram_Mcast.h @@ -430,9 +430,9 @@ private: }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SOCK_Dgram_Mcast.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_SOCK_DGRAM_MCAST_H */ diff --git a/ace/SOCK_Dgram_Mcast.i b/ace/SOCK_Dgram_Mcast.i index 97ed22b3e18..3244f21b078 100644 --- a/ace/SOCK_Dgram_Mcast.i +++ b/ace/SOCK_Dgram_Mcast.i @@ -1,7 +1,7 @@ /* -*- C++ -*- */ // $Id$ -ASYS_INLINE int +ACE_INLINE int ACE_SOCK_Dgram_Mcast::set_option (int option, char optval) { @@ -22,7 +22,7 @@ ACE_SOCK_Dgram_Mcast::set_option (int option, sizeof (optval)); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Dgram_Mcast::send (const void *buf, size_t n, int flags) const @@ -34,7 +34,7 @@ ACE_SOCK_Dgram_Mcast::send (const void *buf, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Dgram_Mcast::send (const iovec iov[], int n, int flags) const diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp index 2cb02c36d7e..b2baf3155cf 100644 --- a/ace/SOCK_IO.cpp +++ b/ace/SOCK_IO.cpp @@ -5,6 +5,8 @@ #include "ace/Handle_Set.h" #include "ace/OS_NS_sys_select.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/OS_Memory.h" #if !defined (__ACE_INLINE__) #include "ace/SOCK_IO.i" diff --git a/ace/SOCK_IO.i b/ace/SOCK_IO.i index dc33fde9ee2..32c3b618893 100644 --- a/ace/SOCK_IO.i +++ b/ace/SOCK_IO.i @@ -1,7 +1,7 @@ /* -*- C++ -*- */ // $Id$ -// SOCK_IO.i +#include "ace/OS_NS_unistd.h" // Send an n byte message to the connected socket. diff --git a/ace/SOCK_SEQPACK_Acceptor.cpp b/ace/SOCK_SEQPACK_Acceptor.cpp index af93dbb9186..83578a0904a 100644 --- a/ace/SOCK_SEQPACK_Acceptor.cpp +++ b/ace/SOCK_SEQPACK_Acceptor.cpp @@ -1,15 +1,16 @@ -// SOCK_SEQPACK_Acceptor.cpp // $Id$ #include "ace/SOCK_SEQPACK_Acceptor.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_SEQPACK_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ - #include "ace/Auto_Ptr.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/os_include/os_fcntl.h" + +#if !defined (__ACE_INLINE__) +#include "ace/SOCK_SEQPACK_Acceptor.i" +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, SOCK_SEQPACK_Acceptor, "SOCK_SEQPACK_Acceptor.cpp,v 4.30 2002/03/08 23:18:09 spark Exp") diff --git a/ace/SOCK_SEQPACK_Acceptor.h b/ace/SOCK_SEQPACK_Acceptor.h index c73c22f6fb3..6a313ee4136 100644 --- a/ace/SOCK_SEQPACK_Acceptor.h +++ b/ace/SOCK_SEQPACK_Acceptor.h @@ -178,9 +178,9 @@ private: int get_remote_addr (ACE_Addr &) const; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SOCK_SEQPACK_Acceptor.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/ace/SOCK_SEQPACK_Acceptor.i b/ace/SOCK_SEQPACK_Acceptor.i index 73421d31d0c..39c1700b53c 100644 --- a/ace/SOCK_SEQPACK_Acceptor.i +++ b/ace/SOCK_SEQPACK_Acceptor.i @@ -1,9 +1,7 @@ /* -*- C++ -*- */ // $Id$ -// SOCK_SEQPACK_Acceptor.i - -ASYS_INLINE +ACE_INLINE ACE_SOCK_SEQPACK_Acceptor::~ACE_SOCK_SEQPACK_Acceptor (void) { ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::~ACE_SOCK_SEQPACK_Acceptor"); diff --git a/ace/SOCK_SEQPACK_Association.cpp b/ace/SOCK_SEQPACK_Association.cpp index 2b61ecad6d6..719d37d9bfe 100644 --- a/ace/SOCK_SEQPACK_Association.cpp +++ b/ace/SOCK_SEQPACK_Association.cpp @@ -2,14 +2,14 @@ #include "ace/SOCK_SEQPACK_Association.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SOCK_SEQPACK_Association.i" -#endif - #include "ace/Auto_Ptr.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" +#if !defined (__ACE_INLINE__) +#include "ace/SOCK_SEQPACK_Association.i" +#endif /* __ACE_INLINE__ */ + ACE_RCSID(ace, SOCK_SEQPACK_Association, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Association) @@ -44,33 +44,33 @@ ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &siz ACE_TRACE ("ACE_SOCK_SEQPACK_Association::get_local_addrs"); #if defined (ACE_HAS_LKSCTP) - /* + /* The size of ACE_INET_Addr must be large enough to hold the number of local addresses on the machine. If the array is too small, the function - will only return the number of addresses that will fit. If the array is + will only return the number of addresses that will fit. If the array is too large, the 'size' parameter will be modified to indicate the number - of addrs. + of addrs. We will call sctp_getladdrs() which accepts 3 parameters 1. a socket fd - 2. a sctp association_id which will be ignored since we are using - tcp sockets + 2. a sctp association_id which will be ignored since we are using + tcp sockets 3. a pointer to sockaddr lksctp/draft will allocate memory and we are responsible for freeing - it by calling sctp_freeladdrs(). + it by calling sctp_freeladdrs(). */ sockaddr_in *si = 0; sockaddr *laddrs = 0; int err = 0; size_t len = 0; - + err = sctp_getladdrs(this->get_handle(), 0, &laddrs); if (err > 0) { len = err; - // check to see if we have more addresses than we have + // check to see if we have more addresses than we have // space in our ACE_INET_Addr array if (len > size) { @@ -78,7 +78,7 @@ ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &siz // few that fit len = size; } - + for (size_t i = 0; i < len; i++) { // first we cast the sockaddr to sockaddr_in @@ -176,15 +176,15 @@ ACE_SOCK_SEQPACK_Association::get_local_addrs (ACE_INET_Addr *addrs, size_t &siz } -int +int ACE_SOCK_SEQPACK_Association::get_remote_addrs (ACE_INET_Addr *addrs, size_t &size) const { ACE_TRACE ("ACE_SOCK_SEQPACK_Association::get_remote_addrs"); #if defined (ACE_HAS_LKSCTP) /* The size of ACE_INET_Addr must be large enough to hold the number of - remotes addresses in the association. If the array is too small, the - function will only return the number of addresses that will fit. If the + remotes addresses in the association. If the array is too small, the + function will only return the number of addresses that will fit. If the array is too large, the 'size' parameter will be modified to indicate the number of addrs. diff --git a/ace/SOCK_SEQPACK_Association.h b/ace/SOCK_SEQPACK_Association.h index 88281ded0fa..65503ff349e 100644 --- a/ace/SOCK_SEQPACK_Association.h +++ b/ace/SOCK_SEQPACK_Association.h @@ -184,9 +184,9 @@ public: ACE_ALLOC_HOOK_DECLARE; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SOCK_SEQPACK_Association.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/ace/SOCK_SEQPACK_Association.i b/ace/SOCK_SEQPACK_Association.i index ea7547b751c..3c33c96968e 100644 --- a/ace/SOCK_SEQPACK_Association.i +++ b/ace/SOCK_SEQPACK_Association.i @@ -1,29 +1,29 @@ /* -*- C++ -*- */ -// SOCK_SEQPACK_Association.i // $Id$ #include "ace/SOCK_SEQPACK_Association.h" +#include "ace/OS_NS_sys_socket.h" -ASYS_INLINE +ACE_INLINE ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association (void) { // ACE_TRACE ("ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association"); } -ASYS_INLINE +ACE_INLINE ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association (ACE_HANDLE h) { // ACE_TRACE ("ACE_SOCK_SEQPACK_Association::ACE_SOCK_SEQPACK_Association"); this->set_handle (h); } -ASYS_INLINE +ACE_INLINE ACE_SOCK_SEQPACK_Association::~ACE_SOCK_SEQPACK_Association (void) { // ACE_TRACE ("ACE_SOCK_SEQPACK_Association::~ACE_SOCK_SEQPACK_Association"); } -ASYS_INLINE int +ACE_INLINE int ACE_SOCK_SEQPACK_Association::close_reader (void) { ACE_TRACE ("ACE_SOCK_SEQPACK_Association::close_reader"); @@ -35,7 +35,7 @@ ACE_SOCK_SEQPACK_Association::close_reader (void) // Shut down just the writing end of a ACE_SOCK. -ASYS_INLINE int +ACE_INLINE int ACE_SOCK_SEQPACK_Association::close_writer (void) { ACE_TRACE ("ACE_SOCK_SEQPACK_Association::close_writer"); @@ -45,7 +45,7 @@ ACE_SOCK_SEQPACK_Association::close_writer (void) return 0; } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_SEQPACK_Association::recv_n (void *buf, size_t len, int flags, @@ -61,7 +61,7 @@ ACE_SOCK_SEQPACK_Association::recv_n (void *buf, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_SEQPACK_Association::recv_n (void *buf, size_t len, const ACE_Time_Value *timeout, @@ -75,7 +75,7 @@ ACE_SOCK_SEQPACK_Association::recv_n (void *buf, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_SEQPACK_Association::recvv_n (iovec iov[], int n, const ACE_Time_Value *timeout, @@ -89,7 +89,7 @@ ACE_SOCK_SEQPACK_Association::recvv_n (iovec iov[], bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_SEQPACK_Association::send_n (const void *buf, size_t len, int flags, @@ -105,7 +105,7 @@ ACE_SOCK_SEQPACK_Association::send_n (const void *buf, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_SEQPACK_Association::send_n (const void *buf, size_t len, const ACE_Time_Value *timeout, @@ -119,7 +119,7 @@ ACE_SOCK_SEQPACK_Association::send_n (const void *buf, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_SEQPACK_Association::sendv_n (const iovec iov[], int n, const ACE_Time_Value *timeout, @@ -133,7 +133,7 @@ ACE_SOCK_SEQPACK_Association::sendv_n (const iovec iov[], bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_SEQPACK_Association::send_n (const ACE_Message_Block *message_block, const ACE_Time_Value *timeout, size_t *bytes_transferred) const @@ -145,7 +145,7 @@ ACE_SOCK_SEQPACK_Association::send_n (const ACE_Message_Block *message_block, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_SEQPACK_Association::send_urg (const void *ptr, size_t len, const ACE_Time_Value *timeout) const @@ -158,7 +158,7 @@ ACE_SOCK_SEQPACK_Association::send_urg (const void *ptr, timeout); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_SEQPACK_Association::recv_urg (void *ptr, size_t len, const ACE_Time_Value *timeout) const diff --git a/ace/SOCK_SEQPACK_Connector.cpp b/ace/SOCK_SEQPACK_Connector.cpp index 1027179a041..02ac05b6ce6 100644 --- a/ace/SOCK_SEQPACK_Connector.cpp +++ b/ace/SOCK_SEQPACK_Connector.cpp @@ -1,15 +1,21 @@ -// SOCK_SEQPACK_Connector.cpp // $Id$ #include "ace/SOCK_SEQPACK_Connector.h" #include "ace/INET_Addr.h" #include "ace/Log_Msg.h" +#include "ace/Time_Value.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_socket.h" +#include "ace/os_include/os_fcntl.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (ACE_WIN32) +#include "ace/OS_NS_unistd.h" +#endif /* ACE_WIN32 */ + +#if !defined (__ACE_INLINE__) #include "ace/SOCK_SEQPACK_Connector.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, SOCK_SEQPACK_Connector, "SOCK_SEQPACK_Connector.cpp,v 4.35 2002/03/08 23:18:09 spark Exp") @@ -37,9 +43,9 @@ ACE_SOCK_SEQPACK_Connector::shared_open (ACE_SOCK_SEQPACK_Association &new_assoc if (new_association.get_handle () == ACE_INVALID_HANDLE && #if defined (ACE_HAS_LKSCTP) new_association.open (SOCK_STREAM, -#else +#else new_association.open (SOCK_SEQPACKET, -#endif /* ACE_HAS_LKSCTP */ +#endif /* ACE_HAS_LKSCTP */ protocol_family, protocol, reuse_addr) == -1) @@ -153,14 +159,14 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association & } // do we need to bind multiple addrs - if (num_addresses > 1) - { + if (num_addresses > 1) + { // allocate enough memory to hold the number of secondary addrs ACE_NEW_NORETURN(local_sockaddr, sockaddr_in[num_addresses - 1]); // get sockaddr_in for the local handle - if (ACE_OS::getsockname(new_association.get_handle (), + if (ACE_OS::getsockname(new_association.get_handle (), ACE_reinterpret_cast(sockaddr *, &portst), &sn)) @@ -169,7 +175,7 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association & new_association.close (); return -1; } - + // set the local port # assigned by the os to every secondary addr for (size_t i = 1; i < num_addresses; i++) { @@ -183,9 +189,9 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association & &(local_inet_addrs[i + 1]), sizeof(sockaddr_in)); } - + // bind other ifaces - if (sctp_bindx(new_association.get_handle(), + if (sctp_bindx(new_association.get_handle(), ACE_reinterpret_cast(sockaddr *, local_sockaddr), num_addresses - 1, SCTP_BINDX_ADD_ADDR)) @@ -194,7 +200,7 @@ ACE_SOCK_SEQPACK_Connector::shared_connect_start (ACE_SOCK_SEQPACK_Association & new_association.close (); return -1; } - + delete [] local_sockaddr; } #else diff --git a/ace/SOCK_SEQPACK_Connector.h b/ace/SOCK_SEQPACK_Connector.h index 8a442e5390e..7223c93071e 100644 --- a/ace/SOCK_SEQPACK_Connector.h +++ b/ace/SOCK_SEQPACK_Connector.h @@ -28,7 +28,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Time_Value.h" +// Forward declarations. +class ACE_Time_Value; /** * @class ACE_SOCK_SEQPACK_Connector @@ -317,9 +318,9 @@ protected: int result); }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SOCK_SEQPACK_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/ace/SOCK_SEQPACK_Connector.i b/ace/SOCK_SEQPACK_Connector.i index 319308bf30d..6450abb6ce9 100644 --- a/ace/SOCK_SEQPACK_Connector.i +++ b/ace/SOCK_SEQPACK_Connector.i @@ -1,11 +1,10 @@ /* -*- C++ -*- */ -// SOCK_SEQPACK_Connector.i // $Id$ // This constructor is used by a client when it wants to connect to // the specified REMOTE_SAP address using a blocking open. -ASYS_INLINE +ACE_INLINE ACE_SOCK_SEQPACK_Connector::~ACE_SOCK_SEQPACK_Connector (void) { ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::~ACE_SOCK_SEQPACK_Connector"); @@ -13,13 +12,13 @@ ACE_SOCK_SEQPACK_Connector::~ACE_SOCK_SEQPACK_Connector (void) // Do-nothing constructor... -ASYS_INLINE +ACE_INLINE ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (void) { ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"); } -ASYS_INLINE int +ACE_INLINE int ACE_SOCK_SEQPACK_Connector::reset_new_handle (ACE_HANDLE handle) { #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) diff --git a/ace/SOCK_Stream.cpp b/ace/SOCK_Stream.cpp index 287cb2add65..0ed2cd309b7 100644 --- a/ace/SOCK_Stream.cpp +++ b/ace/SOCK_Stream.cpp @@ -3,9 +3,9 @@ #include "ace/SOCK_Stream.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/SOCK_Stream.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, SOCK_Stream, "$Id$") diff --git a/ace/SOCK_Stream.h b/ace/SOCK_Stream.h index 21806c05c80..701cbcffca3 100644 --- a/ace/SOCK_Stream.h +++ b/ace/SOCK_Stream.h @@ -159,9 +159,9 @@ public: ACE_ALLOC_HOOK_DECLARE; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SOCK_Stream.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_SOCK_STREAM_H */ diff --git a/ace/SOCK_Stream.i b/ace/SOCK_Stream.i index f13d0ca24ff..5ba88bc55c5 100644 --- a/ace/SOCK_Stream.i +++ b/ace/SOCK_Stream.i @@ -2,27 +2,28 @@ // $Id$ #include "ace/SOCK_Stream.h" +#include "ace/OS_NS_sys_socket.h" -ASYS_INLINE +ACE_INLINE ACE_SOCK_Stream::ACE_SOCK_Stream (void) { // ACE_TRACE ("ACE_SOCK_Stream::ACE_SOCK_Stream"); } -ASYS_INLINE +ACE_INLINE ACE_SOCK_Stream::ACE_SOCK_Stream (ACE_HANDLE h) { // ACE_TRACE ("ACE_SOCK_Stream::ACE_SOCK_Stream"); this->set_handle (h); } -ASYS_INLINE +ACE_INLINE ACE_SOCK_Stream::~ACE_SOCK_Stream (void) { // ACE_TRACE ("ACE_SOCK_Stream::~ACE_SOCK_Stream"); } -ASYS_INLINE int +ACE_INLINE int ACE_SOCK_Stream::close_reader (void) { ACE_TRACE ("ACE_SOCK_Stream::close_reader"); @@ -34,7 +35,7 @@ ACE_SOCK_Stream::close_reader (void) // Shut down just the writing end of a ACE_SOCK. -ASYS_INLINE int +ACE_INLINE int ACE_SOCK_Stream::close_writer (void) { ACE_TRACE ("ACE_SOCK_Stream::close_writer"); @@ -44,7 +45,7 @@ ACE_SOCK_Stream::close_writer (void) return 0; } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Stream::recv_n (void *buf, size_t len, int flags, @@ -60,7 +61,7 @@ ACE_SOCK_Stream::recv_n (void *buf, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Stream::recv_n (void *buf, size_t len, const ACE_Time_Value *timeout, @@ -74,7 +75,7 @@ ACE_SOCK_Stream::recv_n (void *buf, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Stream::recvv_n (iovec iov[], int n, const ACE_Time_Value *timeout, @@ -88,7 +89,7 @@ ACE_SOCK_Stream::recvv_n (iovec iov[], bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Stream::send_n (const void *buf, size_t len, int flags, @@ -104,7 +105,7 @@ ACE_SOCK_Stream::send_n (const void *buf, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Stream::send_n (const void *buf, size_t len, const ACE_Time_Value *timeout, @@ -118,7 +119,7 @@ ACE_SOCK_Stream::send_n (const void *buf, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Stream::sendv_n (const iovec iov[], int n, const ACE_Time_Value *timeout, @@ -132,7 +133,7 @@ ACE_SOCK_Stream::sendv_n (const iovec iov[], bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Stream::send_n (const ACE_Message_Block *message_block, const ACE_Time_Value *timeout, size_t *bytes_transferred) const @@ -144,7 +145,7 @@ ACE_SOCK_Stream::send_n (const ACE_Message_Block *message_block, bytes_transferred); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Stream::send_urg (const void *ptr, size_t len, const ACE_Time_Value *timeout) const @@ -157,7 +158,7 @@ ACE_SOCK_Stream::send_urg (const void *ptr, timeout); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SOCK_Stream::recv_urg (void *ptr, size_t len, const ACE_Time_Value *timeout) const diff --git a/ace/SPIPE.cpp b/ace/SPIPE.cpp index f91c7ff545d..cbc04e56bc0 100644 --- a/ace/SPIPE.cpp +++ b/ace/SPIPE.cpp @@ -1,19 +1,18 @@ -// SPIPE.cpp // $Id$ #include "ace/SPIPE.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) -#include "ace/SPIPE.i" -#endif - #include "ace/OS_NS_unistd.h" +#if !defined (__ACE_INLINE__) +#include "ace/SPIPE.i" +#endif /* __ACE_INLINE__ */ + ACE_RCSID(ace, SPIPE, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE) -// This is the do-nothing constructor. +// This is the do-nothing constructor. ACE_SPIPE::ACE_SPIPE (void) { @@ -28,7 +27,7 @@ ACE_SPIPE::dump (void) const #endif /* ACE_HAS_DUMP */ } -// Close down a ACE_SPIPE. +// Close down a ACE_SPIPE. int ACE_SPIPE::get_local_addr (ACE_SPIPE_Addr &local_sap) const diff --git a/ace/SPIPE.h b/ace/SPIPE.h index 7c509636fee..d8fa5f3a79a 100644 --- a/ace/SPIPE.h +++ b/ace/SPIPE.h @@ -92,9 +92,9 @@ protected: ACE_SPIPE_Addr local_addr_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SPIPE.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_SPIPE_H */ diff --git a/ace/SPIPE.i b/ace/SPIPE.i index fd205ab76df..2912e4d7493 100644 --- a/ace/SPIPE.i +++ b/ace/SPIPE.i @@ -1,9 +1,7 @@ /* -*- C++ -*- */ // $Id$ -// SPIPE.i - -ASYS_INLINE int +ACE_INLINE int ACE_SPIPE::disable (int signum) const { #if defined (ACE_WIN32) diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp index cacf44b9b37..4f89df9e2b6 100644 --- a/ace/SPIPE_Connector.cpp +++ b/ace/SPIPE_Connector.cpp @@ -1,13 +1,14 @@ -// SPIPE_Connector.cpp // $Id$ #include "ace/SPIPE_Connector.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_fcntl.h" +#include "ace/OS_NS_unistd.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/SPIPE_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, SPIPE_Connector, "$Id$") diff --git a/ace/SPIPE_Connector.h b/ace/SPIPE_Connector.h index 0d754ad5ab2..7143a4626b4 100644 --- a/ace/SPIPE_Connector.h +++ b/ace/SPIPE_Connector.h @@ -16,6 +16,7 @@ #include /**/ "ace/pre.h" #include "ace/SPIPE_Stream.h" +#include "ace/os_include/os_fcntl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -26,7 +27,7 @@ * * @brief Defines an active connection factory for <ACE_SPIPE_Stream>. * On Windows this is mapped to Named Pipes, whereas on UNIX it is - * mapped to STREAM pipes. + * mapped to STREAM pipes. */ class ACE_Export ACE_SPIPE_Connector { @@ -105,9 +106,9 @@ public: ACE_ALLOC_HOOK_DECLARE; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SPIPE_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_SPIPE_CONNECTOR_H */ diff --git a/ace/SPIPE_Connector.i b/ace/SPIPE_Connector.i index 9ce4c1a7855..4ca09d7887e 100644 --- a/ace/SPIPE_Connector.i +++ b/ace/SPIPE_Connector.i @@ -1,9 +1,7 @@ /* -*- C++ -*- */ // $Id$ -// SPIPE_Connector.i - -ASYS_INLINE int +ACE_INLINE int ACE_SPIPE_Connector::reset_new_handle (ACE_HANDLE handle) { ACE_UNUSED_ARG (handle); diff --git a/ace/SPIPE_Stream.cpp b/ace/SPIPE_Stream.cpp index 76968d15e56..3bea7d00e02 100644 --- a/ace/SPIPE_Stream.cpp +++ b/ace/SPIPE_Stream.cpp @@ -2,10 +2,11 @@ // $Id$ #include "ace/SPIPE_Stream.h" +#include "ace/OS_Memory.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/SPIPE_Stream.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, SPIPE_Stream, "$Id$") diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h index 7ff3e5471a0..a015f493b0b 100644 --- a/ace/SPIPE_Stream.h +++ b/ace/SPIPE_Stream.h @@ -22,7 +22,7 @@ #include "ace/SPIPE_Addr.h" #include "ace/ACE.h" -#include "ace/os_include/os_stropts.h" +#include "ace/OS_NS_stropts.h" /** * @class ACE_SPIPE_Stream @@ -44,9 +44,9 @@ * * Methods with <iovec> parameter are I/O vector variants of the I/O * operations. - * + * * The <send> and <revc> operations use "message" semantics rather - * than "bytestream" semantics. + * than "bytestream" semantics. */ class ACE_Export ACE_SPIPE_Stream : public ACE_SPIPE { @@ -159,9 +159,9 @@ private: ACE_SPIPE_Addr remote_addr_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SPIPE_Stream.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_SPIPE_STREAM_H */ diff --git a/ace/SPIPE_Stream.i b/ace/SPIPE_Stream.i index cb855663448..11b8fef5a9e 100644 --- a/ace/SPIPE_Stream.i +++ b/ace/SPIPE_Stream.i @@ -5,10 +5,14 @@ #include "ace/OS_NS_sys_uio.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_unistd.h" +#if defined (ACE_WIN32) +#include "ace/OS_NS_sys_socket.h" +#endif // Create an ACE_SPIPE_Stream. -ASYS_INLINE int +ACE_INLINE int ACE_SPIPE_Stream::get_remote_addr (ACE_SPIPE_Addr &remote_sap) const { ACE_TRACE ("ACE_SPIPE_Stream::get_remote_addr"); @@ -19,7 +23,7 @@ ACE_SPIPE_Stream::get_remote_addr (ACE_SPIPE_Addr &remote_sap) const // Send exactly N bytes from BUF to this socket. Keeping trying until // this many bytes are sent. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::send_n (const void *buf, size_t n) const { ACE_TRACE ("ACE_SPIPE_Stream::send_n"); @@ -29,63 +33,63 @@ ACE_SPIPE_Stream::send_n (const void *buf, size_t n) const // Receive exactly N bytes from this socket into BUF. Keep trying // until this many bytes are received. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::recv_n (void *buf, size_t n) const { ACE_TRACE ("ACE_SPIPE_Stream::recv_n"); return ACE::read_n (this->get_handle (), buf, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::send (const void *buf, size_t n) const { ACE_TRACE ("ACE_SPIPE_Stream::send"); return ACE_OS::write (this->get_handle (), (const char *) buf, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::recv (void *buf, size_t n) const { ACE_TRACE ("ACE_SPIPE_Stream::recv"); return ACE_OS::read (this->get_handle (), (char *) buf, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags) const { ACE_TRACE ("ACE_SPIPE_Stream::send"); return ACE_OS::putmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *flags) const { ACE_TRACE ("ACE_SPIPE_Stream::recv"); return ACE_OS::getmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int band, int flags) const { ACE_TRACE ("ACE_SPIPE_Stream::send"); return ACE_OS::putpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *band, int *flags) const { ACE_TRACE ("ACE_SPIPE_Stream::recv"); return ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::send (const iovec iov[], int n) const { ACE_TRACE ("ACE_SPIPE_Stream::send"); return ACE_OS::writev (this->get_handle (), iov, n); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::recv (iovec iov[], int n) const { ACE_TRACE ("ACE_SPIPE_Stream::recv"); @@ -94,7 +98,7 @@ ACE_SPIPE_Stream::recv (iovec iov[], int n) const // This routine sends an open file descriptor to this socket. -ASYS_INLINE int +ACE_INLINE int ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const { ACE_TRACE ("ACE_SPIPE_Stream::send_handle"); @@ -142,7 +146,7 @@ ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const // This file receives an open file descriptor from this socket. -ASYS_INLINE int +ACE_INLINE int ACE_SPIPE_Stream::recv_handle (ACE_HANDLE &handle) const { ACE_TRACE ("ACE_SPIPE_Stream::recv_handle"); @@ -200,7 +204,7 @@ ACE_SPIPE_Stream::recv_handle (ACE_HANDLE &handle) const // This file receives an open file descriptor from this socket and // also passes back the information about the address... -ASYS_INLINE int +ACE_INLINE int ACE_SPIPE_Stream::recv_handle (strrecvfd &recvfd) const { ACE_TRACE ("ACE_SPIPE_Stream::recv_handle"); @@ -212,7 +216,7 @@ ACE_SPIPE_Stream::recv_handle (strrecvfd &recvfd) const #endif /* ACE_HAS_STREAM_PIPES */ } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::send (const void *buf, size_t n, ACE_OVERLAPPED *overlapped) const { @@ -222,7 +226,7 @@ ACE_SPIPE_Stream::send (const void *buf, size_t n, overlapped); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::recv (void *buf, size_t n, ACE_OVERLAPPED *overlapped) const { @@ -232,7 +236,7 @@ ACE_SPIPE_Stream::recv (void *buf, size_t n, overlapped); } -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::sendv_n (const iovec iov[], int n) const { @@ -244,7 +248,7 @@ ACE_SPIPE_Stream::sendv_n (const iovec iov[], // Recv an n byte message from the Stream. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::recvv_n (iovec iov[], int n) const { @@ -258,7 +262,7 @@ ACE_SPIPE_Stream::recvv_n (iovec iov[], // Send an <iovec> of size <n> to the Stream. -ASYS_INLINE ssize_t +ACE_INLINE ssize_t ACE_SPIPE_Stream::sendv (const iovec iov[], int n) const { diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp index 825c9aebe31..9c93dc58fc8 100644 --- a/ace/SSL/SSL_Context.cpp +++ b/ace/SSL/SSL_Context.cpp @@ -535,7 +535,7 @@ template class ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>; #pragma instantiate ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX> -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) +#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX> * ACE_Singleton<ACE_SSL_Context, ACE_SYNCH_MUTEX>::singleton_; diff --git a/ace/SV_Message_Queue.cpp b/ace/SV_Message_Queue.cpp index 4ea8d69e821..12ca9acabd7 100644 --- a/ace/SV_Message_Queue.cpp +++ b/ace/SV_Message_Queue.cpp @@ -1,12 +1,11 @@ -// SV_Message_Queue.cpp // $Id$ #include "ace/SV_Message_Queue.h" #include "ace/Log_Msg.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/SV_Message_Queue.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, SV_Message_Queue, "$Id$") diff --git a/ace/SV_Message_Queue.h b/ace/SV_Message_Queue.h index 0fcbeaf0751..813df564996 100644 --- a/ace/SV_Message_Queue.h +++ b/ace/SV_Message_Queue.h @@ -92,9 +92,9 @@ protected: int internal_id_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SV_Message_Queue.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/ace/SV_Message_Queue.i b/ace/SV_Message_Queue.i index b0533d09bbe..afebb74a226 100644 --- a/ace/SV_Message_Queue.i +++ b/ace/SV_Message_Queue.i @@ -1,14 +1,12 @@ /* -*- C++ -*- */ // $Id$ -// SV_Message_Queue.i - #include "ace/Global_Macros.h" #include "ace/OS_NS_sys_msg.h" // Open a message queue using the <external_id>. -ASYS_INLINE int +ACE_INLINE int ACE_SV_Message_Queue::open (key_t external_id, int create, int perms) { ACE_TRACE ("ACE_SV_Message_Queue::open"); @@ -17,7 +15,7 @@ ACE_SV_Message_Queue::open (key_t external_id, int create, int perms) // What does it mean to close a message queue?! -ASYS_INLINE int +ACE_INLINE int ACE_SV_Message_Queue::close (void) { ACE_TRACE ("ACE_SV_Message_Queue::close"); @@ -25,15 +23,15 @@ ACE_SV_Message_Queue::close (void) return 1; } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Message_Queue::control (int option, void *arg) { ACE_TRACE ("ACE_SV_Message_Queue::control"); - return ACE_OS::msgctl (this->internal_id_, option, + return ACE_OS::msgctl (this->internal_id_, option, (struct msqid_ds *) arg); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Message_Queue::remove (void) { ACE_TRACE ("ACE_SV_Message_Queue::remove"); @@ -42,34 +40,34 @@ ACE_SV_Message_Queue::remove (void) return result; } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Message_Queue::get_id (void) const { ACE_TRACE ("ACE_SV_Message_Queue::get_id"); return this->internal_id_; } -ASYS_INLINE void +ACE_INLINE void ACE_SV_Message_Queue::set_id (int id) { ACE_TRACE ("ACE_SV_Message_Queue::set_id"); this->internal_id_ = id; } -ASYS_INLINE int -ACE_SV_Message_Queue::recv (ACE_SV_Message &mb, - int length, - long type, +ACE_INLINE int +ACE_SV_Message_Queue::recv (ACE_SV_Message &mb, + int length, + long type, int mflags) { ACE_TRACE ("ACE_SV_Message_Queue::recv"); - return ACE_OS::msgrcv (this->internal_id_, (void *) &mb, + return ACE_OS::msgrcv (this->internal_id_, (void *) &mb, length, type, mflags); } -ASYS_INLINE int -ACE_SV_Message_Queue::send (const ACE_SV_Message &mb, - int length, +ACE_INLINE int +ACE_SV_Message_Queue::send (const ACE_SV_Message &mb, + int length, int mflags) { ACE_TRACE ("ACE_SV_Message_Queue::send"); diff --git a/ace/SV_Semaphore_Complex.cpp b/ace/SV_Semaphore_Complex.cpp index f8a3cdb504d..84ec4681acf 100644 --- a/ace/SV_Semaphore_Complex.cpp +++ b/ace/SV_Semaphore_Complex.cpp @@ -3,11 +3,11 @@ #include "ace/SV_Semaphore_Complex.h" #include "ace/Log_Msg.h" -#include "ace/os_include/sys/os_sem.h" +#include "ace/OS_NS_Thread.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/SV_Semaphore_Complex.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_RCSID(ace, SV_Semaphore_Complex, "$Id$") diff --git a/ace/SV_Semaphore_Complex.h b/ace/SV_Semaphore_Complex.h index 3d2a9eb6452..88e9fa3008c 100644 --- a/ace/SV_Semaphore_Complex.h +++ b/ace/SV_Semaphore_Complex.h @@ -147,9 +147,9 @@ private: static sembuf op_unlock_[1]; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SV_Semaphore_Complex.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" #endif /* ACE_SV_SEMAPHORE_COMPLEX_H */ diff --git a/ace/SV_Semaphore_Complex.i b/ace/SV_Semaphore_Complex.i index d2248f1a959..00c3450c1bd 100644 --- a/ace/SV_Semaphore_Complex.i +++ b/ace/SV_Semaphore_Complex.i @@ -1,79 +1,77 @@ /* -*- C++ -*- */ // $Id$ -// SV_Semaphore_Complex.i - -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Complex::acquire (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire"); return ACE_SV_Semaphore_Simple::acquire ((u_short) n + 2, flags); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Complex::acquire_read (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_read"); return this->acquire (n, flags); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Complex::acquire_write (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Complex::acquire_write"); return this->acquire (n, flags); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Complex::tryacquire (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire"); return ACE_SV_Semaphore_Simple::tryacquire ((u_short) n + 2, flags); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Complex::tryacquire_read (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_read"); return this->tryacquire (n, flags); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Complex::tryacquire_write (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Complex::tryacquire_write"); return this->tryacquire (n, flags); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Complex::release (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Complex::release"); return ACE_SV_Semaphore_Simple::release ((u_short) n + 2, flags); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Complex::op (int val, u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Complex::op"); return ACE_SV_Semaphore_Simple::op (val, (u_short) n + 2, flags); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Complex::op (sembuf op_vec[], u_short n) const { ACE_TRACE ("ACE_SV_Semaphore_Complex::op"); return ACE_SV_Semaphore_Simple::op (op_vec, (u_short) n + 2); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Complex::control (int cmd, semun arg, u_short n) const { ACE_TRACE ("ACE_SV_Semaphore_Complex::control"); return ACE_SV_Semaphore_Simple::control (cmd, arg, (u_short) n + 2); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Complex::control (int cmd, int value, u_short n) const { ACE_TRACE ("ACE_SV_Semaphore_Complex::control"); diff --git a/ace/SV_Semaphore_Simple.cpp b/ace/SV_Semaphore_Simple.cpp index 5963cf70b72..39f0107f640 100644 --- a/ace/SV_Semaphore_Simple.cpp +++ b/ace/SV_Semaphore_Simple.cpp @@ -3,9 +3,9 @@ #include "ace/ACE.h" #include "ace/os_include/sys/os_sem.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/SV_Semaphore_Simple.i" -#endif +#endif /* !__ACE_INLINE__ */ ACE_RCSID (ace, SV_Semaphore_Simple, diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h index 4d9e0c41cf1..d7b6e32fcb2 100644 --- a/ace/SV_Semaphore_Simple.h +++ b/ace/SV_Semaphore_Simple.h @@ -168,9 +168,9 @@ protected: key_t name_2_key (const char *name); }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/SV_Semaphore_Simple.i" -#endif +#endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/ace/SV_Semaphore_Simple.i b/ace/SV_Semaphore_Simple.i index 3fd4fb9f81c..a6490c18ac8 100644 --- a/ace/SV_Semaphore_Simple.i +++ b/ace/SV_Semaphore_Simple.i @@ -6,33 +6,33 @@ #include "ace/Global_Macros.h" #include "ace/OS_NS_Thread.h" -ASYS_INLINE int -ACE_SV_Semaphore_Simple::control (int cmd, - semun arg, +ACE_INLINE int +ACE_SV_Semaphore_Simple::control (int cmd, + semun arg, u_short n) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::control"); - return this->internal_id_ == -1 ? + return this->internal_id_ == -1 ? -1 : ACE_OS::semctl (this->internal_id_, n, cmd, arg); } // Close a ACE_SV_Semaphore, marking it as invalid for subsequent // operations... -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Simple::close (void) { ACE_TRACE ("ACE_SV_Semaphore_Simple::close"); return this->init (); } -// General ACE_SV_Semaphore operation on an array of SV_Semaphores. - -ASYS_INLINE int +// General ACE_SV_Semaphore operation on an array of SV_Semaphores. + +ACE_INLINE int ACE_SV_Semaphore_Simple::op (sembuf op_vec[], u_short n) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::op"); - return this->internal_id_ == -1 + return this->internal_id_ == -1 ? -1 : ACE_OS::semop (this->internal_id_, op_vec, n); } @@ -40,48 +40,48 @@ ACE_SV_Semaphore_Simple::op (sembuf op_vec[], u_short n) const // decrement it by 1 and return. Dijkstra's P operation, Tannenbaums // DOWN operation. -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Simple::acquire (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire"); return this->op (-1, n, flags); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Simple::acquire_read (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire_read"); return this->acquire (n, flags); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Simple::acquire_write (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::acquire_write"); return this->acquire (n, flags); } -// Non-blocking version of acquire(). +// Non-blocking version of acquire(). -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Simple::tryacquire (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire"); return this->op (-1, n, flags | IPC_NOWAIT); } -// Non-blocking version of acquire(). +// Non-blocking version of acquire(). -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Simple::tryacquire_read (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire_read"); return this->tryacquire (n, flags); } -// Non-blocking version of acquire(). +// Non-blocking version of acquire(). -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Simple::tryacquire_write (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::tryacquire_write"); @@ -91,14 +91,14 @@ ACE_SV_Semaphore_Simple::tryacquire_write (u_short n, int flags) const // Increment ACE_SV_Semaphore by one. Dijkstra's V operation, // Tannenbaums UP operation. -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Simple::release (u_short n, int flags) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::release"); return this->op (1, n, flags); } -ASYS_INLINE int +ACE_INLINE int ACE_SV_Semaphore_Simple::get_id (void) const { ACE_TRACE ("ACE_SV_Semaphore_Simple::get_id"); diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp index 394a3c77844..a4a6fe36eac 100644 --- a/ace/Select_Reactor_Base.cpp +++ b/ace/Select_Reactor_Base.cpp @@ -8,6 +8,7 @@ #include "ace/Timer_Heap.h" #include "ace/Log_Msg.h" #include "ace/Signal.h" +#include "ace/OS_NS_fcntl.h" #if !defined (__ACE_INLINE__) #include "ace/Select_Reactor_Base.i" diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index 4a34f319061..15f7193728c 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -528,13 +528,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::timer_queue return 0; } -template <class ACE_SELECT_REACTOR_TOKEN> int -ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::set_timer_queue - (ACE_Timer_Queue *tq) -{ - return this->timer_queue (tq); -} - template <class ACE_SELECT_REACTOR_TOKEN> ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T (ACE_Sig_Handler *sh, diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h index 630c3cc587d..e4882bd7944 100644 --- a/ace/Select_Reactor_T.h +++ b/ace/Select_Reactor_T.h @@ -187,10 +187,6 @@ public: /// Use a user specified signal handler instead. virtual int set_sig_handler (ACE_Sig_Handler *signal_handler); - /// @deprecated The following method is deprecated. Use <timer_queue> instead. - /// Set a user specified timer queue. - virtual int set_timer_queue (ACE_Timer_Queue *tq); - /// Set a user-specified timer queue. virtual int timer_queue (ACE_Timer_Queue *tq); diff --git a/ace/Service_Config.h b/ace/Service_Config.h index e8b746369c1..0bb29ffa1ea 100644 --- a/ace/Service_Config.h +++ b/ace/Service_Config.h @@ -26,7 +26,7 @@ #include "ace/Unbounded_Set.h" #include "ace/SString.h" #include "ace/XML_Svc_Conf.h" - +#include "ace/OS_NS_signal.h" // Forward decl. class ACE_Service_Object; diff --git a/ace/Service_Manager.i b/ace/Service_Manager.i index a040265d05f..f329d08adfb 100644 --- a/ace/Service_Manager.i +++ b/ace/Service_Manager.i @@ -1,8 +1,6 @@ /* -*- C++ -*- */ // $Id$ -// Service_Manager.i - ACE_INLINE ACE_Service_Manager::~ACE_Service_Manager (void) { diff --git a/ace/Shared_Object.i b/ace/Shared_Object.i index 97ca0090c6d..36a42157cb2 100644 --- a/ace/Shared_Object.i +++ b/ace/Shared_Object.i @@ -1,8 +1,6 @@ /* -*- C++ -*- */ // $Id$ -// Shared_Object.i - ACE_INLINE ACE_Shared_Object::ACE_Shared_Object (void) { diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp index 43ffd037bb9..fcb6bf1f87c 100644 --- a/ace/Strategies_T.cpp +++ b/ace/Strategies_T.cpp @@ -16,9 +16,9 @@ #include "ace/OS_NS_string.h" #include "ace/OS_Errno.h" -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#if !defined (__ACE_INLINE__) #include "ace/Strategies_T.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ ACE_RCSID (ace, diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h index cc89e66eef7..cf57c0b61bc 100644 --- a/ace/Strategies_T.h +++ b/ace/Strategies_T.h @@ -1055,9 +1055,9 @@ protected: int delete_recycling_strategy_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/Strategies_T.i" -#endif /* ACE_LACKS_INLINE_FUNCTIONS */ +#endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Strategies_T.cpp" diff --git a/ace/Strategies_T.i b/ace/Strategies_T.i index 9a91518d359..41f625a2063 100644 --- a/ace/Strategies_T.i +++ b/ace/Strategies_T.i @@ -1,13 +1,12 @@ // -*- C++ -*- -// // $Id$ -template<class SVC_HANDLER> ASYS_INLINE +template<class SVC_HANDLER> ACE_INLINE ACE_Recycling_Strategy<SVC_HANDLER>::~ACE_Recycling_Strategy (void) { } -template<class SVC_HANDLER> ASYS_INLINE int +template<class SVC_HANDLER> ACE_INLINE int ACE_Recycling_Strategy<SVC_HANDLER>::assign_recycler (SVC_HANDLER *svc_handler, ACE_Connection_Recycling_Strategy *recycler, const void *recycling_act) @@ -16,13 +15,13 @@ ACE_Recycling_Strategy<SVC_HANDLER>::assign_recycler (SVC_HANDLER *svc_handler, return 0; } -template<class SVC_HANDLER> ASYS_INLINE int +template<class SVC_HANDLER> ACE_INLINE int ACE_Recycling_Strategy<SVC_HANDLER>::prepare_for_recycling (SVC_HANDLER *svc_handler) { return svc_handler->recycle (); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy (SVC_HANDLER *sh, ACE_Thread_Manager *tm) : svc_handler_ (0), @@ -35,7 +34,7 @@ ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy (SVC_HANDLER *sh, ACE_LIB_TEXT ("ACE_Singleton_Strategy"))); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Singleton_Strategy<SVC_HANDLER>::~ACE_Singleton_Strategy (void) { ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::~ACE_Singleton_Strategy"); @@ -46,7 +45,7 @@ ACE_Singleton_Strategy<SVC_HANDLER>::~ACE_Singleton_Strategy (void) // Create a Singleton SVC_HANDLER by always returning the same // SVC_HANDLER. -template <class SVC_HANDLER> ASYS_INLINE int +template <class SVC_HANDLER> ACE_INLINE int ACE_Singleton_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh) { ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::make_svc_handler"); @@ -54,7 +53,7 @@ ACE_Singleton_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh) return 0; } -template <class SVC_HANDLER> ASYS_INLINE int +template <class SVC_HANDLER> ACE_INLINE int ACE_Creation_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr, ACE_Reactor *reactor) { @@ -64,7 +63,7 @@ ACE_Creation_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr, return 0; } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy (ACE_Thread_Manager *thr_mgr, ACE_Reactor *reactor) { @@ -78,7 +77,7 @@ ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy (ACE_Thread_Manager *t // Default behavior is to make a new SVC_HANDLER, passing in the // Thread_Manager (if any). -template <class SVC_HANDLER> ASYS_INLINE int +template <class SVC_HANDLER> ACE_INLINE int ACE_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh) { ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::make_svc_handler"); @@ -89,13 +88,13 @@ ACE_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh) return 0; } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Creation_Strategy<SVC_HANDLER>::~ACE_Creation_Strategy (void) { ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::~ACE_Creation_Strategy"); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const char dll_name[], const char factory_function[], const char svc_name[], @@ -113,26 +112,26 @@ ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const char dll_name[], ACE_LIB_TEXT ("open"))); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (void) { ACE_TRACE ("ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy"); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Concurrency_Strategy<SVC_HANDLER>::ACE_Concurrency_Strategy (int flags) : flags_ (flags) { ACE_TRACE ("ACE_Concurrency_Strategy<SVC_HANDLER>::~ACE_Concurrency_Strategy"); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Concurrency_Strategy<SVC_HANDLER>::~ACE_Concurrency_Strategy (void) { ACE_TRACE ("ACE_Concurrency_Strategy<SVC_HANDLER>::~ACE_Concurrency_Strategy"); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (ACE_Reactor *reactor, ACE_Reactor_Mask mask, int flags) @@ -147,7 +146,7 @@ ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (ACE_Reactor *reactor, ACE_LIB_TEXT ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy"))); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (int flags) : ACE_Concurrency_Strategy<SVC_HANDLER> (flags), reactor_ (0), @@ -156,13 +155,13 @@ ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (int flags) ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy"); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Reactive_Strategy<SVC_HANDLER>::~ACE_Reactive_Strategy (void) { ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::~ACE_Reactive_Strategy"); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (ACE_Thread_Manager *thr_mgr, long thr_flags, int n_threads, @@ -179,7 +178,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (ACE_Thread_Manager *thr_m ACE_LIB_TEXT ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy"))); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (int flags) : ACE_Concurrency_Strategy<SVC_HANDLER> (flags), thr_mgr_ (0), @@ -189,34 +188,34 @@ ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (int flags) ACE_TRACE ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy"); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Thread_Strategy<SVC_HANDLER>::~ACE_Thread_Strategy (void) { ACE_TRACE ("ACE_Thread_Strategy<SVC_HANDLER>::~ACE_Thread_Strategy"); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ASYS_INLINE +template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_INLINE ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy (ACE_Reactor *reactor) : reactor_ (reactor) { ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy"); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ASYS_INLINE ACE_HANDLE +template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_INLINE ACE_HANDLE ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const { ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle"); return this->peer_acceptor_.get_handle (); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ASYS_INLINE ACE_PEER_ACCEPTOR & +template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_INLINE ACE_PEER_ACCEPTOR & ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor (void) const { ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor"); return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_; } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ASYS_INLINE +template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_INLINE ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy (void) { ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy"); @@ -225,26 +224,26 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy (voi this->peer_acceptor_.close (); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ASYS_INLINE ACE_PEER_CONNECTOR & +template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_INLINE ACE_PEER_CONNECTOR & ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connector (void) const { ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connector"); return (ACE_PEER_CONNECTOR &) this->connector_; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ASYS_INLINE +template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_INLINE ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connect_Strategy (void) { ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connect_Strategy"); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ASYS_INLINE +template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_INLINE ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connect_Strategy (void) { ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connect_Strategy"); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Process_Strategy<SVC_HANDLER>::ACE_Process_Strategy (size_t n_processes, ACE_Event_Handler *acceptor, ACE_Reactor *reactor, @@ -260,39 +259,39 @@ ACE_Process_Strategy<SVC_HANDLER>::ACE_Process_Strategy (size_t n_processes, ACE_LIB_TEXT ("ACE_Process_Strategy"))); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Process_Strategy<SVC_HANDLER>::~ACE_Process_Strategy (void) { ACE_TRACE ("ACE_Process_Strategy<SVC_HANDLER>::~ACE_Process_Strategy"); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Scheduling_Strategy<SVC_HANDLER>::ACE_Scheduling_Strategy (SVC_HANDLER *) { ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::ACE_Scheduling_Strategy"); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Scheduling_Strategy<SVC_HANDLER>::~ACE_Scheduling_Strategy (void) { ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::~ACE_Scheduling_Strategy"); } -template <class SVC_HANDLER> ASYS_INLINE int +template <class SVC_HANDLER> ACE_INLINE int ACE_Scheduling_Strategy<SVC_HANDLER>::suspend (void) { ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::suspend"); return -1; } -template <class SVC_HANDLER> ASYS_INLINE int +template <class SVC_HANDLER> ACE_INLINE int ACE_Scheduling_Strategy<SVC_HANDLER>::resume (void) { ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::resume"); return -1; } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::ACE_Schedule_All_Reactive_Strategy (SVC_HANDLER *scheduler) : ACE_Scheduling_Strategy<SVC_HANDLER> (scheduler) @@ -305,21 +304,21 @@ ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::ACE_Schedule_All_Reactive_Strat this->reactor_ = scheduler->reactor (); } -template <class SVC_HANDLER> ASYS_INLINE int +template <class SVC_HANDLER> ACE_INLINE int ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::suspend (void) { ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::suspend"); return this->reactor_->suspend_handlers (); } -template <class SVC_HANDLER> ASYS_INLINE int +template <class SVC_HANDLER> ACE_INLINE int ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::resume (void) { ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::resume"); return this->reactor_->resume_handlers (); } -template <class SVC_HANDLER> ASYS_INLINE +template <class SVC_HANDLER> ACE_INLINE ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::ACE_Schedule_All_Threaded_Strategy (SVC_HANDLER *scheduler) : ACE_Scheduling_Strategy<SVC_HANDLER> (scheduler) @@ -332,21 +331,21 @@ ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::ACE_Schedule_All_Threaded_Strat this->thr_mgr_ = scheduler->thr_mgr (); } -template <class SVC_HANDLER> ASYS_INLINE int +template <class SVC_HANDLER> ACE_INLINE int ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::suspend (void) { ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::suspend"); return this->thr_mgr_->suspend_all (); } -template <class SVC_HANDLER> ASYS_INLINE int +template <class SVC_HANDLER> ACE_INLINE int ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::resume (void) { ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::resume"); return this->thr_mgr_->resume_all (); } -template <class T> ASYS_INLINE +template <class T> ACE_INLINE ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (void) : ACE_Refcountable (0), ACE_Hashable (), @@ -355,7 +354,7 @@ ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (void) { } -template <class T> ASYS_INLINE +template <class T> ACE_INLINE ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (const T &t, int refcount, ACE_Recyclable_State state) @@ -366,24 +365,24 @@ ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (const T &t, { } -template <class T> ASYS_INLINE +template <class T> ACE_INLINE ACE_Refcounted_Hash_Recyclable<T>::~ACE_Refcounted_Hash_Recyclable (void) { } -template <class T> ASYS_INLINE u_long +template <class T> ACE_INLINE u_long ACE_Refcounted_Hash_Recyclable<T>::hash_i (void) const { return this->t_.hash (); } -template <class T> ASYS_INLINE T & +template <class T> ACE_INLINE T & ACE_Refcounted_Hash_Recyclable<T>::subject (void) { return this->t_; } -template <class T> ASYS_INLINE bool +template <class T> ACE_INLINE bool ACE_Refcounted_Hash_Recyclable<T>::operator== (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const { return @@ -391,20 +390,20 @@ ACE_Refcounted_Hash_Recyclable<T>::operator== (const ACE_Refcounted_Hash_Recycla && this->t_ == rhs.t_; } -template <class T> ASYS_INLINE bool +template <class T> ACE_INLINE bool ACE_Refcounted_Hash_Recyclable<T>::operator!= (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const { return !this->operator== (rhs); } -template <class SVC_HANDLER> ASYS_INLINE int +template <class SVC_HANDLER> ACE_INLINE int ACE_NOOP_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&) { ACE_TRACE ("ACE_NOOP_Creation_Strategy<SVC_HANDLER>::make_svc_handler"); return 0; } -template <class SVC_HANDLER> ASYS_INLINE int +template <class SVC_HANDLER> ACE_INLINE int ACE_NOOP_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *, void *) { @@ -412,21 +411,21 @@ ACE_NOOP_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *, return 0; } -template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ASYS_INLINE int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_INLINE int ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::make_svc_handler (SVC_HANDLER *&sh) { return this->creation_strategy_->make_svc_handler (sh); } -template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ASYS_INLINE int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_INLINE int ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::activate_svc_handler (SVC_HANDLER *svc_handler) { return this->concurrency_strategy_->activate_svc_handler (svc_handler); } -template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ASYS_INLINE int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_INLINE int ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::assign_recycler (SVC_HANDLER *svc_handler, ACE_Connection_Recycling_Strategy *recycler, @@ -437,7 +436,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::assign_re recycling_act); } -template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ASYS_INLINE int +template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_INLINE int ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::prepare_for_recycling (SVC_HANDLER *svc_handler) { diff --git a/ace/Stream.h b/ace/Stream.h index 04a0d927cd5..c96d6222afd 100644 --- a/ace/Stream.h +++ b/ace/Stream.h @@ -23,11 +23,11 @@ #include "ace/IO_Cntl_Msg.h" #include "ace/Message_Block.h" -#include "ace/Time_Value.h" #include "ace/Module.h" // Forward decls. template<ACE_SYNCH_DECL> class ACE_Stream_Iterator; +class ACE_Time_Value; /** * @class ACE_Stream diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp index e6a57bc13ed..7e4f4954bfb 100644 --- a/ace/Svc_Conf_l.cpp +++ b/ace/Svc_Conf_l.cpp @@ -26,6 +26,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_ctype.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" /* Use prototypes in function declarations. */ #define ACE_YY_USE_PROTOS diff --git a/ace/Synch.cpp b/ace/Synch.cpp index 3d284d08c1b..6a81cb386f7 100644 --- a/ace/Synch.cpp +++ b/ace/Synch.cpp @@ -17,11 +17,6 @@ ACE_RCSID (ace, Synch, "$Id$") - -#if !defined (__ACE_INLINE__) -#include "ace/Synch.i" -#endif /* __ACE_INLINE__ */ - #include "ace/TSS_Adapter.cpp" #include "ace/Auto_Event.cpp" #include "ace/Manual_Event.cpp" diff --git a/ace/Synch.h b/ace/Synch.h index 7ee3f01594f..2d452ca8ee3 100644 --- a/ace/Synch.h +++ b/ace/Synch.h @@ -47,10 +47,6 @@ #include "ace/Thread_Semaphore.h" #include "ace/TSS_Adapter.h" -#if defined (__ACE_INLINE__) -#include "ace/Synch.i" -#endif /* __ACE_INLINE__ */ - // Include the templates here. // FUZZ: disable check_for_synch_include #include "ace/Synch_T.h" diff --git a/ace/Synch.i b/ace/Synch.i deleted file mode 100644 index 6318deb79a0..00000000000 --- a/ace/Synch.i +++ /dev/null @@ -1,2 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ diff --git a/ace/Synch_Options.i b/ace/Synch_Options.i index 3c16b199ac8..3cba94e0fef 100644 --- a/ace/Synch_Options.i +++ b/ace/Synch_Options.i @@ -1,8 +1,6 @@ /* -*- C++ -*- */ // $Id$ -// Synch_Options.i - ACE_INLINE ACE_Synch_Options::~ACE_Synch_Options (void) { diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp index 1d15fdda1ce..b41640ba1d2 100644 --- a/ace/Synch_T.cpp +++ b/ace/Synch_T.cpp @@ -15,10 +15,6 @@ ACE_RCSID(ace, Synch_T, "$Id$") -#if !defined (__ACE_INLINE__) -#include "ace/Synch_T.i" -#endif /* __ACE_INLINE__ */ - #include "ace/Lock_Adapter_T.cpp" #include "ace/Reverse_Lock_T.cpp" #include "ace/Guard_T.cpp" diff --git a/ace/Synch_T.h b/ace/Synch_T.h index a80e3fe198d..9b9eba49734 100644 --- a/ace/Synch_T.h +++ b/ace/Synch_T.h @@ -30,10 +30,6 @@ #include "ace/Condition_T.h" #include "ace/Synch_Traits.h" -#if defined (__ACE_INLINE__) -#include "ace/Synch_T.i" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Synch_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/ace/Synch_T.i b/ace/Synch_T.i deleted file mode 100644 index 6318deb79a0..00000000000 --- a/ace/Synch_T.i +++ /dev/null @@ -1,2 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ diff --git a/ace/System_Time.cpp b/ace/System_Time.cpp index 125fa2f5050..da8e6bbba07 100644 --- a/ace/System_Time.cpp +++ b/ace/System_Time.cpp @@ -4,6 +4,7 @@ #include "ace/System_Time.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_time.h" +#include "ace/Time_Value.h" ACE_RCSID(ace, System_Time, "$Id$") @@ -21,11 +22,11 @@ ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname) ACE_OS::strcpy (this->poolname_, ACE_DEFAULT_BACKING_STORE); #else /* ACE_DEFAULT_BACKING_STORE */ - if (ACE_Lib_Find::get_temp_dir (this->poolname_, + if (ACE_Lib_Find::get_temp_dir (this->poolname_, MAXPATHLEN - 17) == -1) // -17 for ace-malloc-XXXXXX { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("Temporary path too long, ") ACE_LIB_TEXT ("defaulting to current directory\n"))); this->poolname_[0] = 0; @@ -33,14 +34,14 @@ ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname) // Add the filename to the end ACE_OS::strcat (this->poolname_, ACE_LIB_TEXT ("ace-malloc-XXXXXX")); - + #endif /* ACE_DEFAULT_BACKING_STORE */ } else ACE_OS::strsncpy (this->poolname_, poolname, (sizeof this->poolname_ / sizeof (ACE_TCHAR))); - + ACE_NEW (this->shmem_, ALLOCATOR (this->poolname_)); } diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h index 2eb8008030c..34ea375dea1 100644 --- a/ace/TLI_Acceptor.h +++ b/ace/TLI_Acceptor.h @@ -21,7 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Time_Value.h" #include "ace/TLI_Stream.h" #include "ace/Default_Constants.h" @@ -29,6 +28,7 @@ // Forward reference... class ACE_TLI_Request_Queue; +class ACE_Time_Value /** * @class ACE_TLI_Acceptor diff --git a/ace/Test_and_Set.h b/ace/Test_and_Set.h index edb8ce906cc..37e810f1b4e 100644 --- a/ace/Test_and_Set.h +++ b/ace/Test_and_Set.h @@ -60,10 +60,6 @@ private: ACE_LOCK lock_; }; -#if defined (__ACE_INLINE__) -#include "ace/Test_and_Set.i" -#endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Test_and_Set.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/ace/Test_and_Set.i b/ace/Test_and_Set.i deleted file mode 100644 index cfa1da318d3..00000000000 --- a/ace/Test_and_Set.i +++ /dev/null @@ -1 +0,0 @@ -// $Id$ diff --git a/ace/Thread_Adapter.inl b/ace/Thread_Adapter.inl index 53855b300cc..433023aad93 100644 --- a/ace/Thread_Adapter.inl +++ b/ace/Thread_Adapter.inl @@ -1,3 +1,4 @@ +/* -*- C++ -*- */ // $Id$ ACE_INLINE ACE_Thread_Manager * diff --git a/ace/Timeprobe.i b/ace/Timeprobe.i index 7704c9b4edd..2815dd56e0c 100644 --- a/ace/Timeprobe.i +++ b/ace/Timeprobe.i @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ ACE_INLINE bool diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h index 2f2794e605f..b6903aaa552 100644 --- a/ace/Token_Request_Reply.h +++ b/ace/Token_Request_Reply.h @@ -26,8 +26,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Time_Value.h" - #if defined (ACE_HAS_TOKENS_LIBRARY) // Specifies the size of the fixed length portion of diff --git a/ace/UPIPE_Acceptor.cpp b/ace/UPIPE_Acceptor.cpp index 9569e75697c..56d26c4dc1d 100644 --- a/ace/UPIPE_Acceptor.cpp +++ b/ace/UPIPE_Acceptor.cpp @@ -7,9 +7,11 @@ ACE_RCSID(ace, UPIPE_Acceptor, "$Id$") #if defined (ACE_HAS_THREADS) -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#include "ace/OS_NS_unistd.h" + +#if !defined (__ACE_INLINE__) #include "ace/UPIPE_Acceptor.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Acceptor) diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h index 4ef911218b6..17d17f80bfb 100644 --- a/ace/UPIPE_Acceptor.h +++ b/ace/UPIPE_Acceptor.h @@ -84,9 +84,9 @@ private: ACE_Message_Block mb_; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/UPIPE_Acceptor.i" -#endif +#endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_THREADS */ #include /**/ "ace/post.h" diff --git a/ace/UPIPE_Acceptor.i b/ace/UPIPE_Acceptor.i index d47cf593242..0e28e250ab0 100644 --- a/ace/UPIPE_Acceptor.i +++ b/ace/UPIPE_Acceptor.i @@ -1,9 +1,7 @@ /* -*- C++ -*- */ // $Id$ -// UPIPE_Acceptor.i - -ASYS_INLINE int +ACE_INLINE int ACE_UPIPE_Acceptor::remove (void) { ACE_TRACE ("ACE_UPIPE_Acceptor::remove"); diff --git a/ace/UPIPE_Connector.cpp b/ace/UPIPE_Connector.cpp index 2f1b58a44ae..5d4953aac76 100644 --- a/ace/UPIPE_Connector.cpp +++ b/ace/UPIPE_Connector.cpp @@ -7,9 +7,11 @@ ACE_RCSID(ace, UPIPE_Connector, "$Id$") #if defined (ACE_HAS_THREADS) -#if defined (ACE_LACKS_INLINE_FUNCTIONS) +#include "ace/OS_NS_unistd.h" + +#if !defined (__ACE_INLINE__) #include "ace/UPIPE_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ ACE_ALLOC_HOOK_DEFINE(ACE_UPIPE_Connector) diff --git a/ace/UPIPE_Connector.h b/ace/UPIPE_Connector.h index e2d338f3a56..6a7378001fd 100644 --- a/ace/UPIPE_Connector.h +++ b/ace/UPIPE_Connector.h @@ -102,9 +102,9 @@ public: ACE_ALLOC_HOOK_DECLARE; }; -#if !defined (ACE_LACKS_INLINE_FUNCTIONS) +#if defined (__ACE_INLINE__) #include "ace/UPIPE_Connector.i" -#endif +#endif /* __ACE_INLINE__ */ #endif /* ACE_HAS_THREADS */ #include /**/ "ace/post.h" diff --git a/ace/UPIPE_Connector.i b/ace/UPIPE_Connector.i index a8a68342e77..980d8a28164 100644 --- a/ace/UPIPE_Connector.i +++ b/ace/UPIPE_Connector.i @@ -1,11 +1,8 @@ /* -*- C++ -*- */ // $Id$ -// UPIPE_Connector.i - // Creates a Local ACE_UPIPE. - -ASYS_INLINE +ACE_INLINE ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, const ACE_UPIPE_Addr &addr, ACE_Time_Value *timeout, @@ -24,7 +21,7 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, ACE_LIB_TEXT ("ACE_UPIPE_Connector"))); } -ASYS_INLINE int +ACE_INLINE int ACE_UPIPE_Connector::reset_new_handle (ACE_HANDLE handle) { ACE_UNUSED_ARG (handle); diff --git a/ace/UPIPE_Stream.i b/ace/UPIPE_Stream.i index c2297fcffce..9bd3912d1ba 100644 --- a/ace/UPIPE_Stream.i +++ b/ace/UPIPE_Stream.i @@ -1,9 +1,7 @@ /* -*- C++ -*- */ // $Id$ -// UPIPE_Stream.i - -ACE_INLINE ACE_HANDLE +ACE_INLINE ACE_HANDLE ACE_UPIPE_Stream::get_handle (void) const { ACE_TRACE ("ACE_UPIPE_Stream::get_handle"); diff --git a/ace/UUID.cpp b/ace/UUID.cpp index 7275243855b..3edfa708470 100644 --- a/ace/UUID.cpp +++ b/ace/UUID.cpp @@ -487,7 +487,7 @@ namespace ACE_Utils template class ACE_Singleton <ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Singleton <ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX> -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) +#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX> * ACE_Singleton<ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp index 9dc2a15102f..7c13983afdc 100644 --- a/ace/WFMO_Reactor.cpp +++ b/ace/WFMO_Reactor.cpp @@ -1271,12 +1271,6 @@ ACE_WFMO_Reactor::timer_queue (ACE_Timer_Queue *tq) } int -ACE_WFMO_Reactor::set_timer_queue (ACE_Timer_Queue *tq) -{ - return this->timer_queue (tq); -} - -int ACE_WFMO_Reactor::close (void) { // This GUARD is necessary since we are updating shared state. diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h index 988de26dd37..dd3ec03f1cb 100644 --- a/ace/WFMO_Reactor.h +++ b/ace/WFMO_Reactor.h @@ -696,11 +696,6 @@ public: /// Use a user specified signal handler instead. virtual int set_sig_handler (ACE_Sig_Handler *signal_handler); - /// @deprecated The following method is deprecated. - /// Instead, either specify a timer queue when creating/opening the - /// object or use the timer_queue() method. - virtual int set_timer_queue (ACE_Timer_Queue *tq); - /// Set a user-specified timer queue. virtual int timer_queue (ACE_Timer_Queue *tq); diff --git a/ace/WIN32_Asynch_IO.cpp b/ace/WIN32_Asynch_IO.cpp index 39367f6a687..b20748f2ec9 100644 --- a/ace/WIN32_Asynch_IO.cpp +++ b/ace/WIN32_Asynch_IO.cpp @@ -14,6 +14,8 @@ ACE_RCSID (ace, #include "ace/INET_Addr.h" #include "ace/Task_T.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_sys_socket.h" size_t ACE_WIN32_Asynch_Result::bytes_transferred (void) const diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp index a6b934c5e95..6905c0d7912 100644 --- a/ace/WIN32_Proactor.cpp +++ b/ace/WIN32_Proactor.cpp @@ -10,6 +10,7 @@ #include "ace/Log_Msg.h" #include "ace/Object_Manager.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_unistd.h" /** * @class ACE_WIN32_Wakeup_Completion diff --git a/ace/config-openvms.h b/ace/config-openvms.h index 2478d2682f0..e95c8142814 100644 --- a/ace/config-openvms.h +++ b/ace/config-openvms.h @@ -1126,9 +1126,6 @@ ACE_HAS_RLIMIT_RESOURCE_ENUM Platform has enum instead of /*Platform lacks POSIX-style fcntl ().*/ //#define ACE_LACKS_FSYNC /*Platform lacks fsync().*/ -//#define ACE_LACKS_INLINE_FUNCTIONS - /*Platform can't handle "inline" - keyword correctly.*/ //#define ACE_LACKS_EXEC /*Platform lacks the exec() family of system calls (e.g., |