summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkosak <kosak@google.com>2015-07-28 00:15:20 (GMT)
committerkosak <kosak@google.com>2015-07-28 00:15:20 (GMT)
commit0b10cfd582591d8eddd22f3b0500edd8bf9c2d6d (patch)
treee0cf01af6b5123857ac17c88de85114cd207165a
parentf253efc20ec05216eda902a6fb0628c2f5164757 (diff)
downloadgoogletest-0b10cfd582591d8eddd22f3b0500edd8bf9c2d6d.zip
googletest-0b10cfd582591d8eddd22f3b0500edd8bf9c2d6d.tar.gz
googletest-0b10cfd582591d8eddd22f3b0500edd8bf9c2d6d.tar.bz2
Prevent MSVC from issuing warnings about possible value truncations.
-rw-r--r--include/gtest/internal/gtest-param-util.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/gtest/internal/gtest-param-util.h b/include/gtest/internal/gtest-param-util.h
index 5ffeaa4..82cab9b 100644
--- a/include/gtest/internal/gtest-param-util.h
+++ b/include/gtest/internal/gtest-param-util.h
@@ -230,7 +230,7 @@ class RangeGenerator : public ParamGeneratorInterface<T> {
return base_;
}
virtual void Advance() {
- value_ = value_ + step_;
+ value_ = static_cast<T>(value_ + step_);
index_++;
}
virtual ParamIteratorInterface<T>* Clone() const {
@@ -267,7 +267,7 @@ class RangeGenerator : public ParamGeneratorInterface<T> {
const T& end,
const IncrementT& step) {
int end_index = 0;
- for (T i = begin; i < end; i = i + step)
+ for (T i = begin; i < end; i = static_cast<T>(i + step))
end_index++;
return end_index;
}