aboutsummaryrefslogtreecommitdiffstats
path: root/include/gtest/internal/gtest-param-util.h
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-09-18 16:35:15 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-09-18 16:35:15 +0000
commit9f894c2b36e83e9414b3369f9a4974644d843d8d (patch)
tree560b2cb3cf39be738fc81b3487caf997a3dbe840 /include/gtest/internal/gtest-param-util.h
parentf43e4ff3ad12ace9d423cc3ce02feadb8f24fe67 (diff)
downloadgoogletest-9f894c2b36e83e9414b3369f9a4974644d843d8d.tar.gz
googletest-9f894c2b36e83e9414b3369f9a4974644d843d8d.tar.bz2
googletest-9f894c2b36e83e9414b3369f9a4974644d843d8d.zip
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.h')
-rw-r--r--include/gtest/internal/gtest-param-util.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/gtest/internal/gtest-param-util.h b/include/gtest/internal/gtest-param-util.h
index 34361ab1..dcc54947 100644
--- a/include/gtest/internal/gtest-param-util.h
+++ b/include/gtest/internal/gtest-param-util.h
@@ -248,6 +248,9 @@ class RangeGenerator : public ParamGeneratorInterface<T> {
: base_(other.base_), value_(other.value_), index_(other.index_),
step_(other.step_) {}
+ // No implementation - assignment is unsupported.
+ void operator=(const Iterator& other);
+
const ParamGeneratorInterface<T>* const base_;
T value_;
int index_;
@@ -263,6 +266,9 @@ class RangeGenerator : public ParamGeneratorInterface<T> {
return end_index;
}
+ // No implementation - assignment is unsupported.
+ void operator=(const RangeGenerator& other);
+
const T begin_;
const T end_;
const IncrementT step_;
@@ -349,7 +355,10 @@ class ValuesInIteratorRangeGenerator : public ParamGeneratorInterface<T> {
// Use of scoped_ptr helps manage cached value's lifetime,
// which is bound by the lifespan of the iterator itself.
mutable scoped_ptr<const T> value_;
- };
+ }; // class ValuesInIteratorRangeGenerator::Iterator
+
+ // No implementation - assignment is unsupported.
+ void operator=(const ValuesInIteratorRangeGenerator& other);
const ContainerType container_;
}; // class ValuesInIteratorRangeGenerator