Index: boost/test/floating_point_comparison.hpp
===================================================================
--- boost/test/floating_point_comparison.hpp	(revision 49619)
+++ boost/test/floating_point_comparison.hpp	(working copy)
@@ -79,17 +79,26 @@
 safe_fpt_division( FPT f1, FPT f2 )
 {
     // Avoid overflow.
-    if( f2 < static_cast<FPT>(1)  && f1 > f2*fpt_limits<FPT>::max_value() )
+    if( (f2 < static_cast<FPT>(1))  && (f1 > f2*fpt_limits<FPT>::max_value()) )
         return fpt_limits<FPT>::max_value();
 
     // Avoid underflow.
-    if( f1 == static_cast<FPT>(0) ||
-        f2 > static_cast<FPT>(1) && f1 < f2*fpt_limits<FPT>::min_value() )
+    if( (f1 == static_cast<FPT>(0)) ||
+        ((f2 > static_cast<FPT>(1)) && (f1 < f2*fpt_limits<FPT>::min_value())) )
         return static_cast<FPT>(0);
 
     return f1/f2;
 }
 
+// helper templates to prevent ODR violations
+template<class T>
+struct static_constant {
+    static T value;
+};
+
+template<class T>
+T static_constant<T>::value;
+
 //____________________________________________________________________________//
 
 } // namespace tt_detail
@@ -221,7 +230,7 @@
 };
 
 namespace {
-check_is_close_t check_is_close;
+const check_is_close_t& check_is_close = tt_detail::static_constant<check_is_close_t>::value;
 }
 
 //____________________________________________________________________________//
@@ -243,7 +252,7 @@
 };
 
 namespace {
-check_is_small_t check_is_small;
+const check_is_small_t& check_is_small = tt_detail::static_constant<check_is_small_t>::value;
 }
 
 //____________________________________________________________________________//