diff options
Diffstat (limited to 'ace/Process.inl')
| -rw-r--r-- | ace/Process.inl | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/ace/Process.inl b/ace/Process.inl index 3b9b18f6429..b8a0d721a7b 100644 --- a/ace/Process.inl +++ b/ace/Process.inl @@ -1,5 +1,4 @@ -// -*- C++ -*- -// +/* -*- C++ -*- */ // $Id$ #include "ace/ACE.h" @@ -8,8 +7,6 @@ #include "ace/OS_NS_pwd.h" #include "ace/OS_NS_string.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - #if defined (ACE_WIN32) ACE_INLINE PROCESS_INFORMATION @@ -250,7 +247,7 @@ ACE_INLINE int ACE_Process_Options::setreugid (const ACE_TCHAR* user) { #if !defined (ACE_LACKS_PWD_FUNCTIONS) - struct passwd *ent = ACE_OS::getpwnam (ACE_TEXT_ALWAYS_CHAR (user)); + struct passwd *ent = ACE_OS::getpwnam (ACE_TEXT_TO_CHAR_IN (user)); if (ent != 0) { @@ -342,23 +339,21 @@ ACE_INLINE void ACE_Process_Options::working_directory (const char *wd) { #if !defined(ACE_HAS_WINCE) - ACE_OS::strcpy (working_directory_, ACE_TEXT_CHAR_TO_TCHAR (wd)); + ACE_OS::strcpy (working_directory_, ACE_TEXT_TO_TCHAR_IN (wd)); #else ACE_UNUSED_ARG (wd); #endif /* !ACE_HAS_WINCE */ } -#if defined (ACE_HAS_WCHAR) ACE_INLINE void ACE_Process_Options::working_directory (const wchar_t *wd) { #if !defined(ACE_HAS_WINCE) - ACE_OS::strcpy (working_directory_, ACE_TEXT_WCHAR_TO_TCHAR (wd)); + ACE_OS::strcpy (working_directory_, ACE_TEXT_TO_TCHAR_IN (wd)); #else ACE_UNUSED_ARG (wd); #endif /* !ACE_HAS_WINCE */ } -#endif /* ACE_HAS_WCHAR */ ACE_INLINE void ACE_Process_Options::process_name (const ACE_TCHAR *p) @@ -380,33 +375,35 @@ ACE_Process_Options::process_name (void) // under CE. They are not empty on most other platforms. ACE_INLINE int -ACE_Process_Options::setenv (ACE_TCHAR * /* envp */[]) +ACE_Process_Options::setenv (ACE_TCHAR *envp[]) { + ACE_UNUSED_ARG (envp); return -1; } ACE_INLINE int -ACE_Process_Options::setenv (const ACE_TCHAR * /* format */, ...) +ACE_Process_Options::setenv (const ACE_TCHAR *format, ...) { return -1; } ACE_INLINE int -ACE_Process_Options::setenv (const ACE_TCHAR * /* variable_name */, - const ACE_TCHAR * /* format */, +ACE_Process_Options::setenv (const ACE_TCHAR *variable_name, + const ACE_TCHAR *format, ...) { return -1; } ACE_INLINE int -ACE_Process_Options::set_handles (ACE_HANDLE /* std_in */, - ACE_HANDLE /* std_out */, - ACE_HANDLE /* std_err */) +ACE_Process_Options::set_handles (ACE_HANDLE std_in, + ACE_HANDLE std_out, + ACE_HANDLE std_err) { + ACE_UNUSED_ARG (std_in); + ACE_UNUSED_ARG (std_out); + ACE_UNUSED_ARG (std_err); return -1; } #endif /* ACE_HAS_WINCE */ - -ACE_END_VERSIONED_NAMESPACE_DECL |