Index: test/cloning_test.cpp
===================================================================
--- test/cloning_test.cpp	(revision 91)
+++ test/cloning_test.cpp	(working copy)
@@ -7,8 +7,13 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
 #include <string>
 
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct my_tag {};
+#endif
+
 typedef boost::error_info<struct my_tag,int> my_info;
 
 template <class T>
Index: test/diagnostic_information_test.cpp
===================================================================
--- test/diagnostic_information_test.cpp	(revision 91)
+++ test/diagnostic_information_test.cpp	(working copy)
@@ -6,7 +6,12 @@
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
 
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct test_tag {};
+#endif
+
 typedef boost::error_info<struct test_tag,int> tag_int;
 
 struct
Index: test/errno_test.cpp
===================================================================
--- test/errno_test.cpp	(revision 91)
+++ test/errno_test.cpp	(working copy)
@@ -6,8 +6,13 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
 #include <errno.h>
 
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct tag_errno {};
+#endif
+
 typedef boost::error_info<struct tag_errno,int> info_errno;
 
 class
Index: test/error_info_test.cpp
===================================================================
--- test/error_info_test.cpp	(revision 91)
+++ test/error_info_test.cpp	(working copy)
@@ -6,6 +6,7 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info_tuple.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
 
 struct throws_on_copy;
 struct non_printable { };
@@ -34,6 +35,16 @@
         }
     };
 
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct tag_test_1 {};
+struct tag_test_2 {};
+struct tag_test_3 {};
+struct tag_test_4 {};
+struct tag_test_5 {};
+struct tag_test_6 {};
+struct tag_user_data {};
+#endif
+
 typedef boost::error_info<struct tag_test_1,int> test_1;
 typedef boost::error_info<struct tag_test_2,unsigned int> test_2;
 typedef boost::error_info<struct tag_test_3,float> test_3;
Index: test/unknown_exception_test.cpp
===================================================================
--- test/unknown_exception_test.cpp	(revision 91)
+++ test/unknown_exception_test.cpp	(working copy)
@@ -7,7 +7,12 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
 
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct tag_test {};
+#endif
+
 typedef boost::error_info<struct tag_test,int> test;
 
 struct