Merge branch 'master' into develop

This commit is contained in:
Peter Dimov
2015-01-31 01:09:05 +02:00

View File

@@ -58,7 +58,7 @@ void test_disabled()
BOOST_ASSERT(p); BOOST_ASSERT(p);
BOOST_ASSERT_MSG(p, "msg"); BOOST_ASSERT_MSG(p, "msg");
// supress warnings // suppress warnings
p = &x; p = &x;
p = &p; p = &p;
} }