diff options
| author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-26 19:54:08 +0000 |
|---|---|---|
| committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-26 19:54:08 +0000 |
| commit | 664244e804da11536f2712a61116204e8042f312 (patch) | |
| tree | c058324f9e24262a32f3e594054016c3f02046c5 /ace/Process.inl | |
| parent | d9d5d3d83831c9728147bfe5a2b53822d7ffca21 (diff) | |
| download | ATCD-664244e804da11536f2712a61116204e8042f312.tar.gz | |
Fixed merge related compile errors
Diffstat (limited to 'ace/Process.inl')
| -rw-r--r-- | ace/Process.inl | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ace/Process.inl b/ace/Process.inl index b8a0d721a7b..5af3893100f 100644 --- a/ace/Process.inl +++ b/ace/Process.inl @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- +// // $Id$ #include "ace/ACE.h" @@ -7,6 +8,8 @@ #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 @@ -375,35 +378,33 @@ 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 |