From 10c295e12625fd5bcb63ac0a26f235f1a1ae6a2c Mon Sep 17 00:00:00 2001 From: mcorino Date: Tue, 30 Nov 2004 09:50:27 +0000 Subject: ChangeLogTag: Tue Nov 30 09:51:12 UTC 2004 Martin Corino --- ChangeLog | 5 +++++ ace/ACE.inl | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 66e9ba6bced..3911c8bde2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 30 09:51:12 UTC 2004 Martin Corino + + * ace/ACE.inl: + Implemented temporary fix for problems with VxWorks GNU toolchains. + Mon Nov 29 17:56:39 2004 Steve Huston * tests/Test_Output.cpp: Re this change: diff --git a/ace/ACE.inl b/ace/ACE.inl index a0e8afc0a22..3384548b5ca 100644 --- a/ace/ACE.inl +++ b/ace/ACE.inl @@ -288,7 +288,15 @@ 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_LIB_TEXT ("0123456789abcdef"); +#else static const ACE_TCHAR hex_chars[] = ACE_LIB_TEXT ("0123456789abcdef"); +#endif // @@ UNICODE does this work? return hex_chars[n & 0x0f]; -- cgit v1.2.1