diff options
| author | Dominic Hamon <dominichamon@users.noreply.github.com> | 2015-11-30 09:50:29 -0800 |
|---|---|---|
| committer | Dominic Hamon <dominichamon@users.noreply.github.com> | 2015-11-30 09:50:29 -0800 |
| commit | 0a1f4849a6a6d704036f1189f62ffd7c8f061b06 (patch) | |
| tree | 47f2bf7cbc12bab91fb78ba0b8c9cb9398ac00b1 | |
| parent | 475fc830195d629ae4d136060e60eff498975196 (diff) | |
| parent | d2917bcdeddff6da6cab8a85c77df8ed45060aef (diff) | |
| download | google-benchmark-0a1f4849a6a6d704036f1189f62ffd7c8f061b06.tar.gz | |
Merge pull request #166 from disconnect3d/master
Fixes #165: CustomArguments ret type in README
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | README.md | 6 |
3 files changed, 4 insertions, 4 deletions
@@ -27,3 +27,4 @@ Shuo Chen <chenshuo@chenshuo.com> Yusuke Suzuki <utatane.tea@gmail.com> Dirac Research Zbigniew Skowron <zbychs@gmail.com> +Dominik Czarnota <dominik.b.czarnota@gmail.com> diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 077e55e..ed55bcf 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -43,3 +43,4 @@ Shuo Chen <chenshuo@chenshuo.com> Yusuke Suzuki <utatane.tea@gmail.com> Tobias Ulvgård <tobias.ulvgard@dirac.se> Zbigniew Skowron <zbychs@gmail.com> +Dominik Czarnota <dominik.b.czarnota@gmail.com> @@ -104,12 +104,10 @@ The following example enumerates a dense range on one parameter, and a sparse range on the second. ```c++ -static benchmark::internal::Benchmark* CustomArguments( - benchmark::internal::Benchmark* b) { +static void CustomArguments(benchmark::internal::Benchmark* b) { for (int i = 0; i <= 10; ++i) for (int j = 32; j <= 1024*1024; j *= 8) - b = b->ArgPair(i, j); - return b; + b->ArgPair(i, j); } BENCHMARK(BM_SetInsert)->Apply(CustomArguments); ``` |