summaryrefslogtreecommitdiffstats
path: root/include/gtest/internal/gtest-param-util-generated.h.pump
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-09-26 17:52:19 (GMT)
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2011-09-26 17:52:19 (GMT)
commit1b2e50995887d7128f486eeb0544345296215d30 (patch)
tree33ab2f3b63737377a15516d8d59a48df8e46abc1 /include/gtest/internal/gtest-param-util-generated.h.pump
parent2ca4d2150048856cc84067163594932064b92267 (diff)
downloadgoogletest-1b2e50995887d7128f486eeb0544345296215d30.zip
googletest-1b2e50995887d7128f486eeb0544345296215d30.tar.gz
googletest-1b2e50995887d7128f486eeb0544345296215d30.tar.bz2
Fixes C++0x compatibility problems.
Diffstat (limited to 'include/gtest/internal/gtest-param-util-generated.h.pump')
-rw-r--r--include/gtest/internal/gtest-param-util-generated.h.pump2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gtest/internal/gtest-param-util-generated.h.pump b/include/gtest/internal/gtest-param-util-generated.h.pump
index dbe9386..009206f 100644
--- a/include/gtest/internal/gtest-param-util-generated.h.pump
+++ b/include/gtest/internal/gtest-param-util-generated.h.pump
@@ -98,7 +98,7 @@ class ValueArray$i {
template <typename T>
operator ParamGenerator<T>() const {
- const T array[] = {$for j, [[v$(j)_]]};
+ const T array[] = {$for j, [[static_cast<T>(v$(j)_)]]};
return ValuesIn(array);
}