diff options
| author | bryanzim <BryanZim@bazinnovations.com> | 2017-10-30 16:58:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 16:58:25 -0400 |
| commit | 530885cbd5b4bc92598050b59a3070eb7a404b4f (patch) | |
| tree | beeec4681decbb35c59160d5db48f4e6d020540f | |
| parent | 1ae4096b9c5de4429663e6b0c09bf00e5fb46b16 (diff) | |
| parent | d175c8bf823e709d570772b038757fadf63bc632 (diff) | |
| download | googletest-530885cbd5b4bc92598050b59a3070eb7a404b4f.tar.gz googletest-530885cbd5b4bc92598050b59a3070eb7a404b4f.tar.bz2 googletest-530885cbd5b4bc92598050b59a3070eb7a404b4f.zip | |
Merge branch 'master' into master
| -rw-r--r-- | appveyor.yml | 8 | ||||
| -rw-r--r-- | googletest/docs/FAQ.md | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml index f129d7c5..4e8d6f6e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,14 @@ os: Visual Studio 2015 environment: matrix: + - compiler: msvc-15-seh + generator: "Visual Studio 15 2017" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + + - compiler: msvc-15-seh + generator: "Visual Studio 15 2017 Win64" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - compiler: msvc-14-seh generator: "Visual Studio 14 2015" diff --git a/googletest/docs/FAQ.md b/googletest/docs/FAQ.md index c39b6254..1a216a1a 100644 --- a/googletest/docs/FAQ.md +++ b/googletest/docs/FAQ.md @@ -494,7 +494,7 @@ EXPECT_PRED1(IsPositive, 5); However, this will work: ``` cpp -EXPECT_PRED1(*static_cast<bool (*)(int)>*(IsPositive), 5); +EXPECT_PRED1(static_cast<bool (*)(int)>(IsPositive), 5); ``` (The stuff inside the angled brackets for the `static_cast` operator is the @@ -512,14 +512,14 @@ bool IsNegative(T x) { you can use it in a predicate assertion like this: ``` cpp -ASSERT_PRED1(IsNegative*<int>*, -5); +ASSERT_PRED1(IsNegative<int>, -5); ``` Things are more interesting if your template has more than one parameters. The following won't compile: ``` cpp -ASSERT_PRED2(*GreaterThan<int, int>*, 5, 0); +ASSERT_PRED2(GreaterThan<int, int>, 5, 0); ``` @@ -528,7 +528,7 @@ which is one more than expected. The workaround is to wrap the predicate function in parentheses: ``` cpp -ASSERT_PRED2(*(GreaterThan<int, int>)*, 5, 0); +ASSERT_PRED2((GreaterThan<int, int>), 5, 0); ``` |