Let's try this again... I keep messing up my workspace...

3 files changed, 25 insertions, 25 deletions

diff --git a/ace/Process.cpp b/ace/Process.cpp
index e5610f02e2f..717777cb60d 100644
--- a/ace/Process.cpp
+++ b/ace/Process.cpp
@@ -191,7 +191,7 @@ EXIT_LABEL:
 
 // ************************************************************
 
-ACE_ProcessEx::ACE_ProcessEx (void)
+ACE_Process::ACE_Process (void)
 #if !defined (ACE_WIN32)
   : child_id_ (0)
 #endif /* !defined (ACE_WIN32) */
@@ -202,7 +202,7 @@ ACE_ProcessEx::ACE_ProcessEx (void)
 #endif /* ACE_WIN32 */
 }
 
-ACE_ProcessEx::~ACE_ProcessEx (void)
+ACE_Process::~ACE_Process (void)
 {
 #if defined (ACE_WIN32)
   // Free resources allocated in kernel.
@@ -212,7 +212,7 @@ ACE_ProcessEx::~ACE_ProcessEx (void)
 }
 
 pid_t
-ACE_ProcessEx::start (ACE_Process_Options &options)
+ACE_Process::start (ACE_Process_Options &options)
 {
 #if defined (ACE_WIN32)
   BOOL fork_result = 
@@ -286,7 +286,7 @@ ACE_ProcessEx::start (ACE_Process_Options &options)
 }
 
 int
-ACE_ProcessEx::wait (void)
+ACE_Process::wait (void)
 {
 #if defined (ACE_WIN32)
   return ::WaitForSingleObject (process_info_.hProcess, INFINITE);
@@ -296,7 +296,7 @@ ACE_ProcessEx::wait (void)
 }
 
 int
-ACE_ProcessEx::wait (const ACE_Time_Value &tv)
+ACE_Process::wait (const ACE_Time_Value &tv)
 {
 #if defined (ACE_WIN32)
   return ::WaitForSingleObject (process_info_.hProcess, tv.msec ());
@@ -309,7 +309,7 @@ ACE_ProcessEx::wait (const ACE_Time_Value &tv)
 // ************************************************************
 
 int
-ACE_Process::wait (void)
+ACE_Process_Old::wait (void)
 {
 #if defined (ACE_WIN32)
   return ::WaitForSingleObject (process_info_.hProcess, INFINITE);
@@ -318,7 +318,7 @@ ACE_Process::wait (void)
 #endif /* ACE_WIN32 */
 }
 
-ACE_Process::ACE_Process (void)
+ACE_Process_Old::ACE_Process_Old (void)
 #if defined (ACE_WIN32)
   : set_handles_called_ (0)
 #else /* ACE_WIN32 */
@@ -338,7 +338,7 @@ ACE_Process::ACE_Process (void)
   this->cwd_[0] = '\0';
 }
 
-ACE_Process::~ACE_Process (void)
+ACE_Process_Old::~ACE_Process_Old (void)
 {
 #if defined (ACE_WIN32)
   // Just in case <start> wasn't called.
@@ -357,7 +357,7 @@ ACE_Process::~ACE_Process (void)
 }
 
 int
