diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-10-08 08:21:27 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-10-08 08:21:27 +0000 |
| commit | e8d36437376b131bc6f9d7191db5137ea3607618 (patch) | |
| tree | 6d842f7f0c792b3607e3932858c15eb4a452b211 /ACE/ace/OS_NS_stdio.inl | |
| parent | 5c60137bf4fedf76c65486aa35a44e77cadfea65 (diff) | |
| download | ATCD-e8d36437376b131bc6f9d7191db5137ea3607618.tar.gz | |
ChangeLogTag: Fri Oct 8 08:20:04 UTC 2010 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/ace/OS_NS_stdio.inl')
| -rw-r--r-- | ACE/ace/OS_NS_stdio.inl | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index 9fea6cc8811..e24a4024f11 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -805,12 +805,7 @@ ACE_OS::rename (const char *old_name, const char *new_name, int flags) { -# if defined (ACE_LACKS_RENAME) - ACE_UNUSED_ARG (old_name); - ACE_UNUSED_ARG (new_name); - ACE_UNUSED_ARG (flags); - ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) // Win CE is always wide-char. ACE_UNUSED_ARG (flags); if (0 == ::MoveFile (ACE_TEXT_CHAR_TO_TCHAR (old_name), @@ -827,10 +822,10 @@ ACE_OS::rename (const char *old_name, if (::MoveFileExA (old_name, new_name, flags) == 0) ACE_FAIL_RETURN (-1); return 0; -# else /* ACE_LACKS_RENAME */ +# else ACE_UNUSED_ARG (flags); ACE_OSCALL_RETURN (::rename (old_name, new_name), int, -1); -# endif /* ACE_LACKS_RENAME */ +# endif /* ACE_HAS_WINCE */ } #if defined (ACE_HAS_WCHAR) @@ -839,12 +834,7 @@ ACE_OS::rename (const wchar_t *old_name, const wchar_t *new_name, int flags) { -# if defined (ACE_LACKS_RENAME) - ACE_UNUSED_ARG (old_name); - ACE_UNUSED_ARG (new_name); - ACE_UNUSED_ARG (flags); - ACE_NOTSUP_RETURN (-1); -# elif defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) ACE_UNUSED_ARG (flags); if (::MoveFileW (old_name, new_name) == 0) ACE_FAIL_RETURN (-1); @@ -862,11 +852,11 @@ ACE_OS::rename (const wchar_t *old_name, # elif defined (ACE_WIN32) ACE_UNUSED_ARG (flags); ACE_OSCALL_RETURN (::_wrename (old_name, new_name), int, -1); -# else /* ACE_LACKS_RENAME */ +# else ACE_Wide_To_Ascii nold_name (old_name); ACE_Wide_To_Ascii nnew_name (new_name); return ACE_OS::rename (nold_name.char_rep (), nnew_name.char_rep (), flags); -# endif /* ACE_LACKS_RENAME */ +# endif /* ACE_HAS_WINCE */ } #endif /* ACE_HAS_WCHAR */ |