All compilers we support provide ACE_HAS_NEW_NOTHROW

    * ACE/ace/CORBA_macros.h:
    * ACE/ace/OS_Memory.h:
    * ACE/ace/README:
    * ACE/ace/Svc_Handler.cpp:
    * ACE/ace/Svc_Handler.h:
    * ACE/ace/config-all.h:
    * ACE/ace/config-g++-common.h:
    * ACE/ace/config-hpux-11.00.h:
    * ACE/ace/config-lynxos.h:
    * ACE/ace/config-sunos5.5.h:
    * ACE/ace/config-win32-borland.h:
    * ACE/ace/config-win32-msvc-14.h:
    * ACE/examples/DLL/Newsweek.cpp:
    * ACE/examples/DLL/Newsweek.h:
    * ACE/examples/DLL/Today.cpp:
    * ACE/examples/DLL/Today.h:
    * ACE/examples/Shared_Malloc/test_persistence.cpp:
    * ACE/tests/DLL_Test_Impl.cpp:
    * ACE/tests/DLL_Test_Impl.h:
    * ACE/tests/Dynamic_Test.cpp:
    * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp:
    * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp:
    * TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
    * TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp:
    * TAO/tao/Var_Size_Argument_T.cpp:
    * TAO/tests/POA/DSI/Database_i.cpp:
    * TAO/tests/POA/DSI/Database_i.h:

4 files changed, 3 insertions, 36 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
index 28445381a2f..3bdab065dc5 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
@@ -689,21 +689,13 @@ TAO_FT_Naming_Server::fini ()
 TAO_Storable_Naming_Context_Factory *
 TAO_FT_Naming_Server::storable_naming_context_factory (size_t context_size)
 {
-#if defined (ACE_HAS_NEW_NOTHROW)
   return new (ACE_nothrow) TAO_FT_Storable_Naming_Context_Factory (context_size, this->replicator_);
-#else
-  return new TAO_FT_Storable_Naming_Context_Factory (context_size, this->replicator_);
-#endif /* ACE_HAS_NEW_NOTHROW */
 }
 
 TAO_Persistent_Naming_Context_Factory *
 TAO_FT_Naming_Server::persistent_naming_context_factory ()
 {
-#if defined (ACE_HAS_NEW_NOTHROW)
   return new (ACE_nothrow) TAO_FT_Persistent_Naming_Context_Factory;
-#else
-  return new TAO_FT_Persistent_Naming_Context_Factory;
-#endif /* ACE_HAS_NEW_NOTHROW */
 }
 
 /// Return the IOR for the registered replication manager
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
index 5d0fda3837f..66b36bebf29 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp
@@ -3,15 +3,15 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-  /// Constructor.
+/// Constructor.
 TAO_FT_Persistent_Naming_Context_Factory::TAO_FT_Persistent_Naming_Context_Factory ()
 : TAO_Persistent_Naming_Context_Factory ()
 {
 
 }
 
-  /// Destructor.  Does not deallocate the hash map: if an instance of
-  /// this class goes out of scope, its hash_map remains in persistent storage.
+/// Destructor.  Does not deallocate the hash map: if an instance of
+/// this class goes out of scope, its hash_map remains in persistent storage.
 TAO_FT_Persistent_Naming_Context_Factory::~TAO_FT_Persistent_Naming_Context_Factory ()
 {
 }
@@ -28,19 +28,11 @@ TAO_FT_Persistent_Naming_Context_Factory::create_naming_context_impl (
 {
   // Construct the naming context, forwarding the map and counter even if they
   // are defaulted
-#if defined (ACE_HAS_NEW_NOTHROW)
   return new (ACE_nothrow) TAO_FT_Persistent_Naming_Context (poa,
                                                              poa_id,
                                                              context_index,
                                                              map,
                                                              counter);
-#else
-  return new TAO_FT_Persistent_Naming_Context (poa,
-                                               poa_id,
-                                               context_index,
-                                               map,
-                                               counter);
-#endif /* ACE_HAS_NEW_NOTHROW */
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 448c6100d03..79cd28d7408 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -754,21 +754,13 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
 TAO_Storable_Naming_Context_Factory *
 TAO_Naming_Server::storable_naming_context_factory (size_t context_size)
 {
-#if defined (ACE_HAS_NEW_NOTHROW)
   return new (ACE_nothrow) TAO_Storable_Naming_Context_Factory (context_size);
-#else
-  return new TAO_Storable_Naming_Context_Factory (context_size);
-#endif /* ACE_HAS_NEW_NOTHROW */
 }
 
 TAO_Persistent_Naming_Context_Factory *
 TAO_Naming_Server::persistent_naming_context_factory ()
 {
-#if defined (ACE_HAS_NEW_NOTHROW)
   return new (ACE_nothrow) TAO_Persistent_Naming_Context_Factory;
-#else
-  return new TAO_Persistent_Naming_Context_Factory;
-#endif /* ACE_HAS_NEW_NOTHROW */
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
index 8d98362f74f..ec5923e775d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
@@ -27,20 +27,11 @@ TAO_Persistent_Naming_Context_Factory::create_naming_context_impl (
 {
   // Construct the naming context, forwarding the map and counter even if they
   // are defaulted
-#if defined (ACE_HAS_NEW_NOTHROW)
   return new (ACE_nothrow) TAO_Persistent_Naming_Context (poa,
                                                           poa_id,
                                                           context_index,
                                                           map,
                                                           counter);
-#else
-  return new TAO_Persistent_Naming_Context (poa,
-                                            poa_id,
-                                            context_index,
-                                            map,
-                                            counter);
-
-#endif /* ACE_HAS_NEW_NOTHROW */
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL