Merge branch 'develop'

test/optional_test_ref_convert_assign_const_int_prevented.cpp

@@ -26,7 +26,7 @@ int main()
 #ifdef BOOST_OPTIONAL_CONFIG_NO_PROPER_ASSIGN_FROM_CONST_INT
   test_converting_assignment<const int, const int>();
 #else
-  BOOST_STATIC_ASSERT(false, "EXPECTED TEST COMPILE-TIME FAILURE");
+  BOOST_STATIC_ASSERT_MSG(false, "EXPECTED TEST COMPILE-TIME FAILURE");
 #endif
   return boost::report_errors();
 }