diff options
author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-18 16:35:15 (GMT) |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-18 16:35:15 (GMT) |
commit | 9f894c2b36e83e9414b3369f9a4974644d843d8d (patch) | |
tree | 560b2cb3cf39be738fc81b3487caf997a3dbe840 /include/gtest/internal/gtest-param-util-generated.h.pump | |
parent | f43e4ff3ad12ace9d423cc3ce02feadb8f24fe67 (diff) | |
download | googletest-9f894c2b36e83e9414b3369f9a4974644d843d8d.zip googletest-9f894c2b36e83e9414b3369f9a4974644d843d8d.tar.gz googletest-9f894c2b36e83e9414b3369f9a4974644d843d8d.tar.bz2 |
Makes gtest compile cleanly with MSVC's warning 4511 & 4512 (copy ctor /
assignment operator cannot be generated) enabled.
Diffstat (limited to 'include/gtest/internal/gtest-param-util-generated.h.pump')
-rw-r--r-- | include/gtest/internal/gtest-param-util-generated.h.pump | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/include/gtest/internal/gtest-param-util-generated.h.pump b/include/gtest/internal/gtest-param-util-generated.h.pump index 54b2dc1..2da2872 100644 --- a/include/gtest/internal/gtest-param-util-generated.h.pump +++ b/include/gtest/internal/gtest-param-util-generated.h.pump @@ -64,6 +64,9 @@ class ValueArray1 { operator ParamGenerator<T>() const { return ValuesIn(&v1_, &v1_ + 1); } private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray1& other); + const T1 v1_; }; @@ -83,6 +86,9 @@ class ValueArray$i { } private: + // No implementation - assignment is unsupported. + void operator=(const ValueArray$i& other); + $for j [[ const T$j v$(j)_; @@ -201,6 +207,9 @@ $for j || [[ ]]; } + // No implementation - assignment is unsupported. + void operator=(const Iterator& other); + const ParamGeneratorInterface<ParamType>* const base_; // begin[i]_ and end[i]_ define the i-th range that Iterator traverses. // current[i]_ is the actual traversing iterator. @@ -212,14 +221,17 @@ $for j [[ ]] ParamType current_value_; - }; + }; // class CartesianProductGenerator$i::Iterator + + // No implementation - assignment is unsupported. + void operator=(const CartesianProductGenerator$i& other); $for j [[ const ParamGenerator<T$j> g$(j)_; ]] -}; +}; // class CartesianProductGenerator$i ]] @@ -250,12 +262,15 @@ $for j,[[ } private: + // No implementation - assignment is unsupported. + void operator=(const CartesianProductHolder$i& other); + $for j [[ const Generator$j g$(j)_; ]] -}; +}; // class CartesianProductHolder$i ]] |