mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-10-31 20:27:11 +01:00 
			
		
		
		
	REQUIRE_THROWS_AS now catches exception by const&
Prevents some warnings caused by catching complex types by value. Closes #542
This commit is contained in:
		| @@ -16,6 +16,7 @@ | ||||
| #include "catch_tostring.h" | ||||
| #include "catch_interfaces_runner.h" | ||||
| #include "catch_compiler_capabilities.h" | ||||
| #include "catch_type_traits.hpp" | ||||
|  | ||||
|  | ||||
| /////////////////////////////////////////////////////////////////////////////// | ||||
| @@ -93,7 +94,7 @@ | ||||
|                 static_cast<void>(expr); \ | ||||
|                 __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \ | ||||
|             } \ | ||||
|             catch( exceptionType ) { \ | ||||
|             catch( Catch::add_const<Catch::add_lvalue_reference<exceptionType>::type>::type ) { \ | ||||
|                 __catchResult.captureResult( Catch::ResultWas::Ok ); \ | ||||
|             } \ | ||||
|             catch( ... ) { \ | ||||
|   | ||||
							
								
								
									
										47
									
								
								include/internal/catch_type_traits.hpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										47
									
								
								include/internal/catch_type_traits.hpp
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,47 @@ | ||||
| /* | ||||
|  *  Created by Martin on 08/02/2017. | ||||
|  * | ||||
|  *  Distributed under the Boost Software License, Version 1.0. (See accompanying | ||||
|  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||||
|  */ | ||||
| #ifndef TWOBLUECUBES_CATCH_TYPE_TRAITS_HPP_INCLUDED | ||||
| #define TWOBLUECUBES_CATCH_TYPE_TRAITS_HPP_INCLUDED | ||||
|  | ||||
| #if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) | ||||
| #include <type_traits> | ||||
| #endif | ||||
|  | ||||
|  | ||||
| namespace Catch { | ||||
|  | ||||
| #if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) | ||||
|  | ||||
|      template <typename T> | ||||
|      using add_lvalue_reference = std::add_lvalue_reference<T>; | ||||
|  | ||||
|      template <typename T> | ||||
|      using add_const = std::add_const<T>; | ||||
|  | ||||
| #else | ||||
|  | ||||
|     template <typename T> | ||||
|     struct add_const {  | ||||
|         typedef const T type; | ||||
|     }; | ||||
|  | ||||
|     template <typename T> | ||||
|     struct add_lvalue_reference { | ||||
|         typedef T& type; | ||||
|     }; | ||||
|     template <typename T> | ||||
|     struct add_lvalue_reference<T&> { | ||||
|         typedef T& type; | ||||
|     }; | ||||
|     // No && overload, because that is C++11, in which case we have | ||||
|     // proper type_traits implementation from the standard library | ||||
|  | ||||
| #endif | ||||
|  | ||||
| } | ||||
|  | ||||
| #endif // TWOBLUECUBES_CATCH_TYPE_TRAITS_HPP_INCLUDED | ||||
		Reference in New Issue
	
	Block a user
	 Martin Hořeňovský
					Martin Hořeňovský