diff --git a/include/external/clara.h b/include/external/clara.h index 2c03f985..bdf03321 100644 --- a/include/external/clara.h +++ b/include/external/clara.h @@ -373,8 +373,13 @@ namespace Clara { } virtual void setFlag( C& obj ) const { typename RemoveConstRef::type value; - convertInto( true, value ); - function( obj, value ); + try { + convertInto(true, value); + } + catch (std::runtime_error&) { + return; + } + function(obj, value); } virtual bool takesArg() const { return !IsBool::value; } virtual IArgFunction* clone() const { return new BoundBinaryFunction( *this ); } diff --git a/single_include/catch.hpp b/single_include/catch.hpp index d8147e9a..ad290156 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* * 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 * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -3673,8 +3673,13 @@ namespace Clara { } virtual void setFlag( C& obj ) const { typename RemoveConstRef::type value; - convertInto( true, value ); - function( obj, value ); + try { + convertInto(true, value); + } + catch (std::runtime_error&) { + return; + } + function(obj, value); } virtual bool takesArg() const { return !IsBool::value; } virtual IArgFunction* clone() const { return new BoundBinaryFunction( *this ); }