-ACE_Process::set_handles (ACE_HANDLE std_in,
+ACE_Process_Old::set_handles (ACE_HANDLE std_in,
 			  ACE_HANDLE std_out,
 			  ACE_HANDLE std_err)
 {
@@ -410,7 +410,7 @@ ACE_Process::set_handles (ACE_HANDLE std_in,
 }
 
 int
-ACE_Process::set_cwd (const TCHAR *cwd)
+ACE_Process_Old::set_cwd (const TCHAR *cwd)
 {
   ACE_OS::strncpy (this->cwd_, cwd, MAXPATHLEN);
   // This is for paranoia...
@@ -419,7 +419,7 @@ ACE_Process::set_cwd (const TCHAR *cwd)
 }
 
 pid_t
-ACE_Process::start (char *argv[], char *envp[])
+ACE_Process_Old::start (char *argv[], char *envp[])
 {
 #if defined (ACE_WIN32)
   ACE_ARGV argv_buf (argv);
@@ -504,7 +504,7 @@ ACE_Process::start (char *argv[], char *envp[])
 #endif /* ACE_WIN32 */
 }
 
-ACE_Process::ACE_Process (char *argv[],
+ACE_Process_Old::ACE_Process_Old (char *argv[],
 			  ACE_HANDLE std_in,
 			  ACE_HANDLE std_out,
 			  ACE_HANDLE std_err,
diff --git a/ace/Process.h b/ace/Process.h
index b0a272eb715..4c3b6cb6bdd 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -220,7 +220,7 @@ protected:
 
 // ************************************************************
 
-class ACE_Export ACE_ProcessEx
+class ACE_Export ACE_Process
 // = TITLE
 //     Process
 //
@@ -228,10 +228,10 @@ class ACE_Export ACE_ProcessEx
 //     A Portable encapsulation for creating new processes.
 {
 public:
-  ACE_ProcessEx (void);
+  ACE_Process (void);
   // Default construction.  Must use ACE_Process::start.
 
-  ~ACE_ProcessEx (void);
+  ~ACE_Process (void);
   // Destructor.
 
   pid_t start (ACE_Process_Options &options);
@@ -265,14 +265,14 @@ protected:
 
 // ************************************************************
 
-class ACE_Export ACE_Process
+class ACE_Export ACE_Process_Old
 // = TITLE
 //     A Portable encapsulation for creating new processes and
 //     allows assignment of STDIN, STDOUT, and STDERR of the new
 //     process. 
 //
 // = DESCRIPTION
-//     On UNIX, ACE_Process uses fork and exec.  On Win32, it uses
+//     On UNIX, ACE_Process_Old uses fork and exec.  On Win32, it uses
 //     CreateProcess.  Since we can set the standard handles, we can
 //     mimic UNIX pipes on Win32 by building chains of processes.
 //     This class should be used instead ACE_OS::fork_exec.  I'm
@@ -282,10 +282,10 @@ class ACE_Export ACE_Process
 //     send us the updates.  We'll put it in ACE.
 {
 public:
-  ACE_Process (void);
+  ACE_Process_Old (void);
   // Default construction.
 
-  ACE_Process (char *argv[],
+  ACE_Process_Old (char *argv[],
 		      ACE_HANDLE std_in,
 		      ACE_HANDLE std_out = ACE_INVALID_HANDLE,
 		      ACE_HANDLE std_err = ACE_INVALID_HANDLE,
@@ -301,7 +301,7 @@ public:
   // affect a subset of the handles, make sure to set the others to
   // ACE_INVALID_HANDLE.
 
-  ~ACE_Process (void);
+  ~ACE_Process_Old (void);
   // Destructor.
 
   int set_handles (ACE_HANDLE std_in,
diff --git a/ace/Process.i b/ace/Process.i
index 8aa2cbdcb60..7e6372ceaaa 100644
--- a/ace/Process.i
+++ b/ace/Process.i
@@ -3,7 +3,7 @@
 
 #if defined (ACE_WIN32)
 ACE_INLINE PROCESS_INFORMATION 
-ACE_ProcessEx::process_info (void)
+ACE_Process::process_info (void)
 {
   return process_info_;
 }
@@ -11,7 +11,7 @@ ACE_ProcessEx::process_info (void)
 
 
 ACE_INLINE pid_t
-ACE_ProcessEx::getpid (void)
+ACE_Process::getpid (void)
 {
 #if defined (ACE_WIN32)
   return process_info_.dwProcessId;
@@ -21,7 +21,7 @@ ACE_ProcessEx::getpid (void)
 }
 
 ACE_INLINE int
-ACE_ProcessEx::kill (int signum)
+ACE_Process::kill (int signum)
 {
   return ACE_OS::kill (this->getpid (), signum);
 }
@@ -29,7 +29,7 @@ ACE_ProcessEx::kill (int signum)
 // ************************************************************
 
 ACE_INLINE pid_t
-ACE_Process::getpid (void)
+ACE_Process_Old::getpid (void)
 {
 #if defined (ACE_WIN32)
   return process_info_.dwProcessId;
@@ -39,7 +39,7 @@ ACE_Process::getpid (void)
 }
 
 ACE_INLINE int
-ACE_Process::kill (int signum)
+ACE_Process_Old::kill (int signum)
 {
   return ACE_OS::kill (this->getpid (), signum);
 }