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

Improve check for std::uncaught_exceptions

Browse source 
GCC 8 on MinGW still warns about that.
Check the version of the feature macro and add parens to ensure correct
evaluation.
This commit is contained in:
Alexander Grund 2025-06-09 12:19:12 +02:00
parent 3980cc97e1
commit d8809dca2a
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/turtle/config.hpp
View file

@ -25,8 +25,9 @@
# endif # endif
#endif #endif
#if defined(__cpp_lib_uncaught_exceptions) || defined(_MSC_VER) && (_MSC_VER >= 1900) #ifndef MOCK_NO_UNCAUGHT_EXCEPTIONS
# ifndef MOCK_NO_UNCAUGHT_EXCEPTIONS # if(defined(__cpp_lib_uncaught_exceptions) && __cpp_lib_uncaught_exceptions >= 201411) || \
(defined(_MSC_VER) && _MSC_VER >= 1900)
# define MOCK_UNCAUGHT_EXCEPTIONS # define MOCK_UNCAUGHT_EXCEPTIONS
# endif # endif
#endif #endif

9
include/turtle/detail/function_impl.hpp
View file

@ -1,6 +1,7 @@
// http://turtle.sourceforge.net // http://turtle.sourceforge.net
// //
// Copyright Mathieu Champlon 2012 // Copyright 2012 Mathieu Champlon
// Copyright 2025 Alexander Grund
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
@ -80,7 +81,7 @@ namespace mock { namespace detail {
typedef safe_error<R, MOCK_ERROR_POLICY<R>> error_type; typedef safe_error<R, MOCK_ERROR_POLICY<R>> error_type;
public: public:
function_impl() : context_(0), valid_(true), exceptions_(exceptions()), mutex_(std::make_shared<mutex>()) {} function_impl() : exceptions_(exceptions()), mutex_(std::make_shared<mutex>()) {}
virtual ~function_impl() virtual ~function_impl()
{ {
if(valid_ && exceptions_ >= exceptions()) if(valid_ && exceptions_ >= exceptions())
@ -314,8 +315,8 @@ namespace mock { namespace detail {
}; };
std::list<expectation_type> expectations_; std::list<expectation_type> expectations_;
context* context_; context* context_ = nullptr;
mutable bool valid_; mutable bool valid_ = true;
const int exceptions_; const int exceptions_;
const std::shared_ptr<mutex> mutex_; const std::shared_ptr<mutex> mutex_;
}; };