diff options
Diffstat (limited to 'ACE/ace/ACE.inl')
| -rw-r--r-- | ACE/ace/ACE.inl | 49 |
1 files changed, 8 insertions, 41 deletions
diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl index ff48803b2a9..c114deb90ee 100644 --- a/ACE/ace/ACE.inl +++ b/ACE/ace/ACE.inl @@ -238,36 +238,21 @@ ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len) } ACE_INLINE int -ACE::handle_read_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) +ACE::handle_read_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { - return ACE::handle_ready (handle, - timeout, - 1, - 0, - 0); + return ACE::handle_ready (handle, timeout, 1, 0, 0); } ACE_INLINE int -ACE::handle_write_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) +ACE::handle_write_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { - return ACE::handle_ready (handle, - timeout, - 0, - 1, - 0); + return ACE::handle_ready (handle, timeout, 0, 1, 0); } ACE_INLINE int -ACE::handle_exception_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) +ACE::handle_exception_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { - return ACE::handle_ready (handle, - timeout, - 0, - 0, - 1); + return ACE::handle_ready (handle, timeout, 0, 0, 1); } ACE_INLINE void @@ -287,7 +272,7 @@ ACE::strdelete (wchar_t *s) ACE_INLINE bool ACE::isdotdir (const char *s) { - return (s[0] == '.' && + return (s[0] == '.' && ((s[1] == 0) || (s[1] == '.' && s[2] == 0))); } @@ -295,7 +280,7 @@ ACE::isdotdir (const char *s) ACE_INLINE bool ACE::isdotdir (const wchar_t *s) { - return (s[0] == ACE_TEXT ('.') && + return (s[0] == ACE_TEXT ('.') && ((s[1] == 0) || (s[1] == ACE_TEXT ('.') && s[2] == 0))); } #endif /* ACE_HAS_WCHAR */ @@ -319,24 +304,6 @@ ACE::log2 (u_long num) return log; } -ACE_INLINE ACE_TCHAR -ACE::nibble2hex (u_int n) -{ - // Hexadecimal characters. -#if defined (ACE_VXWORKS) && !defined (__DCPLUSPLUS__) - // temporary solution to prevent Windriver GNU toolchains from spewing - // loads of warnings when inlining. - // problem (incorrect warning leftover from older GNU) has been reported as - // TSR to Windriver. - const ACE_TCHAR hex_chars[] = ACE_TEXT ("0123456789abcdef"); -#else - static const ACE_TCHAR hex_chars[] = ACE_TEXT ("0123456789abcdef"); -#endif - - // Yes, this works for UNICODE - return hex_chars[n & 0x0f]; -} - ACE_INLINE int ACE::map_errno (int error) { |