1 files changed, 11 insertions, 17 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
index 75b5675e2d5..0b6aad318ae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
@@ -3,40 +3,37 @@
 #ifndef TAO_Notify_PROPERTY_T_CPP
 #define TAO_Notify_PROPERTY_T_CPP
 
-#include "orbsvcs/Notify/Property_T.h"
+#include "Property_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Property_T.inl"
+#include "Property_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify, 
            TAO_Notify_Property_T, 
            "$Id$")
 
-#include "orbsvcs/Notify/PropertySeq.h"
+#include "PropertySeq.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/*****************************************************************************/
+/*******************************************************************************/
 
 template <class TYPE>
 TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const char* name)
-  : name_ (name), valid_(0)
+  :name_ (name), valid_(0)
 {
 }
 
 template <class TYPE>
 TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const char* name, const TYPE& initial)
-  : name_ (name), value_ (initial), valid_ (1)
+  :name_ (name), value_ (initial), valid_ (1)
 {
 }
 
 template <class TYPE>
-TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (
-  const TAO_Notify_PropertyBase_T &rhs)
-  : name_ (rhs.name_),
-    value_ (rhs.value_),
-    valid_ (rhs.valid_)
+TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T (const TAO_Notify_PropertyBase_T &rhs)
+:name_ (rhs.name_),
+ value_ (rhs.value_),
+ valid_ (rhs.valid_)
 {
 
 }
@@ -111,8 +108,7 @@ TAO_Notify_StructProperty_T<TYPE>::TAO_Notify_StructProperty_T (const char* name
 }
 
 template <class TYPE> int
-TAO_Notify_StructProperty_T<TYPE>::set (
-  const TAO_Notify_PropertySeq& property_seq)
+TAO_Notify_StructProperty_T<TYPE>::set (const TAO_Notify_PropertySeq& property_seq)
 {
   CosNotification::PropertyValue value;
 
@@ -132,6 +128,4 @@ TAO_Notify_StructProperty_T<TYPE>::set (
   return -1;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #endif /* TAO_Notify_PROPERTY_T_CPP */