diff options
| author | harrisb <harrisb@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-12 14:42:30 +0000 |
|---|---|---|
| committer | harrisb <harrisb@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-02-12 14:42:30 +0000 |
| commit | 7710e9abc9dd458f4828892b7a99ef37c434a10a (patch) | |
| tree | 3a9c998e5fbc26a3d73417d53b3e25b60ccbb18f /TAO/orbsvcs/orbsvcs/Naming/FaultTolerant | |
| parent | 828e11560027da64fb1ffb9abd7e57e521d8bd35 (diff) | |
| download | ATCD-7710e9abc9dd458f4828892b7a99ef37c434a10a.tar.gz | |
Tue Feb 12 14:39:28 UTC 2013 Byron Harris <harrisb@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/FaultTolerant')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp index dffd9e506fc..9958e3a0230 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp @@ -861,13 +861,21 @@ TAO_FT_Naming_Server::fini (void) 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); +#else + return new TAO_FT_Storable_Naming_Context_Factory (context_size); +#endif /* ACE_HAS_NEW_NOTHROW */ } TAO_Persistent_Naming_Context_Factory * TAO_FT_Naming_Server::persistent_naming_context_factory (void) { +#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 */ } 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 5ba6a1d38c4..4ca19e74c1d 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 @@ -30,11 +30,19 @@ 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 |