diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-06-30 11:04:37 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-30 16:54:24 +0000 |
| commit | 9f183505acc94a587e71b485761f47781d6f5030 (patch) | |
| tree | c2b521334deb9e8a1a7adf03fae6e0c9aff2f7e6 /tests | |
| parent | 80fa7cea93974b0480f35f7a5260ce78ba50420f (diff) | |
clean up GCC 6.3 workaround
This is all kind of silly... this is just a little bit of code that's
not really reachable, but there to satisfy compilers that can't figure
that out.
Change-Id: Ib39e8bf0fd26e28541cfad37c7ea135a30dbe85a
Reviewed-on: https://skia-review.googlesource.com/21365
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/RecordTestUtils.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/RecordTestUtils.h b/tests/RecordTestUtils.h index 5701dec5d9..853ee21908 100644 --- a/tests/RecordTestUtils.h +++ b/tests/RecordTestUtils.h @@ -33,20 +33,9 @@ static const T* assert_type(skiatest::Reporter* r, const SkRecord& record, int i record.visit(index, reader); REPORTER_ASSERT(r, T::kType == reader.type); REPORTER_ASSERT(r, SkToBool(reader.ptr)); - - // This appears to be a bug in GCC 6.3. There's no problem here. -#if defined(__GNUC__) && !defined(__clang__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wreturn-local-addr" -#endif return reader.ptr; -#if defined(__GNUC__) && !defined(__clang__) - #pragma GCC diagnostic pop -#endif } - - template <typename DrawT> struct MatchType { template <typename T> int operator()(const T&) { return 0; } int operator()(const DrawT&) { return 1; } |