Commit graph

920 commits

Author SHA1 Message Date
Mathieu Champlon
5f8421b1d2
Merge pull request #82 from Flamefire/cmake
Add CMake files
2020-04-09 09:02:01 -07:00
Flamefire
be153c5948 Output coverage data before uploading 2019-12-29 21:03:20 +01:00
Flamefire
ee0a76eed5 Improve coverage collection 2019-12-29 21:03:20 +01:00
Flamefire
af49b04c19 Add CMake files 2019-12-28 13:58:24 +01:00
Mathieu Champlon
44e8509d6f
Merge pull request #71 from sigiesec/fix-protected-method-docs
Fix documentation regarding protected methods
2019-04-12 16:06:32 +02:00
Simon Giesecke
c22f19801b Made example method actually protected 2019-04-11 11:04:52 +02:00
Simon Giesecke
7b892418aa Adapt section title after prior extension to protected methods 2019-04-11 11:04:42 +02:00
Mathieu Champlon
5c0f290125
Merge pull request #68 from Flamefire/mingw
Undef small and near if defined
2019-01-02 10:33:04 +01:00
Flamefire
c71fe6c912 Undef small and near if defined
Not only happens on MSVC but also on MinGW (and probably all windows builds)
2019-01-01 19:36:31 +01:00
Mathieu Champlon
1b5d8c84ef
Merge pull request #66 from Flamefire/variadic
Fix gnu-zero-variadic-macro-arguments warning
2018-12-13 16:09:28 +01:00
Alexander Grund
45574d708b Add comma to MOCK_VARIADIC_ELEM_N calls
Avoids warning "must specify at least one argument for '...' parameter of
variadic macro" on e.g. Clang
2018-12-11 16:39:36 +01:00
Alexander Grund
f0fb2a1d02 Use BOOST_PP_VARIADIC_ELEM 2018-12-11 13:35:13 +01:00
Mathieu Champlon
01df620d16
Merge pull request #61 from Flamefire/lock
Fix unused variable warning in non-threadsafe builds
2018-11-30 00:21:04 -08:00
Flamefire
30d756d120 Fix unused variable warning in non-threadsafe builds
Make lock/scoped_lock (dummy) RAII classes which avoids warnings in clang
Make lock and wrapper moveable as they should
Make wrapper return itself as reference not copy
2018-11-29 08:43:49 +01:00
Mathieu Champlon
4a853f9952
Merge pull request #63 from mat007/tweak-ci-envs
Update target environments
2018-11-24 22:52:49 -08:00
Mathieu Champlon
df390cfd9d Update target environments 2018-11-24 17:15:58 +01:00
Mathieu Champlon
4754a2a775
Merge pull request #62 from Flamefire/singleton2
Implement and use simple singleton
2018-11-23 22:45:48 -08:00
Alexander Grund
72e0daae5c Implement and use simple singleton
Based on old boost::unit_test::singleton
2018-11-22 14:41:11 +01:00
Mathieu Champlon
d77aad128c
Merge pull request #59 from Flamefire/cpp98
Cpp98 compatibility
2018-11-22 02:24:52 -08:00
Alexander Grund
f402c6161e Fix C++98 compatibility 2018-11-22 10:12:00 +01:00
Flamefire
2cde572532 Add -Wno-unused-local-typedefs to silence warnings breaking the build on travis 2018-11-22 10:12:00 +01:00
Mathieu Champlon
fb8d7abab4
Merge pull request #60 from Flamefire/coverage
Use boost-local for boost folder to ignore its coverage
2018-11-19 07:12:45 -08:00
Alexander Grund
c4af5d937b Use boost-local for boost folder to ignore its coverage 2018-11-19 13:10:46 +01:00
Mathieu Champlon
e209d544c1
Merge pull request #45 from mat007/fix-ci
Fix CI
2018-11-16 23:08:22 -08:00
Mathieu Champlon
c9888a6326 Build only the master branch 2018-11-16 09:35:20 +01:00
Mathieu Champlon
20fcfa56ce Fixed boost versions available on appveyor 2018-11-16 09:34:56 +01:00
Mathieu Champlon
e92f52821d
Merge pull request #46 from AudioStreamingPlatform/master
Corrected Catch compile issue
2018-05-29 21:43:17 +02:00
Jeppe Frandsen
016455ca40
Corrected catch.hpp 2018-05-27 13:50:33 +02:00
Mathieu Champlon
d7b1ad0800
Merge pull request #43 from mat007/fix-function-param-forward
Fixed parameter forwarding bug in mock functions
2018-04-08 21:59:58 +02:00
Mathieu Champlon
1e1f0da335 Fixed linkflags 2018-04-08 18:05:39 +02:00
Mathieu Champlon
cd5f911f6d Fixed parameter forwarding bug in mock functions 2018-04-08 17:48:14 +02:00
Mathieu Champlon
d162eeb8fb
Merge pull request #41 from mat007/fix-c++17-compliance
Fix clang build
2018-04-08 17:47:22 +02:00
Mathieu Champlon
47784f992e Added docker files for gcc and clang development environments 2018-04-08 15:16:49 +02:00
Mathieu Champlon
6a68fa728b Fixed shell build script 2018-04-08 15:16:49 +02:00
Mathieu Champlon
a2647d00e9 Fixed gcc build error 2018-04-08 15:16:49 +02:00
Mathieu Champlon
20e7d50568 Fixed test failing for gcc 2018-04-08 15:16:49 +02:00
Mathieu Champlon
4455222a62 Removed support for directly mocking a protected member function
Taking a function pointer on a base member protected function is actually invalid.
This could work with a pointer on the derived class member function, that is &derived::method instead of &base::method however there is no way to pass the derived class from MOCK_BASE_CLASS to the mock::detail::base helper if template classes are to be supported.

