Tue Feb 7 22:40:54 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>

52 files changed, 213 insertions, 35 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 46f3520be05..cbe9db89103 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,61 @@
+Tue Feb  7 22:40:54 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * M tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
+        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
+        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
+        * tests/Sequence_Unit_Tests/bounded_sequence_cdr.hpp
+        * tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp
+        * tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
+        * tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
+        * tests/Sequence_Unit_Tests/bounded_value_sequence.hpp
+        * tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
+        * tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
+        * tests/Sequence_Unit_Tests/fwd_mock_reference.hpp
+        * tests/Sequence_Unit_Tests/generic_sequence.hpp
+        * tests/Sequence_Unit_Tests/mock_reference.cpp
+        * tests/Sequence_Unit_Tests/mock_reference.hpp
+        * tests/Sequence_Unit_Tests/mock_stream.cpp
+        * tests/Sequence_Unit_Tests/mock_stream.hpp
+        * tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
+        * tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
+        * tests/Sequence_Unit_Tests/object_reference_traits.hpp
+        * tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
+        * tests/Sequence_Unit_Tests/range_checking.hpp
+        * tests/Sequence_Unit_Tests/string_sequence_element.hpp
+        * tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
+        * tests/Sequence_Unit_Tests/string_traits.hpp
+        * tests/Sequence_Unit_Tests/string_traits_base.hpp
+        * tests/Sequence_Unit_Tests/testing_allocation_traits.hpp
+        * tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp
+        * tests/Sequence_Unit_Tests/testing_object_reference_traits.hpp
+        * tests/Sequence_Unit_Tests/testing_range_checking.hpp
+        * tests/Sequence_Unit_Tests/testing_string_traits.hpp
+        * tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
+        * tests/Sequence_Unit_Tests/unbounded_fwd_object_reference_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
+        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
+        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr.hpp
+        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
+        * tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
+        * tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
+        * tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp
+        * tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
+        * tests/Sequence_Unit_Tests/value_sequence_tester.hpp
+        * tests/Sequence_Unit_Tests/value_traits.hpp
+        
+          Fixes for versioned namespace compile problems.  Thanks to
+          Ossama Othman (ossama_othman at symantec dot com) for providing
+          assistance..
+        
 Tue Feb  7 21:07:35 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
index 08ddd2e618f..8225e59f89a 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
@@ -14,6 +14,8 @@
 #include "generic_sequence.hpp"
 #include "string_sequence_element.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -99,4 +101,5 @@ private:
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_basic_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
index e4140e3ef39..184b8f7df6a 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
@@ -14,6 +14,8 @@
 #include "generic_sequence.hpp"
 #include "object_reference_sequence_element.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -96,4 +98,5 @@ private:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_object_reference_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp
index fa2b488f4d4..27618373268 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp
@@ -21,7 +21,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 CORBA::ULong const TMAX = 64;
 
