ChangeLogTag:Sun Nov 27 04:05:52 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

27 files changed, 124 insertions, 22 deletions

diff --git a/protocols/ace/HTBP/HTBP_Addr.cpp b/protocols/ace/HTBP/HTBP_Addr.cpp
index 0ea811bb108..aff894e80dc 100644
--- a/protocols/ace/HTBP/HTBP_Addr.cpp
+++ b/protocols/ace/HTBP/HTBP_Addr.cpp
@@ -7,8 +7,10 @@ ACE_RCSID (HTBP,
            ACE_HTBP_Addr,
            "$Id$")
 
-  // Constructor
-  ACE::HTBP::Addr::Addr ()
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// Constructor
+ACE::HTBP::Addr::Addr ()
 {
 }
 
@@ -87,3 +89,5 @@ ACE::HTBP::Addr::string_to_addr (const char address[])
     //  this->htid_ = address;
     //  return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Addr.h b/protocols/ace/HTBP/HTBP_Addr.h
index 3cbbaa397f7..14241b3c3b6 100644
--- a/protocols/ace/HTBP/HTBP_Addr.h
+++ b/protocols/ace/HTBP/HTBP_Addr.h
@@ -24,6 +24,8 @@
 #include "ace/Synch.h"
 #include "ace/SString.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -83,5 +85,7 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_HTBP_ADDR_H */
diff --git a/protocols/ace/HTBP/HTBP_Channel.cpp b/protocols/ace/HTBP/HTBP_Channel.cpp
index 10bbd507206..064312377ba 100644
--- a/protocols/ace/HTBP/HTBP_Channel.cpp
+++ b/protocols/ace/HTBP/HTBP_Channel.cpp
@@ -22,6 +22,8 @@
 #include "ace/Reactor.h"
 
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Initialization and termination methods.
 /// Constructor.
 ACE::HTBP::Channel::Channel (ACE::HTBP::Session *s)
@@ -531,3 +533,5 @@ ACE::HTBP::Channel::get_filter ()
   int inside = (this->session_ != 0);
   return factory->get_filter (inside);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Channel.h b/protocols/ace/HTBP/HTBP_Channel.h
