From 9e38d77f65eb35111701670608d8da223645e7e7 Mon Sep 17 00:00:00 2001 From: kosak Date: Sun, 19 Jul 2015 22:21:58 +0000 Subject: Allow the single-arg Values() overload to to conversions, just like every other overload. --- include/gtest/internal/gtest-param-util-generated.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/gtest/internal/gtest-param-util-generated.h') diff --git a/include/gtest/internal/gtest-param-util-generated.h b/include/gtest/internal/gtest-param-util-generated.h index 6dbaf4b7..4d1d81d2 100644 --- a/include/gtest/internal/gtest-param-util-generated.h +++ b/include/gtest/internal/gtest-param-util-generated.h @@ -79,7 +79,10 @@ class ValueArray1 { explicit ValueArray1(T1 v1) : v1_(v1) {} template - operator ParamGenerator() const { return ValuesIn(&v1_, &v1_ + 1); } + operator ParamGenerator() const { + const T array[] = {static_cast(v1_)}; + return ValuesIn(array); + } private: // No implementation - assignment is unsupported. -- cgit v1.2.3