diff options
Diffstat (limited to 'ace/OS_NS_fcntl.cpp')
| -rw-r--r-- | ace/OS_NS_fcntl.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ace/OS_NS_fcntl.cpp b/ace/OS_NS_fcntl.cpp index 1d9d5bf2bcc..8c69f8b8b51 100644 --- a/ace/OS_NS_fcntl.cpp +++ b/ace/OS_NS_fcntl.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "ace/OS_NS_fcntl.h" @@ -13,8 +14,6 @@ ACE_RCSID(ace, OS_NS_fcntl, "$Id$") #include "ace/OS_NS_macros.h" #include "ace/Object_Manager_Base.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_HANDLE ACE_OS::open (const char *filename, int mode, @@ -81,7 +80,7 @@ ACE_OS::open (const char *filename, SECURITY_DESCRIPTOR sd_buffer; #if defined (ACE_HAS_WINCE) - ACE_HANDLE h = ::CreateFileW (ACE_Ascii_To_Wide (filename).wchar_rep (), + ACE_HANDLE h = ::CreateFileW (ACE_TEXT_TO_WCHAR_IN (filename), access, shared_mode, ACE_OS::default_win32_security_attributes_r @@ -168,7 +167,6 @@ ACE_OS::open (const char *filename, #endif /* ACE_WIN32 */ } -#if defined (ACE_HAS_WCHAR) ACE_HANDLE ACE_OS::open (const wchar_t *filename, int mode, @@ -260,12 +258,9 @@ ACE_OS::open (const wchar_t *filename, return h; #else /* ACE_WIN32 */ // Just emulate with ascii version - return ACE_OS::open (ACE_Wide_To_Ascii (filename).char_rep (), + return ACE_OS::open (ACE_TEXT_TO_CHAR_IN (filename), mode, perms, sa); #endif /* ACE_WIN32 */ } -#endif /* ACE_HAS_WCHAR */ - -ACE_END_VERSIONED_NAMESPACE_DECL |