mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #22 from mat007/fix-semicolon

Browse source 
Fixed extra semicolon warning with BOOST_GLOBAL_FIXTURE prior to Boost 1.59
This commit is contained in:
Mathieu Champlon 2016-02-07 20:40:25 +01:00
commit 8877761ecb
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/changelog.qbk
View file

@ -13,6 +13,7 @@ Not yet released
* Fixed missing thread synchronization in mock::sequence * Fixed missing thread synchronization in mock::sequence
* Fixed build errors with Boost 1.59 * Fixed build errors with Boost 1.59
* Fixed multiply defined symbol definition for MOCK_FUNCTION included from several translation units * Fixed multiply defined symbol definition for MOCK_FUNCTION included from several translation units
* Fixed extra semicolon warning with BOOST_GLOBAL_FIXTURE prior to Boost 1.59
[endsect] [endsect]

5
include/turtle/cleanup.hpp
View file

@ -27,7 +27,10 @@ namespace mock
}; };
#ifdef MOCK_USE_BOOST_TEST #ifdef MOCK_USE_BOOST_TEST
BOOST_GLOBAL_FIXTURE( cleanup ); BOOST_GLOBAL_FIXTURE( cleanup )
#if BOOST_VERSION >= 105900
;
#endif
#endif #endif
} // mock } // mock