diff options
| author | Dominic Hamon <dominichamon@users.noreply.github.com> | 2017-11-07 10:33:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-07 10:33:07 -0800 |
| commit | 90aa8665b5080f7a931567fbc92cda883bc870b4 (patch) | |
| tree | ce2f5925d7632f425a41f6de8ac680e02515b233 /include/benchmark | |
| parent | f4009ef8e3c3b29e3fb3b8846b42f58e0e23a5a2 (diff) | |
| download | google-benchmark-90aa8665b5080f7a931567fbc92cda883bc870b4.tar.gz | |
Reorder inline to avoid warning on MSVC (#469)
Fixes #467
Diffstat (limited to 'include/benchmark')
| -rw-r--r-- | include/benchmark/benchmark.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/benchmark/benchmark.h b/include/benchmark/benchmark.h index f4e8762..16d2b90 100644 --- a/include/benchmark/benchmark.h +++ b/include/benchmark/benchmark.h @@ -642,10 +642,10 @@ struct State::StateIterator { State* const parent_; }; -BENCHMARK_ALWAYS_INLINE inline State::StateIterator State::begin() { +inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::begin() { return StateIterator(this); } -BENCHMARK_ALWAYS_INLINE inline State::StateIterator State::end() { +inline BENCHMARK_ALWAYS_INLINE State::StateIterator State::end() { StartKeepRunning(); return StateIterator(); } |