diff options
author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-08 23:00:05 +0000 |
---|---|---|
committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-05-08 23:00:05 +0000 |
commit | d1160e68b1301a8b0e120ba8da56bb2e7d4fb49e (patch) | |
tree | cf04398acb7ad9fb45311eb105d60975028bbc03 /ace/Functor.inl | |
parent | 1c3dd540264435be21072a3a69a8a8e969bd2b1a (diff) | |
download | ATCD-d1160e68b1301a8b0e120ba8da56bb2e7d4fb49e.tar.gz |
Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com>oci_wchar_refactor_post_1_5_1_branch
Diffstat (limited to 'ace/Functor.inl')
-rw-r--r-- | ace/Functor.inl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ace/Functor.inl b/ace/Functor.inl index 84e38313b02..c505ed328b3 100644 --- a/ace/Functor.inl +++ b/ace/Functor.inl @@ -56,13 +56,13 @@ ACE_Hash<char>::operator () (char t) const return t; } -#if defined (ACE_HAS_WCHAR) && ! defined (ACE_LACKS_NATIVE_WCHAR_T) +#if !defined (ACE_LACKS_BUILTIN_WCHAR_T) ACE_INLINE unsigned long ACE_Hash<wchar_t>::operator () (wchar_t t) const { return t; } -#endif /* ACE_HAS_WCHAR && ! ACE_LACKS_NATIVE_WCHAR_T */ +#endif /* ACE_LACKS_BUILTIN_WCHAR_T */ ACE_INLINE unsigned long ACE_Hash<signed char>::operator () (signed char t) const @@ -243,9 +243,6 @@ ACE_Less_Than<char *>::operator () (const char *lhs, const char *rhs) const return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0; } - -#if defined (ACE_HAS_WCHAR) - ACE_INLINE unsigned long ACE_Hash<const wchar_t *>::operator () (const wchar_t *t) const { @@ -284,6 +281,5 @@ ACE_Less_Than<wchar_t *>::operator () (const wchar_t *lhs, const wchar_t *rhs) c return (ACE_OS::strcmp (lhs, rhs) < 0) ? 1 : 0; } -#endif // ACE_HAS_WCHAR ACE_END_VERSIONED_NAMESPACE_DECL |