4 files changed, 12 insertions, 3 deletions
diff --git a/ACE/tests/DLL_Test.cpp b/ACE/tests/DLL_Test.cpp
index 43facd7d8f4..7e43c6267f8 100644
--- a/ACE/tests/DLL_Test.cpp
+++ b/ACE/tests/DLL_Test.cpp
@@ -18,6 +18,8 @@
 #include "ace/OS_NS_dlfcn.h"
 #include "DLL_Test.h"
 
+#include <memory>
+
 #if defined (ACE_LD_DECORATOR_STR)
 # define OBJ_SUFFIX ACE_LD_DECORATOR_STR ACE_DLL_SUFFIX
 #else
diff --git a/ACE/tests/Integer_Truncate_Test.cpp b/ACE/tests/Integer_Truncate_Test.cpp
index 0ba6b9fad83..ff15888cc73 100644
--- a/ACE/tests/Integer_Truncate_Test.cpp
+++ b/ACE/tests/Integer_Truncate_Test.cpp
@@ -329,8 +329,11 @@ sizeof_from_gt_sizeof_to ()
  * Test method invocation functor.
  */
 template <typename T>
-struct Caller : public std::unary_function<T, void>
+struct Caller
 {
+  typedef T argument_type;
+  typedef void result_type;
+
   /// Constructor
   Caller () : success (true) {}
 
diff --git a/ACE/tests/Reactor_Remove_Resume_Test.cpp b/ACE/tests/Reactor_Remove_Resume_Test.cpp
index 16f23a6cbf1..e70af6e1f09 100644
--- a/ACE/tests/Reactor_Remove_Resume_Test.cpp
+++ b/ACE/tests/Reactor_Remove_Resume_Test.cpp
@@ -381,8 +381,11 @@ tp_reactor_factory ()
  *
  * Reactor test execution functor.
  */
-struct Run_Test : public std::unary_function<reactor_factory_type, void>
+struct Run_Test
 {
+  typedef reactor_factory_type argument_type;
+  typedef void result_type;
+
   /// Function call operator overload.
   void operator() (reactor_factory_type factory)
   {
diff --git a/ACE/tests/randomize.h b/ACE/tests/randomize.h
index bdebd4db5e9..5389814548f 100644
--- a/ACE/tests/randomize.h
+++ b/ACE/tests/randomize.h
@@ -48,9 +48,10 @@ namespace
    */
   template<typename T>
   class randomize_element
-    : public std::unary_function<T &, void>
   {
   public:
+    typedef T &argument_type;
+    typedef void result_type;
 
     randomize_element (T * array, size_t size, unsigned int seed)
       : array_ (array)