diff options
author | Jeff Davidson <jpd@google.com> | 2015-01-20 10:18:05 -0800 |
---|---|---|
committer | Jeff Davidson <jpd@google.com> | 2015-01-20 10:18:05 -0800 |
commit | 0ddac1f3791efefb2cffdb425f0c600feb7a47e6 (patch) | |
tree | efeab8fb69198186f1dabfe43d341c7b70c9c5f1 /gtest/include/gtest/internal/gtest-param-util-generated.h.pump | |
parent | 77a6b2f4cdd580d57630f079db1d908d7fd90a54 (diff) | |
download | external_protobuf-0ddac1f3791efefb2cffdb425f0c600feb7a47e6.zip external_protobuf-0ddac1f3791efefb2cffdb425f0c600feb7a47e6.tar.gz external_protobuf-0ddac1f3791efefb2cffdb425f0c600feb7a47e6.tar.bz2 |
Update protobuf's gtest to expected version.
Generated by running:
rm -rf gtest
./autogen.sh
./configure
Change-Id: I5d9c0bea09dd9d3e4d7d4442dd8222011f5c522a
Diffstat (limited to 'gtest/include/gtest/internal/gtest-param-util-generated.h.pump')
-rw-r--r-- | gtest/include/gtest/internal/gtest-param-util-generated.h.pump | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/gtest/include/gtest/internal/gtest-param-util-generated.h.pump b/gtest/include/gtest/internal/gtest-param-util-generated.h.pump index 2da2872..baedfbc 100644 --- a/gtest/include/gtest/internal/gtest-param-util-generated.h.pump +++ b/gtest/include/gtest/internal/gtest-param-util-generated.h.pump @@ -45,13 +45,30 @@ $var maxtuple = 10 $$ Maximum number of Combine arguments we want to support. #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_ +// scripts/fuse_gtest.py depends on gtest's own header being #included +// *unconditionally*. Therefore these #includes cannot be moved +// inside #if GTEST_HAS_PARAM_TEST. +#include <gtest/internal/gtest-param-util.h> #include <gtest/internal/gtest-port.h> #if GTEST_HAS_PARAM_TEST -#include <gtest/internal/gtest-param-util.h> - namespace testing { + +// Forward declarations of ValuesIn(), which is implemented in +// include/gtest/gtest-param-test.h. +template <typename ForwardIterator> +internal::ParamGenerator< + typename ::std::iterator_traits<ForwardIterator>::value_type> ValuesIn( + ForwardIterator begin, ForwardIterator end); + +template <typename T, size_t N> +internal::ParamGenerator<T> ValuesIn(const T (&array)[N]); + +template <class Container> +internal::ParamGenerator<typename Container::value_type> ValuesIn( + const Container& container); + namespace internal { // Used in the Values() function to provide polymorphic capabilities. |