Permalink
Browse files

Bring in Clara v1.1.4

This fixes #1214
  • Loading branch information...
horenmar committed Mar 9, 2018
1 parent dc3e7f9 commit 11c89a5f7de008c2a21c9cd2a6b96d94f9a55cef
Showing with 8 additions and 6 deletions.
  1. +4 −3 include/external/clara.hpp
  2. +4 −3 third_party/clara.hpp
@@ -5,7 +5,7 @@
//
// See https://github.com/philsquared/Clara for more details
// Clara v1.1.3
// Clara v1.1.4
#ifndef CATCH_CLARA_HPP_INCLUDED
#define CATCH_CLARA_HPP_INCLUDED
@@ -21,6 +21,7 @@
#ifndef CLARA_CONFIG_OPTIONAL_TYPE
#ifdef __has_include
#if __has_include(<optional>) && __cplusplus >= 201703L
#include <optional>
#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
#endif
#endif
@@ -665,11 +666,11 @@ namespace detail {
}
#ifdef CLARA_CONFIG_OPTIONAL_TYPE
template<typename T>
inline auto convertInto( std::string const &source, std::optional<T>& target ) -> ParserResult {
inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
T temp;
auto result = convertInto( source, temp );
if( result )
target = temp;
target = std::move(temp);
return result;
}
#endif // CLARA_CONFIG_OPTIONAL_TYPE
View
@@ -5,7 +5,7 @@
//
// See https://github.com/philsquared/Clara for more details
// Clara v1.1.3
// Clara v1.1.4
#ifndef CLARA_HPP_INCLUDED
#define CLARA_HPP_INCLUDED
@@ -21,6 +21,7 @@
#ifndef CLARA_CONFIG_OPTIONAL_TYPE
#ifdef __has_include
#if __has_include(<optional>) && __cplusplus >= 201703L
#include <optional>
#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
#endif
#endif
@@ -665,11 +666,11 @@ namespace detail {
}
#ifdef CLARA_CONFIG_OPTIONAL_TYPE
template<typename T>
inline auto convertInto( std::string const &source, std::optional<T>& target ) -> ParserResult {
inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
T temp;
auto result = convertInto( source, temp );
if( result )
target = temp;
target = std::move(temp);
return result;
}
#endif // CLARA_CONFIG_OPTIONAL_TYPE

0 comments on commit 11c89a5

Please sign in to comment.