index 3109ed656eb..b33d446e40b 100644
--- a/protocols/ace/HTBP/HTBP_Channel.h
+++ b/protocols/ace/HTBP/HTBP_Channel.h
@@ -26,6 +26,7 @@
 #include "HTBP_Filter.h"
 #include "HTBP_Notifier.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE
 {
@@ -269,6 +270,8 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "HTBP_Channel.inl"
 #endif
diff --git a/protocols/ace/HTBP/HTBP_Channel.inl b/protocols/ace/HTBP/HTBP_Channel.inl
index 70fc4834842..7df1ba8f16e 100644
--- a/protocols/ace/HTBP/HTBP_Channel.inl
+++ b/protocols/ace/HTBP/HTBP_Channel.inl
@@ -1,8 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ACE::HTBP::Channel.i
-
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE::HTBP::Session *
@@ -120,3 +120,5 @@ ACE::HTBP::Channel::set_handle (ACE_HANDLE h)
     return;
   this->ace_stream_.set_handle (h);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Environment.cpp b/protocols/ace/HTBP/HTBP_Environment.cpp
index 60d3b017f17..bd14abcce3d 100644
--- a/protocols/ace/HTBP/HTBP_Environment.cpp
+++ b/protocols/ace/HTBP/HTBP_Environment.cpp
@@ -6,6 +6,8 @@ ACE_RCSID (HTBP,
        	   ACE_HTBP_Environment,
 	   "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE::HTBP::Environment::Environment (ACE_Configuration *config,
                                      int using_registry,
                                      const ACE_TCHAR *persistent_file)
@@ -195,3 +197,5 @@ ACE::HTBP::Environment::export_config (const ACE_TCHAR *filename)
 {
   return this->imp_exp_->export_config (filename);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Environment.h b/protocols/ace/HTBP/HTBP_Environment.h
index 2f4cc90a5ac..894a376457a 100644
--- a/protocols/ace/HTBP/HTBP_Environment.h
+++ b/protocols/ace/HTBP/HTBP_Environment.h
@@ -15,6 +15,7 @@
 #include "ace/Configuration_Import_Export.h"
 #include "ace/Singleton.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE
 {
@@ -103,5 +104,7 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_HTBP_ENVIRONMENT_H */
diff --git a/protocols/ace/HTBP/HTBP_Filter.cpp b/protocols/ace/HTBP/HTBP_Filter.cpp
index 2571199ef2d..2ac714b8904 100644
--- a/protocols/ace/HTBP/HTBP_Filter.cpp
+++ b/protocols/ace/HTBP/HTBP_Filter.cpp
@@ -1,4 +1,3 @@
-// ACE_HTBP_Filter.cpp
 // $Id$
 
 #include "ace/Log_Msg.h"
@@ -10,7 +9,9 @@
 #include "HTBP_Filter.inl"
 #endif
 
-ACE_RCSID(HTBP,ACE_HTBP_Filter,"$ID: $")
+ACE_RCSID(HTBP,ACE_HTBP_Filter,"$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE::HTBP::Filter::Filter (void)
   :http_code_ (0)
@@ -52,3 +53,5 @@ ACE::HTBP::Filter::header_complete (ACE::HTBP::Channel *ch)
     }
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Filter.h b/protocols/ace/HTBP/HTBP_Filter.h
index 9548f377d1b..ebc9ebb895f 100644
--- a/protocols/ace/HTBP/HTBP_Filter.h
+++ b/protocols/ace/HTBP/HTBP_Filter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 
 #include "HTBP_Export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -92,6 +94,8 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "HTBP_Filter.inl"
 #endif
diff --git a/protocols/ace/HTBP/HTBP_Filter.inl b/protocols/ace/HTBP/HTBP_Filter.inl
index 224b7e02699..c648393daa4 100644
--- a/protocols/ace/HTBP/HTBP_Filter.inl
+++ b/protocols/ace/HTBP/HTBP_Filter.inl
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ACE_HTBP_Filter.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ssize_t
@@ -58,3 +59,5 @@ ACE::HTBP::Filter::http_code (void)
 {
   return this->http_code_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Filter_Factory.cpp b/protocols/ace/HTBP/HTBP_Filter_Factory.cpp
index 8c42584d143..07b16ea9669 100644
--- a/protocols/ace/HTBP/HTBP_Filter_Factory.cpp
+++ b/protocols/ace/HTBP/HTBP_Filter_Factory.cpp
@@ -11,6 +11,8 @@
 
 ACE_RCSID (ACE_HTBP_Filter_Factory, HTBP, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE::HTBP::Filter_Factory::Filter_Factory ()
 {
 }
@@ -39,6 +41,8 @@ ACE::HTBP::Filter_Factory::init (int /* argc */,
   return 0;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (ACE_HTBP_Filter_Factory,
                        ACE_TEXT ("Filter_Factory"),
                        ACE_SVC_OBJ_T,
@@ -55,3 +59,4 @@ template class ACE_Dynamic_Service<ACE::HTBP::Filter_Factory>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Dynamic_Service<ACE::HTBP::Filter_Factory>
 #endif
+
diff --git a/protocols/ace/HTBP/HTBP_Filter_Factory.h b/protocols/ace/HTBP/HTBP_Filter_Factory.h
index 84f32000664..0681055b679 100644
--- a/protocols/ace/HTBP/HTBP_Filter_Factory.h
+++ b/protocols/ace/HTBP/HTBP_Filter_Factory.h
@@ -24,6 +24,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -57,6 +59,8 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DECLARE_EXPORT (HTBP, ACE_HTBP_Filter_Factory)
 ACE_FACTORY_DECLARE (HTBP, ACE_HTBP_Filter_Factory)
 
diff --git a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp
index 3c4b72e38fb..66d3ef7cd93 100644
--- a/protocols/ace/HTBP/HTBP_ID_Requestor.cpp
+++ b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp
@@ -13,6 +13,8 @@ ACE_RCSID(HTBP,
           ACE_HTBP_ID_Requestor,
           "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_TString ACE::HTBP::ID_Requestor::htid_;
 ACE_SYNCH_MUTEX ACE::HTBP::ID_Requestor::htid_lock_;
 
@@ -133,3 +135,5 @@ ACE::HTBP::ID_Requestor::get_HTID ()
     }
   return htid;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_ID_Requestor.h b/protocols/ace/HTBP/HTBP_ID_Requestor.h
index e6cdd87fb1d..b885f07cae5 100644
--- a/protocols/ace/HTBP/HTBP_ID_Requestor.h
+++ b/protocols/ace/HTBP/HTBP_ID_Requestor.h
@@ -13,6 +13,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations
 class ACE_SOCK_Stream;
 
@@ -54,5 +56,8 @@ namespace ACE
 
   }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* HTID_REQUESTOR_H */
diff --git a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
index 4a75ac6ffc6..acb019ce2bb 100644
--- a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
+++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
@@ -12,7 +12,9 @@
 #include "HTBP_Inside_Squid_Filter.inl"
 #endif
 
-ACE_RCSID(HTBP,ACE_HTBP_Inside_Squid_Filter,"$ID:$")
+ACE_RCSID(HTBP,ACE_HTBP_Inside_Squid_Filter,"$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ssize_t
 ACE::HTBP::Inside_Squid_Filter::send_data_trailer (ACE::HTBP::Channel *ch)
@@ -230,3 +232,5 @@ ACE::HTBP::Inside_Squid_Filter::recv_ack (ACE::HTBP::Channel *ch)
   errno = ch->consume_error () ? EINVAL : EWOULDBLOCK;
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
index 142607aa49f..e60a682d81f 100644
--- a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
+++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,6 +21,8 @@
 #include "HTBP_Export.h"
 #include "HTBP_Filter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -79,6 +81,8 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "HTBP_Inside_Squid_Filter.inl"
 #endif
diff --git a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
index d9c4618537e..e8b08950ce6 100644
--- a/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
+++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ACE_HTBP_Inside_Squid_Filter.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE::HTBP::Inside_Squid_Filter::~Inside_Squid_Filter (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Notifier.cpp b/protocols/ace/HTBP/HTBP_Notifier.cpp
index 631ea2728b0..70a6df54023 100644
--- a/protocols/ace/HTBP/HTBP_Notifier.cpp
+++ b/protocols/ace/HTBP/HTBP_Notifier.cpp
@@ -14,6 +14,8 @@
 #include "HTBP_Session.h"
 #include "ace/Reactor.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE::HTBP::Notifier::Notifier (ACE::HTBP::Channel *s)
   : channel_(s)
 {
@@ -80,3 +82,5 @@ ACE::HTBP::Notifier::get_handle(void) const
 {
   return this->channel_->ace_stream().get_handle();
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Notifier.h b/protocols/ace/HTBP/HTBP_Notifier.h
index f0ef01b1f25..0c9dcffa2ed 100644
--- a/protocols/ace/HTBP/HTBP_Notifier.h
+++ b/protocols/ace/HTBP/HTBP_Notifier.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,8 @@
 
 #include "HTBP_Export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -46,5 +48,7 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_HTBP_NOTIFIER_H */
diff --git a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
index 3c035b8dcde..05e79083794 100644
--- a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
+++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
@@ -14,6 +14,8 @@ ACE_RCSID(HTBP,
           ACE_HTBP_Outside_Squid_Filter,
           "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ssize_t
 ACE::HTBP::Outside_Squid_Filter::recv_data_header (ACE::HTBP::Channel *ch)
 {
@@ -190,3 +192,5 @@ ACE::HTBP::Outside_Squid_Filter::recv_ack (ACE::HTBP::Channel *)
 {
   return 1;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
index 5f0c820fccd..92008c3a8b6 100644
--- a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
+++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
@@ -21,6 +21,8 @@
 #include "HTBP_Export.h"
 #include "HTBP_Filter.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -74,6 +76,8 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "HTBP_Outside_Squid_Filter.inl"
 #endif
diff --git a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
index 351c6e53856..e0659ae5e13 100644
--- a/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
+++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
@@ -1,9 +1,12 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// ACE_HTBP_Outside_Squid_Filter.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 ACE::HTBP::Outside_Squid_Filter::~Outside_Squid_Filter (void)
 {
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Session.cpp b/protocols/ace/HTBP/HTBP_Session.cpp
index 930accaaf9f..113cf98d1d6 100644
--- a/protocols/ace/HTBP/HTBP_Session.cpp
+++ b/protocols/ace/HTBP/HTBP_Session.cpp
@@ -13,7 +13,9 @@
 #include "HTBP_Session.inl"
 #endif
 
-ACE_RCSID(HTBP,ACE_HTBP_Session," $")
+ACE_RCSID(HTBP,HTBP_Session,"$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE::HTBP::Session::Session_Map ACE::HTBP::Session::session_map_;
 ACE_UINT32 ACE::HTBP::Session::last_session_id_ = 0;
@@ -299,3 +301,5 @@ template class ACE_Equal_To<ACE::HTBP::Session_Id_t>;
 
 #pragma instantiate ACE_Equal_To<ACE::HTBP::Session_Id_t>
 #endif
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Session.h b/protocols/ace/HTBP/HTBP_Session.h
index 9c162849215..5b46c6e86b3 100644
--- a/protocols/ace/HTBP/HTBP_Session.h
+++ b/protocols/ace/HTBP/HTBP_Session.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -29,6 +29,8 @@
 
 #include "HTBP_Stream.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declarations.
 class ACE_HTBP_Filter;
 class ACE_Event_Handler;
@@ -185,6 +187,9 @@ namespace ACE
     };
   }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "HTBP_Session.inl"
 #endif
diff --git a/protocols/ace/HTBP/HTBP_Session.inl b/protocols/ace/HTBP/HTBP_Session.inl
index fb5c337826c..06c510650c9 100644
--- a/protocols/ace/HTBP/HTBP_Session.inl
+++ b/protocols/ace/HTBP/HTBP_Session.inl
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 void
 ACE::HTBP::Session::reconnect ()
@@ -107,3 +110,5 @@ ACE::HTBP::Session_Id_t::operator ==(const ACE::HTBP::Session_Id_t &other) const
           (this->local_ == other.local_) &&
           (this->peer_ == other.peer_));
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Stream.cpp b/protocols/ace/HTBP/HTBP_Stream.cpp
index f351993369a..c0913569af0 100644
--- a/protocols/ace/HTBP/HTBP_Stream.cpp
+++ b/protocols/ace/HTBP/HTBP_Stream.cpp
@@ -16,6 +16,7 @@
 
 #include "ace/Message_Block.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Initialization and termination methods.
 /// Constructor.
@@ -322,5 +323,6 @@ ACE::HTBP::Stream::get_handle (void) const
 void
 ACE::HTBP::Stream::set_handle (ACE_HANDLE )
 {
-  // no-op
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/protocols/ace/HTBP/HTBP_Stream.h b/protocols/ace/HTBP/HTBP_Stream.h
index e950939469e..0527ab06632 100644
--- a/protocols/ace/HTBP/HTBP_Stream.h
+++ b/protocols/ace/HTBP/HTBP_Stream.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,8 @@
 #include "HTBP_Filter.h"
 #include "HTBP_Notifier.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace ACE
 {
   namespace HTBP
@@ -283,5 +285,7 @@ namespace ACE
   }
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_HTBP_STREAM_H */