1 files changed, 7 insertions, 15 deletions
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp b/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
index 780a530ea00..0075f4a1ff3 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
@@ -4,7 +4,7 @@
  * @file
  *
  * @brief Implement the element manipulation traits for object
- *        reference types.
+ *        reference types. 
  *
  * $Id$
  *
@@ -15,20 +15,19 @@
 #include <algorithm>
 #include <functional>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
 {
 
-template<class object_t, class object_t_var, class derived>
+template<class object_t, class derived>
 struct object_reference_traits_decorator
 {
   typedef object_t object_type;
   typedef object_type * value_type;
   typedef object_type const * const_value_type;
-  typedef object_t_var object_type_var;
+
+  typedef typename object_type::_var_type object_type_var;
 
   inline static void zero_range(
       object_type ** begin, object_type ** end)
@@ -64,21 +63,14 @@ struct object_reference_traits_decorator
   }
 };
 
-template<typename object_t, typename object_t_var, bool dummy>
+template<typename object_t, bool dummy>
 struct object_reference_traits
-  : public object_reference_traits_base<object_t, object_t_var>
-  , public object_reference_traits_decorator<object_t, object_t_var, object_reference_traits<object_t,object_t_var,dummy> >
+  : public object_reference_traits_base<object_t>
+  , public object_reference_traits_decorator<object_t, object_reference_traits<object_t,dummy> >
 {
-#if defined __BORLANDC__ && __BORLANDC__ < 0x580
-  typedef object_t object_type;
-  typedef object_type * value_type;
-  typedef object_type const * const_value_type;
-  typedef object_t_var object_type_var;
-#endif
 };
 
 } // namespace details
 } // namespace CORBA
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_object_reference_traits_hpp