diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-03 12:51:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 12:51:09 -0500 |
| commit | a9fa67cbe49578fe7b2dd01a92fc9b7d045b4830 (patch) | |
| tree | 0e22a70a7bdfc3cfabfb0a942ce0ae14a9814fb2 | |
| parent | ec2b0c391261497048940c2fa4b19dcddf66b9ea (diff) | |
| parent | 1414d71af0c0f5a37df8d02972d304828bb6800e (diff) | |
| download | googletest-a9fa67cbe49578fe7b2dd01a92fc9b7d045b4830.tar.gz googletest-a9fa67cbe49578fe7b2dd01a92fc9b7d045b4830.tar.bz2 googletest-a9fa67cbe49578fe7b2dd01a92fc9b7d045b4830.zip | |
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
| -rw-r--r-- | googletest/include/gtest/gtest.h | 4 | ||||
| -rw-r--r-- | googletest/samples/prime_tables.h | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index a19625f3..2ad5a0cb 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -259,7 +259,9 @@ class GTEST_API_ AssertionResult { // Used in EXPECT_TRUE/FALSE(assertion_result). AssertionResult(const AssertionResult& other); +#if defined(_MSC_VER) && _MSC_VER < 1910 GTEST_DISABLE_MSC_WARNINGS_PUSH_(4800 /* forcing value to bool */) +#endif // Used in the EXPECT_TRUE/FALSE(bool_expression). // @@ -276,7 +278,9 @@ class GTEST_API_ AssertionResult { /*enabler*/ = NULL) : success_(success) {} +#if defined(_MSC_VER) && _MSC_VER < 1910 GTEST_DISABLE_MSC_WARNINGS_POP_() +#endif // Assignment operator. AssertionResult& operator=(AssertionResult other) { diff --git a/googletest/samples/prime_tables.h b/googletest/samples/prime_tables.h index 92ce16a0..55a3b44e 100644 --- a/googletest/samples/prime_tables.h +++ b/googletest/samples/prime_tables.h @@ -103,11 +103,15 @@ class PreCalculatedPrimeTable : public PrimeTable { ::std::fill(is_prime_, is_prime_ + is_prime_size_, true); is_prime_[0] = is_prime_[1] = false; - for (int i = 2; i <= max; i++) { + // Checks every candidate for prime number (we know that 2 is the only even + // prime). + for (int i = 2; i*i <= max; i += i%2+1) { if (!is_prime_[i]) continue; // Marks all multiples of i (except i itself) as non-prime. - for (int j = 2*i; j <= max; j += i) { + // We are starting here from i-th multiplier, because all smaller + // complex numbers were already marked. + for (int j = i*i; j <= max; j += i) { is_prime_[j] = false; } } |