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 | 6624187c3141f7ca403056062c440582630cd909 (patch) | |
| tree | c8732acb1a441408870c5e816a3afd01ae1f2e62 /include/gtest/gtest-param-test.h.pump | |
| parent | 73a5620e851e1e1978d68f59456b85b6d81d5f33 (diff) | |
| download | googletest-6624187c3141f7ca403056062c440582630cd909.tar.gz | |
Avoids iterator_traits, as it's not available in libCStd when compiled with Sun C++.
git-svn-id: http://googletest.googlecode.com/svn/trunk@568 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include/gtest/gtest-param-test.h.pump')
| -rw-r--r-- | include/gtest/gtest-param-test.h.pump | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/gtest/gtest-param-test.h.pump b/include/gtest/gtest-param-test.h.pump index 877126b..401cb51 100644 --- a/include/gtest/gtest-param-test.h.pump +++ b/include/gtest/gtest-param-test.h.pump @@ -305,11 +305,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)); } |