Anton Danielsson
0d35f5f68a
Only include "sys/sysctl.h" if it is needed.
...
sys/sysctl.h is not available in the android-ndk.
2015-10-09 08:47:34 +02:00
Anton Danielsson
c1e03a4b58
Changed "std::vsnprintf" to "vsnprintf" to be able to build with the android-ndk.
2015-10-09 08:47:34 +02:00
Anton Danielsson
aecd746691
Added include of cstdlib needed for strtol, strtod and getenv.
2015-10-09 08:47:33 +02:00
Dominic Hamon
f7022075e0
Merge pull request #152 from mdavezac/master
...
Fixes compilation issue on Macs
2015-10-08 11:22:28 -07:00
Mayeul d'Avezac
da80193de9
Fixes compilation issue on Macs
...
ba141ac0d9
renamed OS_MACOSX -> BENCHMARK_OS_MACOSX,
except for an include guard in src/cycleclock.h
2015-10-08 18:35:06 +01:00
Dominic Hamon
e2327733e6
Merge pull request #150 from DiracResearch/visual-studio-warnings-fix
...
Visual studio warnings fix
2015-10-08 10:06:01 -07:00
Anton Danielsson
9195fd07d6
Revert "Added Wconversion so the gcc/clang warnings will be more similar to W4 on MSVC."
...
This reverts commit 0a2bd8935391e42f2581ec4826f7ac5f8fc9041a.
2015-10-08 10:48:44 +02:00
Anton Danielsson
5cced076d2
Fixed int to char warning.
2015-10-08 10:48:40 +02:00
Anton Danielsson
0a8e0dbb0b
Added Wconversion so the gcc/clang warnings will be more similar to W4 on MSVC.
...
This also points out some important issues like:
warning: conversion to 'size_t {aka unsigned int}' from 'long long int' may alter its value [-Wconversion]
state.SetBytesProcessed(items_processed * sizeof(v));
This occurs on 32 bit systems where size_t is only 32 bits.
2015-10-08 10:48:37 +02:00
Anton Danielsson
fcf4e99e01
Use IsWindowsXPOrGreater instead of the deprecated GetVersionEx.
2015-10-08 10:48:34 +02:00
Anton Danielsson
e605cb0802
Changed "while(true)" to "for(;;)" to avoid warning in visual studio.
2015-10-08 10:48:32 +02:00
Anton Danielsson
53b1896c53
Added _CRT_SECURE_NO_WARNINGS under MSVC.
2015-10-08 10:48:29 +02:00
Anton Danielsson
2589e69e05
Fixed double to float warning.
2015-10-08 10:48:22 +02:00
Anton Danielsson
e7f6c42a79
Fixed bug in "ToExponentAndMantissa" when negative exponents where created.
...
Unary minus where applied to an unsigned type.
2015-10-08 10:48:19 +02:00
Anton Danielsson
a822c71655
Removed default constructor, copy constructor and assignment operator for CheckHandler.
2015-10-08 10:48:16 +02:00
Anton Danielsson
96ca9a7aba
Fixed int64 to double cast warning.
2015-10-08 10:48:01 +02:00
Anton Danielsson
ba141ac0d9
Renamed the internal os macros to avoid a name clash in Shlwapi.h where OS_WINDOWS is defined to 0.
2015-10-08 10:47:49 +02:00
Anton Danielsson
02440964e8
Changed MSVC warnings from Wall to W4 to avoid 10000+ warnings from stl/windows headers.
2015-10-08 10:47:34 +02:00
Tobias Ulvgard
c06da04bcf
Adds Dirac Research and me as Author and Contributor
2015-10-07 17:28:00 +02:00
Dominic Hamon
406c2049a3
Merge pull request #151 from izaid/clang-fix
...
Fix for Ubuntu & Clang & C++14
2015-10-06 09:23:47 -07:00
izaid
14c4ce5ebf
Removed unneeded #include <cstddef>
2015-10-06 15:10:15 +01:00
Tobias Ulvgard
775ef51d04
CMake check for git on the system
2015-10-06 10:09:55 +02:00
Dominic Hamon
414941295e
Merge pull request #146 from efcs/fix-iteration-type
...
Fix issue #141 . Use size_t instead of int for the iteration count
2015-10-02 12:06:11 -07:00
Eric Fiselier
3dd14f0724
Make the type of kMaxIterations consistent with the type of the iteration count
2015-10-01 18:46:39 -06:00
Eric Fiselier
ed0a2eb741
use size_t instead of int for the iteration count
2015-10-01 15:08:44 -06:00
Eric
cf40a0f117
Merge pull request #136 from efcs/remove-check
...
Remove std::is_trivially_destructible assertion. Fix issue #134 .
2015-10-01 15:05:39 -06:00
Eric Fiselier
bcb933a9fb
dynamically allocate WallTimeImp
2015-10-01 14:53:46 -06:00
Eric Fiselier
e0441ef5d0
Merge branch 'master' into remove-check
2015-10-01 14:52:46 -06:00
Dominic Hamon
eeaec441a7
Merge pull request #143 from devjgm/master
...
Updates Initialize() to work with an argv as 'char**'
2015-09-30 13:31:59 -07:00
Greg Miller
2463339d0b
Updates Initialize() to work with an argv as 'char**'
2015-09-30 16:14:50 -04:00
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