diff options
Diffstat (limited to 'ace/OS_NS_stdio.cpp')
| -rw-r--r-- | ace/OS_NS_stdio.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/ace/OS_NS_stdio.cpp b/ace/OS_NS_stdio.cpp index 46b30ef5fdb..6e3a45cd926 100644 --- a/ace/OS_NS_stdio.cpp +++ b/ace/OS_NS_stdio.cpp @@ -14,10 +14,8 @@ ACE_RCSID (ace, # if defined (ACE_WIN32) -ACE_BEGIN_VERSIONED_NAMESPACE_DECL OSVERSIONINFO ACE_OS::win32_versioninfo_; HINSTANCE ACE_OS::win32_resource_module_; -ACE_END_VERSIONED_NAMESPACE_DECL # if defined (ACE_HAS_DLL) && (ACE_HAS_DLL == 1) && !defined (ACE_HAS_WINCE) // This function is called by the OS when the ACE DLL is loaded. We @@ -40,8 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID) # endif /* ACE_HAS_DLL && ACE_HAS_DLL == 1 */ # endif /* ACE_WIN32 */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - void ACE_OS::ace_flock_t::dump (void) const { @@ -136,9 +132,9 @@ ACE_OS::fopen (const char *filename, if (fd != -1) { # if defined (__BORLANDC__) && !defined (ACE_USES_WCHAR) - FILE *fp = ::_fdopen (fd, const_cast<ACE_TCHAR *> (mode)); + FILE *fp = ::_fdopen (fd, const_cast<char *> (mode)); # elif defined (__BORLANDC__) && defined (ACE_USES_WCHAR) - FILE *fp = ::_wfdopen (fd, const_cast<ACE_TCHAR *> (mode)); + FILE *fp = ::_wfdopen (fd, const_cast<wchar_t *> (mode)); # elif defined (ACE_USES_WCHAR) FILE *fp = ::_wfdopen (fd, mode); # else @@ -159,7 +155,6 @@ ACE_OS::fopen (const char *filename, return 0; } -#if defined (ACE_HAS_WCHAR) FILE * ACE_OS::fopen (const wchar_t *filename, const ACE_TCHAR *mode) @@ -206,7 +201,6 @@ ACE_OS::fopen (const wchar_t *filename, } return 0; } -#endif /* ACE_HAS_WCHAR */ #endif /* ACE_WIN32 */ @@ -222,7 +216,6 @@ ACE_OS::fprintf (FILE *fp, const char *format, ...) return result; } -#if defined (ACE_HAS_WCHAR) int ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...) { @@ -243,7 +236,6 @@ ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...) # endif /* ACE_HAS_VFWPRINTF */ } -#endif /* ACE_HAS_WCHAR */ // The following *printf functions aren't inline because @@ -302,8 +294,6 @@ ACE_OS::snprintf (char *buf, size_t maxlen, const char *format, ...) #endif /* ACE_HAS_SNPRINTF */ } -#if defined (ACE_HAS_WCHAR) - int ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...) { @@ -347,7 +337,6 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...) ACE_NOTSUP_RETURN (-1); #endif /* ACE_HAS_SNPRINTF */ } -#endif /* ACE_HAS_WCHAR */ int ACE_OS::sprintf (char *buf, const char *format, ...) @@ -362,7 +351,6 @@ ACE_OS::sprintf (char *buf, const char *format, ...) return result; } -#if defined (ACE_HAS_WCHAR) int ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...) { @@ -401,6 +389,4 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...) # endif /* XPG5 || ACE_HAS_DINKUM_STL */ } -#endif /* ACE_HAS_WCHAR */ -ACE_END_VERSIONED_NAMESPACE_DECL |