6 files changed, 0 insertions, 33 deletions
diff --git a/ACE/examples/APG/Active_Objects/AO.cpp b/ACE/examples/APG/Active_Objects/AO.cpp
index 352075f1fca..857cb941725 100644
--- a/ACE/examples/APG/Active_Objects/AO.cpp
+++ b/ACE/examples/APG/Active_Objects/AO.cpp
@@ -92,11 +92,7 @@ public:
     while (1)
       {
         // Dequeue the next method object
-#if defined (ACE_HAS_CPP11)
         std::unique_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
-#else
-        auto_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
-#endif /* ACE_HAS_CPP11 */
 
         // Invoke the method request.
         if (request->call () == -1)
diff --git a/ACE/examples/APG/Active_Objects/AO2.cpp b/ACE/examples/APG/Active_Objects/AO2.cpp
index a0bc5594362..bd73fb10f7e 100644
--- a/ACE/examples/APG/Active_Objects/AO2.cpp
+++ b/ACE/examples/APG/Active_Objects/AO2.cpp
@@ -90,11 +90,7 @@ public:
     while (1)
       {
         // Dequeue the next method object
-#if defined (ACE_HAS_CPP11)
         std::unique_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
-#else
-        auto_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ());
-#endif /* ACE_HAS_CPP11 */
 
         // Invoke the method request.
         if (request->call () == -1)
diff --git a/ACE/examples/APG/Naming/Name_Binding.h b/ACE/examples/APG/Naming/Name_Binding.h
index e40c717383a..0c21cde49e3 100644
--- a/ACE/examples/APG/Naming/Name_Binding.h
+++ b/ACE/examples/APG/Naming/Name_Binding.h
@@ -53,11 +53,7 @@ private:
   char *type_;
 };
 
-#if defined ACE_HAS_CPP11
 typedef std::unique_ptr<Name_Binding> Name_Binding_Ptr;
-#else
-typedef auto_ptr<Name_Binding> Name_Binding_Ptr;
-#endif
 // Listing 1
 
 #endif /* NAME_BINDING_H */
diff --git a/ACE/examples/APG/Reactor/HAStatus.cpp b/ACE/examples/APG/Reactor/HAStatus.cpp
index c424fd86aec..f4d25a2e1dd 100644
--- a/ACE/examples/APG/Reactor/HAStatus.cpp
+++ b/ACE/examples/APG/Reactor/HAStatus.cpp
@@ -95,11 +95,7 @@ ClientAcceptor::handle_input (ACE_HANDLE)
 {
   ClientService *client = 0;
   ACE_NEW_RETURN (client, ClientService, -1);
-#if defined ACE_HAS_CPP11
   std::unique_ptr<ClientService> p (client);
-#else
-  auto_ptr<ClientService> p (client);
-#endif
 
   if (this->acceptor_.accept (client->peer ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/ACE/examples/Threads/future1.cpp b/ACE/examples/Threads/future1.cpp
index 96504624420..b80071185cb 100644
--- a/ACE/examples/Threads/future1.cpp
+++ b/ACE/examples/Threads/future1.cpp
@@ -218,11 +218,7 @@ Scheduler::svc (void)
     {
       // Dequeue the next method object (we use an auto pointer in
       // case an exception is thrown in the <call>).
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
-#else
-      auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
-#endif /* ACE_HAS_CPP11 */
 
       ACE_DEBUG ((LM_DEBUG, "(%t) calling method object\n"));
       // Call it.
diff --git a/ACE/examples/Threads/future2.cpp b/ACE/examples/Threads/future2.cpp
index d435a7f6318..20f66f10188 100644
--- a/ACE/examples/Threads/future2.cpp
+++ b/ACE/examples/Threads/future2.cpp
@@ -215,11 +215,7 @@ Scheduler::svc (void)
     {
       // Dequeue the next method object (we use an auto pointer in
       // case an exception is thrown in the <call>).
-#if defined (ACE_HAS_CPP11)
       std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
-#else
-      auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ());
-#endif /* ACE_HAS_CPP11 */
 
       ACE_DEBUG ((LM_DEBUG, " (%t) calling method object\n"));
       // Call it.
@@ -273,11 +269,7 @@ Scheduler::name (void)
         {
           // This scheduler is inactive... so we execute the user
           // request right away...
-#if defined (ACE_HAS_CPP11)
           std::unique_ptr<ACE_Method_Request> mo (new Method_Request_name (this, new_future));
-#else
-          auto_ptr<ACE_Method_Request> mo (new Method_Request_name (this, new_future));
-#endif /* ACE_HAS_CPP11 */
 
           mo->call ();
           // Smart pointer destructor automatically deletes mo.
@@ -302,13 +294,8 @@ Scheduler::work (u_long newparam, int newcount)
 
       if (this->thr_count () == 0)
         {
-#if defined (ACE_HAS_CPP11)
           std::unique_ptr<ACE_Method_Request> mo
             (new Method_Request_work (this, newparam, newcount, new_future));
-#else
-          auto_ptr<ACE_Method_Request> mo
-            (new Method_Request_work (this, newparam, newcount, new_future));
-#endif /* ACE_HAS_CPP11 */
           mo->call ();
           // Smart pointer destructor automatically deletes it.
         }