Merge pull request #106 from jwillemsen/jwi-cpp11_processmanager-wait

Added support to use the wait operations of the ACE process manager u…

2 files changed, 24 insertions, 0 deletions

diff --git a/ACE/ace/Process_Manager.h b/ACE/ace/Process_Manager.h
index bd320c87f7b..d10f253298e 100644
--- a/ACE/ace/Process_Manager.h
+++ b/ACE/ace/Process_Manager.h
@@ -243,6 +243,15 @@ public:
    * @retval 0 on success; -1 on failure.
    */
   int wait (const ACE_Time_Value &timeout = ACE_Time_Value::max_time);
+#if defined (ACE_HAS_CPP11)
+  /// @sa wait
+  template< class Rep, class Period >
+  int wait (const std::chrono::duration<Rep, Period>& timeout)
+  {
+    ACE_Time_Value const tv (timeout);
+    return this->wait (tv);
+  }
+#endif
 
   /**
    * Wait up to @a timeout for a single specified process to terminate.
@@ -260,6 +269,17 @@ public:
   pid_t wait (pid_t pid,
               const ACE_Time_Value &timeout,
               ACE_exitcode *status = 0);
+#if defined (ACE_HAS_CPP11)
+  /// @sa wait
+  template< class Rep, class Period >
+  pid_t wait (pid_t pid,
+              const std::chrono::duration<Rep, Period>& timeout,
+              ACE_exitcode *status = 0)
+  {
+    ACE_Time_Value const tv (timeout);
+    return this->wait (pid, tv, status);
+  }
+#endif
 
   /**
    * Wait indefinitely for a single, specified process to terminate.
diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp
index 3d0f303fd2a..5c92805148c 100644
--- a/ACE/tests/Process_Manager_Test.cpp
+++ b/ACE/tests/Process_Manager_Test.cpp
@@ -437,7 +437,11 @@ run_main (int argc, ACE_TCHAR *argv[])
                               mgr,
                               1,
                               4);
+#if defined (ACE_HAS_CPP11)
+  result = mgr.wait (0, std::chrono::seconds (4), &exitcode);
+#else
   result = mgr.wait (0, ACE_Time_Value (4), &exitcode);
+#endif
 
   if (result != child4)
     {