File tree Expand file tree Collapse file tree 2 files changed +3
-1
lines changed Expand file tree Collapse file tree 2 files changed +3
-1
lines changed Original file line number Diff line number Diff line change 2525SUPPRESS_WARNING_CLANG_PUSH (" -Wzero-as-null-pointer-constant" )
2626SUPPRESS_WARNING_CLANG_PUSH(" -Wsuggest-destructor-override" )
2727SUPPRESS_WARNING_CLANG_PUSH(" -Winconsistent-missing-destructor-override" )
28+ SUPPRESS_WARNING_CLANG_PUSH(" -Wformat" ) // happens with libc++ only
2829
2930#include < tinyxml2.h> // IWYU pragma: export
3031
3132SUPPRESS_WARNING_CLANG_POP
3233SUPPRESS_WARNING_CLANG_POP
3334SUPPRESS_WARNING_CLANG_POP
35+ SUPPRESS_WARNING_CLANG_POP
3436
3537inline static tinyxml2::XMLError xml_LoadFile (tinyxml2::XMLDocument& doc, const char * filename)
3638{
Original file line number Diff line number Diff line change @@ -657,7 +657,7 @@ class TestMathLib : public TestFixture {
657657
658658 ASSERT_THROW_INTERNAL_EQUALS (MathLib::toDoubleNumber (" invalid" ), INTERNAL, " Internal Error. MathLib::toDoubleNumber: conversion failed: invalid" );
659659
660- #ifdef _LIBCPP_VERSION
660+ #if defined( _LIBCPP_VERSION) && (defined(__APPLE__) && defined(__MACH__))
661661 ASSERT_THROW_INTERNAL_EQUALS (MathLib::toDoubleNumber (" 1invalid" ), INTERNAL, " Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid" );
662662 ASSERT_THROW_INTERNAL_EQUALS (MathLib::toDoubleNumber (" 1.1invalid" ), INTERNAL, " Internal Error. MathLib::toDoubleNumber: conversion failed: 1.1invalid" );
663663#else
You can’t perform that action at this time.
0 commit comments