Commit graph

738 commits

Author SHA1 Message Date
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
Mathieu Champlon
86acef882c
Merge pull request #37 from mat007/fix-appveyor-build
Fixed xsltproc install in appveyor
2018-03-13 13:36:48 +01:00
Mathieu Champlon
a1cfc0c0b1 Fixed xsltproc install in appveyor 2018-03-13 09:25:32 +01:00
Mathieu Champlon
176b9bdc01
Merge pull request #35 from mat007/support-move-only-types-as-arguments
Support move only types as arguments
2018-03-12 19:21:54 +01:00
Mathieu Champlon
bccd3ff303 Added support for move only types to constraints
Therefore mock::retrieve now supports std::unique_ptr.
2018-03-12 08:34:28 +01:00
Mathieu Champlon
5795f4be70 Added Visual Studio Code configuration folder to gitignore 2018-03-12 08:33:59 +01:00
Mathieu Champlon
5d11db0f52 Added support for dereferencing in mock::equal 2018-03-12 08:33:53 +01:00
Mathieu Champlon
a2d36e961a Fixed move-only type support in constraints 2018-03-12 08:11:33 +01:00
Mathieu Champlon
d3a5d3010c Fixed move-only type argument in actions
Because boost::function does not move the parameters it receives we need to use std::function instead.
2018-03-12 08:11:33 +01:00
Mathieu Champlon
58b5e55bb5 Fixed alignement 2018-03-12 08:11:32 +01:00
Mathieu Champlon
5ede8262fd
Merge pull request #19 from mat007/fix-appveyor-build
Fix appveyor build
2018-03-09 14:26:21 +01:00
Mathieu Champlon
2a48aa1787 Added appveyor build script 2018-03-09 06:42:08 +01:00
Mathieu Champlon
61d101dd8b Updated c++ versions to check against 2018-03-08 09:38:00 +01:00
Mathieu Champlon
179c26946c Added mock functor in namespace test 2018-03-08 09:36:57 +01:00
Mathieu Champlon
ed2a22a691
Merge pull request #36 from mat007/fix-travis-cxxflags
Fixed travis cxxflags
2018-01-20 19:45:37 +01:00
Mathieu Champlon
9732acce78 Fixed travis cxxflags 2018-01-20 14:13:52 +01:00
Mathieu Champlon
15285a22ec Cleaned code 2018-01-15 05:23:15 +01:00
Mathieu Champlon
afffdb470a Fixed readme 2017-05-30 16:15:09 +02:00
Mathieu Champlon
6102a8202a Merge pull request #32 from mat007/catch-integration
Added Catch integration
2017-05-30 16:09:44 +02:00
Mathieu Champlon
2a635f1ef6 Fixed documentation issues 2017-05-29 09:12:16 +02:00
Mathieu Champlon
6daff2167c Added Catch integration 2017-05-29 09:12:03 +02:00
Mathieu Champlon
5e11124901 Merge pull request #30 from mat007/no-auto-ptr-config-option
Added MOCK_NO_AUTO_PTR to deactivate std::auto_ptr support
2017-03-20 16:07:41 +01:00
Mathieu Champlon
a22ca57253 Added MOCK_NO_AUTO_PTR to deactivate std::auto_ptr support 2017-03-20 11:43:18 +01:00
Mathieu Champlon
238fff3fe2 Merge pull request #28 from mat007/fix-mocking-a-returned-reference
Fix mocking a function returning a reference
2017-01-15 17:14:51 +01:00
Mathieu Champlon
c847c85a77 Fixed mocking of a function returning a reference for gcc 4.1 2017-01-15 12:50:11 +01:00
Mathieu Champlon
39e77bb49b Removed obsolete include 2017-01-15 12:41:17 +01:00
Mathieu Champlon
deb00fc0d1 Merge pull request #26 from mat007/use-identity-type
Removed link from code comment
2016-07-18 08:54:00 +02:00
Mathieu Champlon
cbb96523ea Removed link from code comment 2016-07-18 08:51:43 +02:00
Mathieu Champlon
34661258b7 Merge pull request #25 from mat007/use-identity-type
Use identity type
2016-07-18 08:36:50 +02:00
Mathieu Champlon
5d22e09c14 Clarified target description to include packaging 2016-07-18 07:38:37 +02:00
Mathieu Champlon
779d695490 Fixed line length greater than 80 characters 2016-07-17 23:28:05 +02:00
Mathieu Champlon
28b010cff2 Updated version number 2016-07-17 23:23:35 +02:00
Mathieu Champlon
0bf55ff7f5 Fixed links to Boost.Test documentation 2016-07-17 23:23:15 +02:00