ilusha/unittest-cpp
1
0
Fork 0
mirror of https://github.com/unittest-cpp/unittest-cpp synced 2026-09-26 16:19:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed conditional compile around FixtureDtorThrows structure. Added a preprocessor block for _MSC_VER noexcept support.

Browse source
This commit is contained in:
grahamreeds 2015-11-12 12:01:07 +00:00
parent 24061e420c
commit 4fccb76875
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/TestTestMacros.cpp
View file

@ -32,6 +32,15 @@ using namespace std;
#endif
#endif
#endif
#elif _MSC_VER
#if (_MSC_VER > 1800)
#define _NOEXCEPT_OP(x) noexcept(x)
#else
#define _NOEXCEPT_OP(x)
#endif
#endif
namespace {
@ -160,11 +169,6 @@ TEST(FixturesWithThrowingCtorsAreFailures)
CHECK(strstr(reporter.lastFailedMessage, "while constructing fixture"));
}
// Visual Studio 2015 in compliance with C++11 standard
// implicitly adds a 'noexcept' to all user defined
// destructors. Any exceptions thrown from destructors
// cause abort() to be called on the process.
#if(_MSC_VER < 1900)
struct FixtureDtorThrows
{
~FixtureDtorThrows() _NOEXCEPT_OP(false) { throw "exception"; }
@ -190,7 +194,6 @@ TEST(FixturesWithThrowingDtorsAreFailures)
CHECK_EQUAL(1, failureCount);
CHECK(strstr(reporter.lastFailedMessage, "while destroying fixture"));
}
#endif
const int FailingLine = 123;