diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-05 20:16:30 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-05 20:16:30 +0000 |
| commit | 11b25d4553594d65ce80b33de96aa3471303aebb (patch) | |
| tree | ddffca9c00e182db5d9619da58395804cdcc3e39 | |
| parent | cb1a8d4ee08782b2783e6f6d26450811bd219cc9 (diff) | |
| download | ATCD-11b25d4553594d65ce80b33de96aa3471303aebb.tar.gz | |
ChangeLogTag: Thu Nov 5 20:13:47 UTC 2009 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 10 | ||||
| -rw-r--r-- | ACE/ace/ACE.cpp | 7 | ||||
| -rw-r--r-- | ACE/ace/ACE.h | 2 | ||||
| -rw-r--r-- | ACE/ace/ACE.inl | 18 |
4 files changed, 17 insertions, 20 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 8ce2092aedb..50b0150b406 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,7 +1,15 @@ +Thu Nov 5 20:13:47 UTC 2009 Olli Savia <ops@iki.fi> + + * ace/ACE.h: + * ace/ACE.inl: + * ace/ACE.cpp: + Moved nibble2hex from .inl to .cpp file to avoid static + data in inline function. + Thu Nov 5 13:58:25 UTC 2009 Olli Savia <ops@iki.fi> * ace/OS_NS_stdlib.h: - Another fix for platforms that define ACE_STRTOLL_EQUIVALENT. + Another fix for platforms that define ACE_STRTOLL_EQUIVALENT or ACE_STRTOULL_EQUIVALENT. Thu Nov 5 13:46:34 UTC 2009 Olli Savia <ops@iki.fi> diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 12a55194c3d..b94c65983c5 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -163,6 +163,13 @@ ACE::compiler_beta_version (void) #endif } +ACE_TCHAR +ACE::nibble2hex (u_int n) +{ + // Yes, this works for UNICODE + return ACE_TEXT ("0123456789abcdef")[n & 0x0f]; +} + bool ACE::debug (void) { diff --git a/ACE/ace/ACE.h b/ACE/ace/ACE.h index 38f4233c8eb..d7f0068e3fb 100644 --- a/ACE/ace/ACE.h +++ b/ACE/ace/ACE.h @@ -627,7 +627,7 @@ namespace ACE ACE_NAMESPACE_INLINE_FUNCTION u_long log2 (u_long num); /// Hex conversion utility. - ACE_NAMESPACE_INLINE_FUNCTION ACE_TCHAR nibble2hex (u_int n); + extern ACE_Export ACE_TCHAR nibble2hex (u_int n); /// Convert a hex character to its byte representation. ACE_NAMESPACE_INLINE_FUNCTION u_char hex2byte (ACE_TCHAR c); diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl index ff48803b2a9..67fd981bf38 100644 --- a/ACE/ace/ACE.inl +++ b/ACE/ace/ACE.inl @@ -319,24 +319,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) { |