Anyway the now documented workaround is simple enough and the same as for private member functions.

As a side note the changes from ed36823235 might not be needed any more…
2018-04-08 15:16:49 +02:00
Mathieu Champlon
caef00d2e3 Fixed move in actions for gcc 2018-04-08 15:16:49 +02:00
Mathieu Champlon
35b4f570ae Fixed clang warning 2018-04-08 15:16:48 +02:00
Mathieu Champlon
71a7f6d9c4 Fixed shell build script to exit upon error 2018-04-08 15:16:48 +02:00
Mathieu Champlon
a178fc442a Removed stdcall tests and examples for all compilers but msvc 2018-04-08 15:16:48 +02:00
Mathieu Champlon
b8e8b6ffbf Fixed uncaught_exceptions usage with clang
For some reason clang seems so believe uncaught_exceptions does not belong to the std namespace:

no member named 'uncaught_exceptions' in namespace 'std'; did you mean
      simply 'uncaught_exceptions'?

I haven't found any indication confirming this, but let's just support both…
2018-04-08 15:16:48 +02:00
Mathieu Champlon
9e572eca3e Added clang for travis 2018-04-08 15:16:48 +02:00
Mathieu Champlon
07c73ad616
Merge pull request #40 from mat007/fix-c++17-compliance
Fix c++17 compliance
2018-03-25 13:58:19 +02:00
Mathieu Champlon
c42b708950 Fixed deprecation warning about std::uncaught_exception in c++17 for msvc 2018-03-25 09:46:40 +02:00
Mathieu Champlon
61d5cf5634 Added /std:cxx?? to appveyor builds
Build for c++17 disabled as Boost has not yet released a fully Visual Studio 2017 c++17 ready version.
2018-03-25 09:30:13 +02:00
Mathieu Champlon
e1b9819829
Merge pull request #39 from mat007/fix-multi-expectations
Fixed perfect forwarding bug
2018-03-18 09:16:24 +01:00
Mathieu Champlon
860e072439 Fixed perfect forwarding bug 2018-03-17 22:20:04 +01:00
Mathieu Champlon
062d465ba5
Merge pull request #38 from mat007/fix-appveyor-build
Fixed xsltproc install in appveyor
2018-03-13 21:13:16 +01:00
Mathieu Champlon
09ab475928 Fixed xsltproc install in appveyor 2018-03-13 18:38:48 +01:00