diff options
Diffstat (limited to 'TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h')
| -rw-r--r-- | TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h index a30fe5a2244..7266604d2f7 100644 --- a/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h +++ b/TAO/CIAO/DAnCE/NodeManager/NodeDaemon_Impl.h @@ -1,4 +1,5 @@ // -*- C++ -*- + //============================================================================= /** * @file NodeDaemon_Impl.h @@ -6,11 +7,11 @@ * $Id$ * * This file contains servant implementation for Deployment:NodeManager - * interface. In the current design of the NodeManager, as with the - * legacy implementation of CIAO, Each NodeManager corresponds to - * ONE NodeApplication Manager. Though, the name intuitively suggests - * that there be one NodeManager for every node, our design, allows - * the end-user to have multiple components run on the same node. + * interface. In the current design of the NodeManager, as with the legacy + * implementation of CIAO, Each NodeManager corresponds to ONE NodeApplication + * Manager. Though, the name intuitively suggests that there be one NodeManager + * for every node, our design, allows the end-user to have multiple components + * run on the same node. * * @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu> */ @@ -27,21 +28,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (_MSC_VER) -# if (_MSC_VER >= 1200) -# pragma warning(push) -# endif /* _MSC_VER >= 1200 */ -# pragma warning (disable:4250) -#endif /* _MSC_VER */ - namespace CIAO { /** * @class NodeDaemon_Impl * - * @brief Servant implementation CIAO's daemon process control - * interface + * @brief Servant implementation CIAO's daemon process control interface * * This class implements the CIAO:NodeDaemon interface. * @@ -58,9 +51,10 @@ namespace CIAO PortableServer::POA_ptr p, const char * nodeapp_loc, int spawn_delay) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); - /// POA operation.. + /// Get the containing POA. This operation does *not* + /// increase the reference count of the POA. virtual PortableServer::POA_ptr _default_POA (void); /// CIAO::Daemon defined attributes/operations. @@ -94,11 +88,12 @@ namespace CIAO Deployment::StopError)); protected: - /// Since this class is reference counted, making this - /// destructor protected to enforce proper memory managment - /// through the reference counting mechanism (i.e. to - /// disallow calling operator delete() on an instance of - /// this class. + // Since this class is reference counted, making this + // destructor protected to enforce proper memory managment + // through the reference counting mechanism (i.e. to + // disallow calling operator delete() on an instance of + // this class. + /// Destructor virtual ~NodeDaemon_Impl (void); // Keep a pointer to the managing ORB serving this servant. @@ -121,13 +116,9 @@ namespace CIAO // Cache reference of last NodeAppManager Deployment::NodeApplicationManager_var manager_; + }; } - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -#pragma warning(pop) -#endif /* _MSC_VER */ - #if defined (__ACE_INLINE__) # include "NodeDaemon_Impl.inl" #endif /* __ACE_INLINE__ */ |