mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 21:36:11 +01:00
parent
c99a346490
commit
093b72416d
@ -354,7 +354,7 @@ namespace Generators {
|
|||||||
template<typename L>
|
template<typename L>
|
||||||
// Note: The type after -> is weird, because VS2015 cannot parse
|
// Note: The type after -> is weird, because VS2015 cannot parse
|
||||||
// the expression used in the typedef inside, when it is in
|
// the expression used in the typedef inside, when it is in
|
||||||
// return type. Yeah, ¯\_(ツ)_/¯
|
// return type. Yeah.
|
||||||
auto generate( SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
|
auto generate( SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
|
||||||
using UnderlyingType = typename decltype(generatorExpression())::type;
|
using UnderlyingType = typename decltype(generatorExpression())::type;
|
||||||
|
|
||||||
|
@ -245,7 +245,7 @@ public:
|
|||||||
case Unit::Nanoseconds:
|
case Unit::Nanoseconds:
|
||||||
return "ns";
|
return "ns";
|
||||||
case Unit::Microseconds:
|
case Unit::Microseconds:
|
||||||
return "µs";
|
return "us";
|
||||||
case Unit::Milliseconds:
|
case Unit::Milliseconds:
|
||||||
return "ms";
|
return "ms";
|
||||||
case Unit::Seconds:
|
case Unit::Seconds:
|
||||||
|
Loading…
Reference in New Issue
Block a user