diff options
Diffstat (limited to 'ace/ACE.inl')
| -rw-r--r-- | ace/ACE.inl | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/ace/ACE.inl b/ace/ACE.inl index f4e3c2e0cb2..1462d083e53 100644 --- a/ace/ACE.inl +++ b/ace/ACE.inl @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ #include "ace/OS_NS_unistd.h" @@ -7,10 +6,6 @@ #include "ace/os_include/os_ctype.h" #include "ace/OS_NS_sys_socket.h" -// Open versioned namespace, if enabled by the user. -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - - // Wrappers for methods that have been moved to ACE_OS. ACE_INLINE ssize_t @@ -271,20 +266,6 @@ ACE::handle_exception_ready (ACE_HANDLE handle, } ACE_INLINE void -ACE::strdelete (char *s) -{ - delete [] s; -} - -#if defined (ACE_HAS_WCHAR) -ACE_INLINE void -ACE::strdelete (wchar_t *s) -{ - delete [] s; -} -#endif /* ACE_HAS_WCHAR */ - -ACE_INLINE void ACE::unique_name (const void *object, ACE_TCHAR *name, size_t length) @@ -303,7 +284,7 @@ ACE::log2 (u_long num) return log; } -ACE_INLINE ACE_TCHAR +ACE_INLINE char ACE::nibble2hex (u_int n) { // Hexadecimal characters. @@ -312,9 +293,9 @@ ACE::nibble2hex (u_int n) // 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_LIB_TEXT ("0123456789abcdef"); + const char hex_chars[] = "0123456789abcdef"; #else - static const ACE_TCHAR hex_chars[] = ACE_LIB_TEXT ("0123456789abcdef"); + static const char hex_chars[] = "0123456789abcdef"; #endif // @@ UNICODE does this work? @@ -331,6 +312,3 @@ ACE::hex2byte (ACE_TCHAR c) else return (u_char) (10 + c - ACE_LIB_TEXT ('A')); } - -// Close versioned namespace, if enabled by the user. -ACE_END_VERSIONED_NAMESPACE_DECL |