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

Fixes from review comments

Browse source
This commit is contained in:
Flamefire 2018-11-21 11:19:05 +01:00
parent 3b81a8e6c0
commit 9e5cbee376
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/turtle/detail/function_impl_template.hpp
View file

@ -257,7 +257,7 @@ namespace detail
virtual void context_destroyed() virtual void context_destroyed()
{ {
context_ = NULL; context_ = 0;
} }
friend std::ostream& operator<<( friend std::ostream& operator<<(

4
include/turtle/detail/singleton.hpp
View file

@ -14,7 +14,7 @@
namespace mock { namespace mock {
namespace detail { namespace detail {
template<typename Derived> template< typename Derived >
class singleton { class singleton {
public: public:
static Derived& inst() { static Derived the_inst; return the_inst; } static Derived& inst() { static Derived the_inst; return the_inst; }
@ -30,7 +30,7 @@ protected:
// Add a private ctor to the type to prevent misuse // Add a private ctor to the type to prevent misuse
#define MOCK_SINGLETON_CONS( type ) \ #define MOCK_SINGLETON_CONS( type ) \
private: \ private: \
friend class ::mock::detail::singleton<type>; \ friend class mock::detail::singleton< type >; \
type() {} type() {}
} // detail } // detail