diff options
| author | Dominic Hamon <dominichamon@users.noreply.github.com> | 2015-09-30 10:23:57 -0700 |
|---|---|---|
| committer | Dominic Hamon <dominichamon@users.noreply.github.com> | 2015-09-30 10:23:57 -0700 |
| commit | 7583ed936306a96e5385c4cdcb307946be24c2bb (patch) | |
| tree | 5f84625dbe304252e28be1c5c99445f1d816f445 /include/benchmark | |
| parent | fcf8860e6acea05cdb1c503ebbbb479424cbde8a (diff) | |
| parent | 11042c7fe7ae4b6c4e5653db2639d6551fee9b7d (diff) | |
| download | google-benchmark-7583ed936306a96e5385c4cdcb307946be24c2bb.tar.gz | |
Merge pull request #137 from jll63/jleroy/vs2013-compatibility
Jleroy/vs2013 compatibility
Diffstat (limited to 'include/benchmark')
| -rw-r--r-- | include/benchmark/macros.h | 4 | ||||
| -rw-r--r-- | include/benchmark/reporter.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/benchmark/macros.h b/include/benchmark/macros.h index 5e75ed3..3e9540e 100644 --- a/include/benchmark/macros.h +++ b/include/benchmark/macros.h @@ -27,12 +27,16 @@ #if defined(__GNUC__) # define BENCHMARK_UNUSED __attribute__((unused)) # define BENCHMARK_ALWAYS_INLINE __attribute__((always_inline)) +# define BENCHMARK_NOEXCEPT noexcept #elif defined(_MSC_VER) && !defined(__clang__) # define BENCHMARK_UNUSED # define BENCHMARK_ALWAYS_INLINE __forceinline +# define BENCHMARK_NOEXCEPT +# define __func__ __FUNCTION__ #else # define BENCHMARK_UNUSED # define BENCHMARK_ALWAYS_INLINE +# define BENCHMARK_NOEXCEPT #endif #if defined(__GNUC__) diff --git a/include/benchmark/reporter.h b/include/benchmark/reporter.h index bb4ccdf..d23ab65 100644 --- a/include/benchmark/reporter.h +++ b/include/benchmark/reporter.h @@ -49,7 +49,7 @@ class BenchmarkReporter { std::string benchmark_name; std::string report_label; // Empty if not set by benchmark. - size_t iterations; + int64_t iterations; double real_accumulated_time; double cpu_accumulated_time; |