summaryrefslogtreecommitdiff
path: root/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp')
-rw-r--r--TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp22
1 files changed, 9 insertions, 13 deletions
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp b/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
index b048719abc5..a05b224f327 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
@@ -1,5 +1,5 @@
-#ifndef object_reference_traits_base_hpp
-#define object_reference_traits_base_hpp
+#ifndef guard_string_traits_base_hpp
+#define guard_string_traits_base_hpp
/**
* @file
*
@@ -10,36 +10,33 @@
* @author Carlos O'Ryan
*/
-#include "tao/Objref_VarOut_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
namespace TAO
{
namespace details
{
-template<typename object_t, typename object_t_var>
+template<typename object_t>
struct object_reference_traits_base
{
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 release(object_type * object)
{
- TAO::Objref_Traits<object_type>::release(object);
+ object_type::_tao_release(object);
}
inline static object_type * duplicate(object_type * object)
{
- return TAO::Objref_Traits<object_type>::duplicate(object);
+ return object_type::_duplicate(object);
}
inline static object_type * nil()
{
- return TAO::Objref_Traits<object_type>::nil();
+ return object_type::_nil();
}
inline static object_type * default_initializer()
@@ -51,5 +48,4 @@ struct object_reference_traits_base
} // namespace details
} // namespace TAO
-TAO_END_VERSIONED_NAMESPACE_DECL
-#endif // object_reference_traits_base_hpp
+#endif // guard_string_traits_base_hpp