diff --git a/test/aligned_storage_empy_test.cpp b/test/aligned_storage_empy_test.cpp
index 28e9e20..23e62bf 100644
--- a/test/aligned_storage_empy_test.cpp
+++ b/test/aligned_storage_empy_test.cpp
@@ -53,7 +53,7 @@ namespace
     }
 
     template< class T >
-    void check()
+    void do_check()
     {
         std::ptrdiff_t addr1 = get_address1<0,T>();
         std::ptrdiff_t addr2 = get_address2<0,T>();
@@ -90,31 +90,31 @@ namespace
 
 TT_TEST_BEGIN(type_with_empty_alignment_buffer)
 
-check<char>();
-check<short>();
-check<int>();
-check<long>();
-check<float>();
-check<double>();
-check<long double>();
+do_check<char>();
+do_check<short>();
+do_check<int>();
+do_check<long>();
+do_check<float>();
+do_check<double>();
+do_check<long double>();
 
 #ifdef BOOST_HAS_MS_INT64
-check<__int64>();
+do_check<__int64>();
 #endif
 #ifdef BOOST_HAS_LONG_LONG
-check<long long>();
+do_check<long long>();
 #endif
 
-check<int(*)(int)>();
-check<int*>();
-check<VB>();
-check<VD>();
-check<enum_UDT>();
-check<mf2>();
-check<POD_UDT>();
-check<empty_UDT>();
-check<union_UDT>();
-check<boost::detail::max_align>();
+do_check<int(*)(int)>();
+do_check<int*>();
+do_check<VB>();
+do_check<VD>();
+do_check<enum_UDT>();
+do_check<mf2>();
+do_check<POD_UDT>();
+do_check<empty_UDT>();
+do_check<union_UDT>();
+do_check<boost::detail::max_align>();
 
 TT_TEST_END
 
diff --git a/test/aligned_storage_test.cpp b/test/aligned_storage_test.cpp
index 9f531ee..372bac3 100644
--- a/test/aligned_storage_test.cpp
+++ b/test/aligned_storage_test.cpp
@@ -28,7 +28,7 @@ inline void no_unused_warning(const volatile T&)
 }
 
 template <class T>
-void check(const T&)
+void do_check(const T&)
 {
    typedef typename tt::aligned_storage<T::value,T::value>::type t1;
    t1 as1 = { 0, };
@@ -74,31 +74,31 @@ void check(const T&)
 
 TT_TEST_BEGIN(type_with_alignment)
 
-check(tt::integral_constant<std::size_t,::tt::alignment_of<char>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<short>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<int>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<long>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<float>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<double>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<long double>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<char>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<short>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<int>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<long>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<float>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<double>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<long double>::value>());
 
 #ifdef BOOST_HAS_LONG_LONG
-check(tt::integral_constant<std::size_t,::tt::alignment_of< ::boost::long_long_type>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of< ::boost::long_long_type>::value>());
 #endif
 #ifdef BOOST_HAS_MS_INT64
-check(tt::integral_constant<std::size_t,::tt::alignment_of<__int64>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<__int64>::value>());
 #endif
-check(tt::integral_constant<std::size_t,::tt::alignment_of<int[4]>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<int(*)(int)>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<int*>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<VB>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<VD>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<enum_UDT>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<mf2>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<POD_UDT>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<empty_UDT>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<union_UDT>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<boost::detail::max_align>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<int[4]>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<int(*)(int)>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<int*>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<VB>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<VD>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<enum_UDT>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<mf2>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<POD_UDT>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<empty_UDT>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<union_UDT>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<boost::detail::max_align>::value>());
 
 TT_TEST_END
 
diff --git a/test/aligned_storage_test_a2.cpp b/test/aligned_storage_test_a2.cpp
index 47fe3c4..73a9e4c 100644
--- a/test/aligned_storage_test_a2.cpp
+++ b/test/aligned_storage_test_a2.cpp
@@ -32,7 +32,7 @@ inline void no_unused_warning(const volatile T&)
 }
 
 template <class T>
-void check(const T&)
+void do_check(const T&)
 {
    typedef typename tt::aligned_storage<T::value,T::value>::type t1;
    t1 as1 = { 0, };
@@ -75,31 +75,31 @@ void check(const T&)
 
 TT_TEST_BEGIN(type_with_alignment)
 
-check(tt::integral_constant<std::size_t,::tt::alignment_of<char>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<short>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<int>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<long>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<float>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<double>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<long double>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<char>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<short>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<int>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<long>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<float>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<double>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<long double>::value>());
 
 #ifdef BOOST_HAS_LONG_LONG
-check(tt::integral_constant<std::size_t,::tt::alignment_of< ::boost::long_long_type>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of< ::boost::long_long_type>::value>());
 #endif
 #ifdef BOOST_HAS_MS_INT64
-check(tt::integral_constant<std::size_t,::tt::alignment_of<__int64>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<__int64>::value>());
 #endif
-check(tt::integral_constant<std::size_t,::tt::alignment_of<int[4]>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<int(*)(int)>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<int*>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<VB>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<VD>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<enum_UDT>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<mf2>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<POD_UDT>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<empty_UDT>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<union_UDT>::value>());
-check(tt::integral_constant<std::size_t,::tt::alignment_of<boost::detail::max_align>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<int[4]>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<int(*)(int)>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<int*>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<VB>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<VD>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<enum_UDT>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<mf2>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<POD_UDT>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<empty_UDT>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<union_UDT>::value>());
+do_check(tt::integral_constant<std::size_t,::tt::alignment_of<boost::detail::max_align>::value>());
 
 TT_TEST_END