diff options
Diffstat (limited to 'TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h')
| -rw-r--r-- | TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h | 47 |
1 files changed, 8 insertions, 39 deletions
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h index 0f2ca884e16..bae26e065f0 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h @@ -1,10 +1,12 @@ // -*- C++ -*- // $Id$ +// Ossama Othman <ossama@uci.edu> + // ============================================================================ // // = LIBRARY -// AMI_Observer +// ECE255 // // = FILENAME // Push_Iterator_Handler.h @@ -20,21 +22,14 @@ #ifndef PUSH_ITERATOR_HANDLER_H #define PUSH_ITERATOR_HANDLER_H +#include "ace/pre.h" + #include "Push_Web_ServerS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#if (_MSC_VER >= 1200) -#pragma warning(push) -#endif /* _MSC_VER >= 1200 */ -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - // Forward declaration class Callback_i; @@ -42,29 +37,6 @@ class Push_Iterator_Handler : public virtual POA_Web_Server::AMI_Iterator_FactoryHandler, public virtual PortableServer::RefCountServantBase { - // = TITLE - // Implement the Web_Server::Iterator_Factory AMI Reply Handler. - // - // = DESCRIPTION - // This classes asynchronously registers a reference to the - // client-side <Callback> object in the Content Server. Once - // registered, the <Callback> will begin receiving chunks of data - // pushed from the Content Server. - // - // Since registration occurs asynchronously, it is possible that - // the metadata returned from the <Iterator_Factory> will be - // received after the content of the file has been received. The - // <Callback> object is equipped to handle this possibility. - // - // The register_callback() reply handler method in this class - // receives the metadata, and then passes it to the <Callback> - // object. Once the metadata is received, there is no longer any - // use for this <Push_Iterator_Handler> object, and it is - // deactivated. - - friend class Push_Iterator_Handler_Friend; - // Dummy friend class declaration to quiet down a warning. - public: Push_Iterator_Handler (void); // Constructor that creates a content iterator corresponding to the @@ -94,13 +66,12 @@ private: // AMI callback that is invoked when a response from the // corresponding server method is received. - virtual void register_callback_excep + virtual void register_callback_excep (Web_Server::AMI_Iterator_FactoryExceptionHolder *, CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) {} - void deactivate (CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)); + void deactivate (CORBA::Environment &ACE_TRY_ENV); // Deactivate this handler. private: @@ -114,8 +85,6 @@ private: // Reference to this Reply Handler's self. }; -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -#pragma warning(pop) -#endif /* _MSC_VER */ +#include "ace/post.h" #endif /* PUSH_ITERATOR_HANDLER_H */ |