1 files changed, 8 insertions, 29 deletions
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
index 9d6792bdd6c..607ee9a9d5f 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
@@ -5,7 +5,7 @@
 // ============================================================================
 //
 // = LIBRARY
-//     AMI_Iterator
+//     ECE255
 //
 // = FILENAME
 //     Content_Iterator_i.h
@@ -29,48 +29,31 @@
 # 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 */
-
 class Content_Iterator_i :
   public virtual POA_Web_Server::Content_Iterator,
   public virtual PortableServer::RefCountServantBase
-{
   // = TITLE
-  //    Implement the Web_Server::Content_Iterator interface.
-  //
-  // = DESCRIPTION
-  //    This class implements the Iterator pattern to minimize memory
-  //    requirements when retrieving data from a content server.
-  //    Rather than retrieving one large chunk of data, this class
-  //    iterates on the server so that smaller chunks of data are
-  //    retrieved.
-
+  //Implement the Web_Server::Content_Iterator interface.
+{
   friend class Iterator_Factory_i;
 public:
 
-  Content_Iterator_i (const char *filename, CORBA::ULong file_size);
   // Constructor
+  Content_Iterator_i (const char *filename, CORBA::ULong file_size);
 
-  ~Content_Iterator_i (void);
   // Destructor
+  ~Content_Iterator_i (void);
 
+  // This operation returns the next <chunk> of the file starting at
+  // <offset>.  If there are no more bindings, false is returned.
   virtual CORBA::Boolean next_chunk (CORBA::ULong offset,
                                      Web_Server::Chunk_Type_out chunk,
                                      CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  // This operation returns the next <chunk> of the file starting at
-  // <offset>.  If there are no more bindings, false is returned.
 
+  // Destroy the iterator.
   virtual void destroy (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  // Destroy the iterator.
 
 private:
 
@@ -93,8 +76,4 @@ private:
   // for debugging purposes.)
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #endif  /* CONTENT_ITERATOR_I_H */