@@ -396,7 +396,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
index 5805e84a27b..193a6657f7a 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
@@ -13,6 +13,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -58,4 +60,5 @@ struct bounded_reference_allocation_traits
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_reference_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr.hpp
index f6729bb45e1..fba15efe71f 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr.hpp
@@ -11,6 +11,8 @@
  * @author Johnny Willemsen
  */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO {
   namespace details {
     template <typename stream, typename sequence>
@@ -53,4 +55,5 @@ namespace TAO {
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif /* guard_bounded_sequence_cdr */
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp
index 3bb7b983e83..a600c585ce8 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp
@@ -23,7 +23,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 CORBA::ULong const TMAX = 64;
 
@@ -111,7 +111,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
index afc33e73fb2..c42738744bc 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
@@ -12,6 +12,8 @@
 
 #include "bounded_basic_string_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -35,4 +37,5 @@ public:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
index 9bf7fcfc321..2007046a08c 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
@@ -28,7 +28,7 @@
 #include <sstream>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 CORBA::ULong const MAXIMUM = 32;
 
@@ -367,7 +367,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
index 00beac8a06b..e7727f449de 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
@@ -13,6 +13,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -53,4 +55,5 @@ struct bounded_value_allocation_traits
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_value_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence.hpp
index 0f1fb4b609a..994122e22ce 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence.hpp
@@ -15,6 +15,8 @@
 #include "value_traits.hpp"
 #include "generic_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -91,4 +93,6 @@ private:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // guard_bounded_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp
index 4ab88232ae6..87ccb341040 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp
@@ -20,7 +20,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 CORBA::ULong const MAXIMUM = 32;
 
@@ -338,7 +338,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
index f83938ce0d3..8fff36ae5ea 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
@@ -10,8 +10,11 @@
  * @author Carlos O'Ryan
  */
 
+
 #include "bounded_basic_string_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -35,4 +38,5 @@ public:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_wstring_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
index 99f2a33de8d..0dfe597f7a1 100644
--- a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
@@ -7,6 +7,8 @@
  */
 #include "fwd_mock_reference.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 fwd_mock_reference *
 TAO::Objref_Traits<fwd_mock_reference>::duplicate (
     fwd_mock_reference_ptr
@@ -36,3 +38,5 @@ TAO::Objref_Traits<fwd_mock_reference>::marshal (
 {
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.hpp b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.hpp
index 8fb78d9ce7a..a808d674fc4 100644
--- a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.hpp
@@ -16,6 +16,8 @@
 
 #include "tao/Objref_VarOut_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class fwd_mock_reference;
 typedef fwd_mock_reference * fwd_mock_reference_ptr;
 typedef TAO_Objref_Var_T<fwd_mock_reference> fwd_mock_reference_var;
@@ -33,4 +35,5 @@ struct Objref_Traits< fwd_mock_reference>
 };
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_fwd_mock_reference_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp
index 19da17a262f..a5b933f9855 100644
--- a/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp
@@ -60,6 +60,8 @@
 
 #include <algorithm>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -257,4 +259,5 @@ private:
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_generic_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp b/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
index a4ef6d8e6b0..47343eb366f 100644
--- a/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
@@ -7,6 +7,8 @@
  */
 #include "mock_reference.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 call_counter mock_reference::duplicate_calls;
 call_counter mock_reference::release_calls;
 call_counter mock_reference::serialize_calls;
@@ -93,3 +95,4 @@ CORBA::Boolean operator>> (mock_stream &, mock_reference *&)
   mock_reference::deserialize_calls ();
   return true;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_reference.hpp b/TAO/tests/Sequence_Unit_Tests/mock_reference.hpp
index 5a219188c86..7be04979980 100644
--- a/TAO/tests/Sequence_Unit_Tests/mock_reference.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/mock_reference.hpp
@@ -14,6 +14,9 @@
 
 #include "testing_counters.hpp"
 
+#include "tao/Basic_Types.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Forward declare the class a CORBA::release function for it.  That
 // avoids having to introduce CORBA::Object into the tests.
 // Ideally the T_var and T_out types should accept mock objects
@@ -26,8 +29,12 @@ void release(mock_reference*);
 
 class mock_stream;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include "tao/Objref_VarOut_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 typedef mock_reference *mock_reference_ptr;
 typedef TAO_Objref_Var_T<mock_reference> mock_reference_var;
 typedef TAO_Objref_Out_T<mock_reference> mock_reference_out;
@@ -96,5 +103,5 @@ namespace TAO
     static CORBA::Boolean marshal (mock_reference_ptr p, TAO_OutputCDR & cdr);
   };
 }
-
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_mock_reference_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_stream.cpp b/TAO/tests/Sequence_Unit_Tests/mock_stream.cpp
index f84d6d22435..e5437a1a51e 100644
--- a/TAO/tests/Sequence_Unit_Tests/mock_stream.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/mock_stream.cpp
@@ -7,6 +7,8 @@
  */
 #include "mock_stream.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 call_counter mock_stream::serialize_calls;
 call_counter mock_stream::deserialize_calls;
 
@@ -30,3 +32,4 @@ CORBA::Boolean operator>> (mock_stream &, CORBA::ULong &)
   return true;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_stream.hpp b/TAO/tests/Sequence_Unit_Tests/mock_stream.hpp
index 5dab6c013c9..8bd2ef1a5d1 100644
--- a/TAO/tests/Sequence_Unit_Tests/mock_stream.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/mock_stream.hpp
@@ -14,6 +14,8 @@
 #include "testing_counters.hpp"
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class mock_stream
  *
@@ -33,4 +35,6 @@ public:
 CORBA::Boolean operator<< (mock_stream &, const CORBA::ULong);
 CORBA::Boolean operator>> (mock_stream &, CORBA::ULong &);
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // guard_mock_stream_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
index f99bf34c37d..ec6a58ad65e 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
@@ -12,6 +12,8 @@
  */
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -120,4 +122,5 @@ private:
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_object_reference_sequence_element_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
index 0b57f6d5c6e..ade2691d8b4 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp
@@ -20,7 +20,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
-using namespace TAO::details;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
 using namespace boost::unit_test_framework;
 
@@ -327,7 +327,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp b/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
index 2d5326793c9..780a530ea00 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
@@ -15,6 +15,8 @@
 #include <algorithm>
 #include <functional>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -78,4 +80,5 @@ struct object_reference_traits
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_object_reference_traits_hpp
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 9a1b30cf00b..b048719abc5 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_traits_base.hpp
@@ -12,6 +12,8 @@
 
 #include "tao/Objref_VarOut_T.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -49,4 +51,5 @@ struct object_reference_traits_base
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // object_reference_traits_base_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/range_checking.hpp b/TAO/tests/Sequence_Unit_Tests/range_checking.hpp
index bcd4aa42b5d..85a71af0abc 100644
--- a/TAO/tests/Sequence_Unit_Tests/range_checking.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/range_checking.hpp
@@ -13,6 +13,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -139,6 +141,7 @@ struct range_checking
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #if defined(TAO_USER_DEFINED_SEQUENCE_RANGE_CHECKING_INCLUDE)
 #  include TAO_USER_DEFINED_SEQUENCE_RANGE_CHECKING_INCLUDE
 #endif // TAO_USER_DEFINED_SEQUENCE_RANGE_CHECKING_INCLUDE
diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp
index 5ccac25610c..9ce72bb0ece 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp
@@ -13,6 +13,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -117,4 +119,5 @@ private:
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_string_sequence_element_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
index 55e488d0f00..fde7f00ee63 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
@@ -21,7 +21,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
-using namespace TAO::details;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
 using namespace boost::unit_test_framework;
 
@@ -381,7 +381,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/string_traits.hpp b/TAO/tests/Sequence_Unit_Tests/string_traits.hpp
index 143b4948d15..71d4f2fb7b6 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_traits.hpp
@@ -15,6 +15,8 @@
 #include <algorithm>
 #include <functional>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -70,4 +72,5 @@ struct string_traits
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_string_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp b/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp
index 508d116b3c6..1dacb6f09be 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp
@@ -14,6 +14,8 @@
 #include "tao/CORBA_String.h"
 #include "tao/Managed_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -79,4 +81,5 @@ struct string_traits_base<CORBA::WChar>
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_string_traits_base_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits.hpp
index 2c771853502..ba578e0f756 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits.hpp
@@ -54,6 +54,7 @@ testing_allocation_traits<T,base>::freebuf_calls;
 template<typename T, class base> call_counter
 testing_allocation_traits<T,base>::default_buffer_allocation_calls;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 namespace details
@@ -85,5 +86,6 @@ struct bounded_reference_allocation_traits<T,reference_traits,MAX,true>
 
 } // namespace details
 } // namespace TAO
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif // guard_testing_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp
index b4c2e1f2931..de4426c4f16 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp
@@ -17,7 +17,7 @@
 try { statement; } catch(...) { \
   BOOST_ERROR("unexpected exception raised"); }
 
-using namespace TAO::details;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
 
 using namespace boost::unit_test_framework;
 
@@ -172,7 +172,7 @@ private:
 
 struct Foo { int y; };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/testing_object_reference_traits.hpp b/TAO/tests/Sequence_Unit_Tests/testing_object_reference_traits.hpp
index 5aedefcf249..c13d4f5371f 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_object_reference_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_object_reference_traits.hpp
@@ -56,6 +56,7 @@ testing_object_reference_traits<object_t,object_t_var>::duplicate_calls;
 template<typename object_t,typename object_t_var> call_counter
 testing_object_reference_traits<object_t,object_t_var>::release_calls;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 namespace details
@@ -69,5 +70,6 @@ struct object_reference_traits<object_t,object_t_var,true>
 
 } // namespace details
 } // namespace TAO
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif // guard_testing_object_reference_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/testing_range_checking.hpp b/TAO/tests/Sequence_Unit_Tests/testing_range_checking.hpp
index 3588260dafe..b60024b914a 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_range_checking.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_range_checking.hpp
@@ -53,6 +53,7 @@ struct testing_range_checking
   }
 };
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 namespace details
@@ -67,4 +68,5 @@ struct range_checking<T,true>
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_testing_range_checking_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/testing_string_traits.hpp b/TAO/tests/Sequence_Unit_Tests/testing_string_traits.hpp
index ec9a1222218..861bdbc07bf 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_string_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_string_traits.hpp
@@ -76,6 +76,7 @@ testing_string_traits<charT>::not_released_from_const_calls;
 template<typename charT> call_counter
 testing_string_traits<charT>::not_released_from_managed_calls;
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 namespace details
@@ -95,5 +96,6 @@ struct string_traits<CORBA::WChar,true>
 
 } // namespace details
 } // namespace TAO
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif // guard_testing_string_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
index 4caf7ce4f39..b8e2191d860 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
@@ -14,6 +14,8 @@
 #include "generic_sequence.hpp"
 #include "string_sequence_element.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -102,4 +104,5 @@ private:
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_basic_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_fwd_object_reference_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_fwd_object_reference_sequence_ut.cpp
index d44308269d9..e9eae26609c 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_fwd_object_reference_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_fwd_object_reference_sequence_ut.cpp
@@ -22,7 +22,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 struct Tester
 {
@@ -73,7 +73,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
index ec459ea7d8a..4d095a7b9e8 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
@@ -14,6 +14,8 @@
 #include "generic_sequence.hpp"
 #include "object_reference_sequence_element.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -99,4 +101,5 @@ private:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_object_reference_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp
index af4fff33cf1..4854282e479 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp
@@ -21,7 +21,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 struct Tester
 {
@@ -505,7 +505,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
index 5b261ca3052..043f24add9a 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
@@ -23,6 +23,8 @@
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 template<>
@@ -276,6 +278,7 @@ private:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif
 
 #endif // guard_unbounded_octet_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
index 738e42c7e76..b8f36f065cc 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
@@ -23,7 +23,7 @@
 #include "tao/CDR.h"
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 typedef unbounded_value_sequence<CORBA::Octet> tested_sequence;
 typedef tested_sequence::element_traits tested_element_traits;
@@ -465,7 +465,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp
index 9530ba7dcef..39a358d53fc 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp
@@ -7,6 +7,11 @@
  *
  * @author Johnny Willemsen
  */
+
+#include <boost/test/unit_test.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
+
 #include "testing_allocation_traits.hpp"
 #include "testing_range_checking.hpp"
 
@@ -14,15 +19,11 @@
 
 #include "value_sequence_tester.hpp"
 
-#include <boost/test/unit_test.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 #include "tao/Basic_Types.h"
 #include "tao/CDR.h"
 
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 using namespace boost::unit_test_framework;
-using namespace TAO;
 
 typedef unbounded_value_sequence<CORBA::Octet> tested_sequence;
 typedef tested_sequence::element_traits tested_element_traits;
@@ -426,7 +427,9 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+using namespace boost::unit_test_framework;
+
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
@@ -445,4 +448,3 @@ init_unit_test_suite(int, char*[])
 
   return ts;
 }
-
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
index 0d3406acc11..2c5a2da2da2 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
@@ -13,6 +13,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -62,4 +64,5 @@ struct unbounded_reference_allocation_traits
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_reference_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr.hpp
index a17997c7fc7..fd1e9aac05b 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr.hpp
@@ -11,6 +11,8 @@
  * @author Johnny Willemsen
  */
 
+#include "tao/Basic_Types.h"
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO {
   namespace details {
     template <typename stream, typename sequence>
@@ -36,7 +38,7 @@ namespace TAO {
 
     template <typename stream, typename sequence>
     bool insert_unbounded_sequence(stream & strm, const sequence & source) {
-      const ::CORBA::ULong length = source.length ();
+      const CORBA::ULong length = source.length ();
       if (!(strm << length)) {
         return false;
       }
@@ -50,4 +52,5 @@ namespace TAO {
   }
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif /* guard_unbounded_sequence_cdr */
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
index 9331db1ba1d..1a8dffbd1e9 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
@@ -23,7 +23,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 typedef unbounded_object_reference_sequence<mock_reference, mock_reference_var> tested_sequence;
 
@@ -109,7 +109,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
index 5da4cb24829..c54a430b494 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
@@ -11,6 +11,8 @@
  */
 #include "unbounded_basic_string_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -36,4 +38,5 @@ public:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_string_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
index 2594cafb7c4..61c93488a50 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
@@ -22,7 +22,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 template<class tested_sequence>
 struct Tester
@@ -519,7 +519,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
index f61e9271d1a..7b6b3598bf7 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
@@ -13,6 +13,8 @@
 
 #include "tao/Basic_Types.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -47,4 +49,5 @@ struct unbounded_value_allocation_traits
 } // namespace details
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_value_allocation_traits_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
index 0480ee957d4..4702561423a 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
@@ -15,6 +15,8 @@
 #include "value_traits.hpp"
 #include "generic_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -91,5 +93,6 @@ private:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_string_sequence_hpp
 
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp
index 8679023b1ab..3a2fb4bb193 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp
@@ -20,7 +20,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO;
+using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
 typedef unbounded_value_sequence<int> tested_sequence;
 typedef tested_sequence::element_traits tested_element_traits;
@@ -455,7 +455,7 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-test_suite *
+ACE_Proper_Export_Flag test_suite *
 init_unit_test_suite(int, char*[])
 {
   test_suite * ts =
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
index 27b8e611167..50a503e62b3 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
@@ -11,6 +11,8 @@
  */
 #include "unbounded_basic_string_sequence.hpp"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -36,4 +38,5 @@ public:
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_unbounded_wstring_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp b/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp
index 8580aa48c62..02e88aad88e 100644
--- a/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp
@@ -9,11 +9,14 @@
  *
  * @author Carlos O'Ryan
  */
+#include "tao/Basic_Types.h"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 template<class tested_sequence,
     class tested_allocation_traits>
 struct value_sequence_tester
@@ -262,4 +265,5 @@ private:
   boost::weak_ptr<value_sequence_tester> self_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_value_sequence_tester_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/value_traits.hpp b/TAO/tests/Sequence_Unit_Tests/value_traits.hpp
index 8c4788039e4..91bb20e8696 100644
--- a/TAO/tests/Sequence_Unit_Tests/value_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/value_traits.hpp
@@ -10,9 +10,12 @@
  *
  * @author Carlos O'Ryan
  */
+#include "tao/Basic_Types.h"
 
 #include <algorithm>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 namespace details
@@ -46,4 +49,6 @@ struct value_traits
 } // namespace details
 } // namespace CORBA
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif // guard_value_traits_hpp