diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-04-12 18:24:59 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-04-12 18:24:59 +0000 |
| commit | fc99b1ad515ccfc92ee92001c409f69385033af5 (patch) | |
| tree | c8732acb1a441408870c5e816a3afd01ae1f2e62 /include/gtest/gtest-param-test.h | |
| parent | e9adbcbb56a205dee270842f7d6221c52d508476 (diff) | |
| download | googletest-fc99b1ad515ccfc92ee92001c409f69385033af5.tar.gz googletest-fc99b1ad515ccfc92ee92001c409f69385033af5.tar.bz2 googletest-fc99b1ad515ccfc92ee92001c409f69385033af5.zip | |
Avoids iterator_traits, as it's not available in libCStd when compiled with Sun C++.
Diffstat (limited to 'include/gtest/gtest-param-test.h')
| -rw-r--r-- | include/gtest/gtest-param-test.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/gtest/gtest-param-test.h b/include/gtest/gtest-param-test.h index 62c7c00e..6407cfd6 100644 --- a/include/gtest/gtest-param-test.h +++ b/include/gtest/gtest-param-test.h @@ -306,11 +306,10 @@ internal::ParamGenerator<T> Range(T start, T end) { // template <typename ForwardIterator> internal::ParamGenerator< - typename ::std::iterator_traits<ForwardIterator>::value_type> ValuesIn( - ForwardIterator begin, - ForwardIterator end) { - typedef typename ::std::iterator_traits<ForwardIterator>::value_type - ParamType; + typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type> +ValuesIn(ForwardIterator begin, ForwardIterator end) { + typedef typename ::testing::internal::IteratorTraits<ForwardIterator> + ::value_type ParamType; return internal::ParamGenerator<ParamType>( new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end)); } |