diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-07-14 21:39:17 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-07-14 21:39:17 +0000 |
| commit | 97b98cd005c27006a44401a6ee75b8bdd226929c (patch) | |
| tree | 6b37f054bd07591da0cdb6280cab2139733eefaf /TAO/orbsvcs | |
| parent | aca8d1911988efa43daf6dcba145b3544f5614b9 (diff) | |
| download | ATCD-97b98cd005c27006a44401a6ee75b8bdd226929c.tar.gz | |
ChangeLogTag:Fri Jul 14 21:15:32 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/Trading_Service/Trading_Service.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h index f793fc7b1d7..951b67e6ecf 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.h +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h @@ -1,3 +1,5 @@ +// -*- C++ -*- +// // $Id$ // ======================================================================== @@ -17,7 +19,7 @@ #define _TRADING_SERVICE_H #include "ace/Auto_Ptr.h" -#include "ace/Signal.h" +#include "ace/Sig_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index a0c3c3b00a5..a17453cfc07 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -23,7 +23,6 @@ #include "orbsvcs/NotifyExtS.h" #include "orbsvcs/Notify/Admin.h" -class TAO_Notify_ProxySupplier; #if defined(_MSC_VER) #pragma warning(push) @@ -32,6 +31,8 @@ class TAO_Notify_ProxySupplier; TAO_BEGIN_VERSIONED_NAMESPACE_DECL +class TAO_Notify_ProxySupplier; + /** * @class TAO_Notify_ConsumerAdmin * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp index 20845593237..5de9b828787 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp @@ -50,6 +50,10 @@ TAO::SSLIOP::Accept_Strategy::accept_svc_handler (handler_type * svc_handler) reset_new_handle // reset new handler ) == -1) { + // Ensure that errno is preserved in case the svc_handler + // close() method resets it. + ACE_Errno_Guard error (errno); + // Close down handler to avoid memory leaks. svc_handler->close (0); diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h index 9d4983ffaaf..2663a13d407 100644 --- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h @@ -12,6 +12,8 @@ #include "ace/Event_Handler.h" #include "ace/Signal.h" +#include "ace/Sig_Handler.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc index f3c8fe6d235..8ac7b79bce9 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc +++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(CosEvent Test Lib): orbsvcslib, event_skel, naming, svc_utils, iortable, portableserver { +project(CosEvent Test Lib): orbsvcslib, event_skel, svc_utils, iortable, portableserver { sharedname = CECTests dynamicflags = CEC_TEST_BUILD_DLL Header_Files { |