Commit Graph

900 Commits

Author SHA1 Message Date
Dominic Hamon 7583ed9363 Merge pull request #137 from jll63/jleroy/vs2013-compatibility
Jleroy/vs2013 compatibility
2015-09-30 10:23:57 -07:00
Jean-Louis Leroy 11042c7fe7 Remove unused FormatKV(..., size_t) overload. 2015-09-25 09:37:03 -04:00
Dominic Hamon fcf8860e6a Merge pull request #140 from eliben/fix-custom-arguments-return
Fix documentation comment in benchmark_api.h w.r.t CustomArguments
2015-09-23 13:12:20 -07:00
Eli Bendersky 1dd40c99c0 Custom arguments function usage with Apply - fix doc and add test. 2015-09-23 12:47:54 -07:00
Dominic Hamon 6319252533 Merge pull request #139 from eliben/master
Fix doc sample typos in header and README
2015-09-18 08:23:25 -07:00
Eli Bendersky f338ce7965 Fix doc sample typos in header and README
* iterations() is a method
* int64_t fix in a couple of places
2015-09-17 20:14:10 -07:00
Jean-Louis Leroy 0f5503e9a2 Address Dominic's (stylistic) remarks. 2015-09-08 15:37:07 -04:00
Eric Fiselier a69f566e0a Remove std::is_trivially_destructible assertion because the trait may not be provided by the STL. 2015-09-07 19:33:23 -06:00
Jean-Louis Leroy 5ec78d7d44 Do not CpuScalingEnabled on Windows. 2015-09-03 15:11:12 -04:00
Jean-Louis Leroy cf830f731f Fix division in CPU usage calculation on Windows. 2015-09-03 15:11:11 -04:00
Jean-Louis Leroy 2cf277b6f6 Iterations declared as size_t but printf'ed as a long long. Make it a long long. 2015-09-03 15:11:10 -04:00
Jean-Louis Leroy d49516bc99 Make it compile with Visual Studio 2013. 2015-09-03 15:11:09 -04:00
Jean-Louis Leroy 693967fe19 Remove unnecessary `typename'. 2015-09-03 15:11:08 -04:00
Dominic Hamon 47c304536e Fix #133. Comment now contains compilable code. 2015-08-07 11:21:47 -07:00
Dominic Hamon fdd99b12a8 trailing whitespace 2015-06-18 10:34:03 -07:00
Eric 3e1dbc81f4 Merge pull request #130 from umireon/sysinfo-macosx-illegal-nullptr
Fix the compilation error against G++ on Mac OS X.
2015-06-16 10:31:45 -04:00
Kaito Udagawa f72d24942a Add Kaito Udagawa to AUTHORS and CONTRIBUTORS 2015-06-16 22:45:57 +09:00
Kaito Udagawa 72ce39de3e Fix the compilation error against G++ on Mac OS X.
Using `0` as a null pointer is illegal when `-Wzero-as-null-pointer-constant`
is given to G++.  To avoid the warning `zero-as-null-pointer-constant`,
`nullptr` (C++11 keyword) instead of `0` is used in the `sysctl` invocation.
2015-06-13 19:34:20 +09:00
Dominic Hamon d60945ac43 Merge pull request #128 from myd7349/master
Fix issue #127
2015-06-08 09:23:04 -07:00
myd7349 9afa6c986c Fix issue #127 2015-06-05 09:25:11 +08:00
Dominic Hamon f6c2ea7fef Merge pull request #125 from dcoeurjo/cmakeEmptybuildtype
Fixing cmake issue with empty cmake_build_type
2015-05-22 14:46:11 -07:00
David Coeurjolly 68e69213e7 Fixing cmake issue with empty cmake_build_type 2015-05-22 23:15:19 +02:00
Dominic Hamon d18ebcb99a Merge pull request #122 from mattyclarkson/coverage
Coverage
2015-05-13 09:40:03 -07:00
Matt Clarkson ef47992125 Added coveralls support 2015-05-13 09:17:48 +01:00
Matt Clarkson 344775db63 Enable strict aliasing warnings 2015-05-13 09:17:48 +01:00
Matt Clarkson 36c1eb6975 Coverage support with LCOV and GCOV
This patch adds a `coverage` target that allows coverage statisitics to be
retrieved for the project. It requires that lcov and gcov is installed and
that the generator is unix makefiles but this can be improved upon in
future releases.

To make it work use the coverage build type:

```
cmake -DCMAKE_BUILD_TYPE=Coverage .
make coverage
```
2015-05-13 09:17:38 +01:00
Dominic Hamon d8c7605341 Update README.md 2015-05-12 11:32:44 -07:00
Matt Clarkson 3314aa43c2 Allow the user to set the C++ standard to use
This is useful to test the library at different standard levels. Currently
doesn't search for C++14 in 'auto' mode. Can enable in the future
2015-05-12 17:15:41 +01:00
Matt Clarkson 8b5016034f Ignore tests 2015-05-12 17:15:41 +01:00
Matt Clarkson e44ee2d005 Group common C++ flags 2015-05-12 17:15:41 +01:00
Matt Clarkson bb23a9b9f2 Compile with link time optimisation
Can provide speed improvements
2015-05-12 17:15:38 +01:00
Dominic Hamon 375e66c825 Update README.md 2015-05-11 12:34:03 -07:00
Matt Clarkson 7418bbbbac Only warn on errors in release mode
This improves development iterations when working in debug mode as you
don't have to fix up warnings to get the code to compile. Once a feature
is complete you can then run a release build and fix up all the warnings.
2015-05-05 12:11:43 +01:00
Matt Clarkson fc883f6742 Improve the CMake C++ flag checker
This checks the flag on the compiler AND linker which allows it to work
with flags such as -flto and -fsanitize=address
2015-05-01 11:09:56 +01:00
Eric d51ba32791 Merge pull request #120 from google/benchmark-fixtures
Add ability to use benchmark fixtures
2015-04-06 19:38:16 -04:00
Eric Fiselier 9c25a67c1a address more review comments 2015-04-06 19:04:12 -04:00
Eric Fiselier 9ed538f511 address review comments 2015-04-06 17:56:05 -04:00
Eric Fiselier 12f4405870 add ability to use benchmark filters 2015-04-06 17:00:06 -04:00
Dominic Hamon 2b954213f9 Merge branch 'geoffromer-cmake-patch' 2015-04-03 13:35:00 -07:00
Dominic Hamon 1e0ed3a21c Rearrange the pieces 2015-04-03 13:33:54 -07:00
Geoff Romer dcb1a3dad4 Drop down to CMake 2.8.11, and drop INTERFACE since that version doesn't
support it.
2015-04-03 13:30:59 -07:00
Geoff Romer 3078ce9bc5 Link pthread as an INTERFACE library. 2015-04-03 13:30:59 -07:00
Geoff Romer 89a1edae15 Require cmake 2.8.12 in order to support target_include_directories, and
simplify thread linking logic.
2015-04-03 13:30:59 -07:00
Geoff Romer a6ad799a4d Configure 'benchmark' cmake target so that when other targets depend on it,
they get the appropriate include directories and link libraries automatically.
2015-04-03 13:30:59 -07:00
Dominic Hamon 42d2b8d11a Merge pull request #118 from davidreynolds/master
Fix typos: rangeY -> range_y()
2015-04-03 16:29:12 -04:00
Eric Fiselier 818c9fcc2f Upgrade travis to use CMake 2.8.12 and add Clang builders 2015-04-03 14:43:42 -04:00
David Reynolds 30ae37b923 Fix typos: rangeY -> range_y() 2015-04-02 18:34:52 -07:00
Eric Fiselier bf063941d4 Print information about travis enviroment 2015-04-02 13:32:18 -04:00
Eric bf58a90067 Merge pull request #115 from google/build-shared
Remove BENCHMARK_ENABLE_SHARED and prefer BUILD_SHARED_LIBS
2015-04-01 13:45:12 -04:00
Eric Fiselier 8fcfa81d51 Fix comment about linking threading 2015-04-01 11:40:22 -04:00