mirror of https://github.com/catchorg/Catch2.git
Fix unreachable code warning from MSVC
When building Catch-based projects with aggressive MSVC warning levels (eg, with /Wall /W4 /WX flags), then Catch can give a warning here.
This commit is contained in:
parent
f4ba8aaf19
commit
922121a2d2
|
@ -373,7 +373,12 @@ namespace Clara {
|
||||||
}
|
}
|
||||||
virtual void setFlag( C& obj ) const {
|
virtual void setFlag( C& obj ) const {
|
||||||
typename RemoveConstRef<T>::type value;
|
typename RemoveConstRef<T>::type value;
|
||||||
|
try {
|
||||||
convertInto(true, value);
|
convertInto(true, value);
|
||||||
|
}
|
||||||
|
catch (std::runtime_error&) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
function(obj, value);
|
function(obj, value);
|
||||||
}
|
}
|
||||||
virtual bool takesArg() const { return !IsBool<T>::value; }
|
virtual bool takesArg() const { return !IsBool<T>::value; }
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Catch v2.0.0-develop.2
|
* Catch v2.0.0-develop.2
|
||||||
* Generated: 2015-12-15 07:54:24.857561
|
* Generated: 2016-03-29 15:50:47.051000
|
||||||
* ----------------------------------------------------------
|
* ----------------------------------------------------------
|
||||||
* This file has been merged from multiple headers. Please don't edit it directly
|
* This file has been merged from multiple headers. Please don't edit it directly
|
||||||
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
|
||||||
|
@ -3673,7 +3673,12 @@ namespace Clara {
|
||||||
}
|
}
|
||||||
virtual void setFlag( C& obj ) const {
|
virtual void setFlag( C& obj ) const {
|
||||||
typename RemoveConstRef<T>::type value;
|
typename RemoveConstRef<T>::type value;
|
||||||
|
try {
|
||||||
convertInto(true, value);
|
convertInto(true, value);
|
||||||
|
}
|
||||||
|
catch (std::runtime_error&) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
function(obj, value);
|
function(obj, value);
|
||||||
}
|
}
|
||||||
virtual bool takesArg() const { return !IsBool<T>::value; }
|
virtual bool takesArg() const { return !IsBool<T>::value; }
|
||||||
|
|
Loading…
Reference in New Issue