diff --git a/AUTHORS b/AUTHORS index 5a39872f..7d689350 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,6 +13,7 @@ Alex Steele Andriy Berestovskyy Arne Beer Carto +Cezary Skrzyński Christian Wassermann Christopher Seymour Colin Braley diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 35a4cc66..4208e0cf 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -29,6 +29,7 @@ Andriy Berestovskyy Arne Beer Bátor Tallér Billy Robert O'Neal III +Cezary Skrzyński Chris Kennelly Christian Wassermann Christopher Seymour diff --git a/src/benchmark.cc b/src/benchmark.cc index 88167f69..60354914 100644 --- a/src/benchmark.cc +++ b/src/benchmark.cc @@ -177,6 +177,10 @@ State::State(IterationCount max_iters, const std::vector& ranges, #elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Winvalid-offsetof" +#endif +#if defined(__CUDACC__) +#pragma nv_diagnostic push +#pragma nv_diag_suppress 1427 #endif // Offset tests to ensure commonly accessed data is on the first cache line. const int cache_line_size = 64; @@ -188,6 +192,9 @@ State::State(IterationCount max_iters, const std::vector& ranges, #elif defined(__GNUC__) #pragma GCC diagnostic pop #endif +#if defined(__CUDACC__) +#pragma nv_diagnostic pop +#endif } void State::PauseTiming() {