projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gcc-4.8 is not decaying types correctly in lambda init captures. Help it out. Fixes...
[folly.git]
/
folly
/
Benchmark.h
diff --git
a/folly/Benchmark.h
b/folly/Benchmark.h
index 7ca0b7480f0aff34cdc13138cbcac419079803fc..0129979856132a98e21d62e70ffe21b102d3c3ee 100644
(file)
--- a/
folly/Benchmark.h
+++ b/
folly/Benchmark.h
@@
-14,12
+14,12
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#ifndef FOLLY_BENCHMARK_H_
-#define FOLLY_BENCHMARK_H_
+#pragma once
#include <folly/Portability.h>
#include <folly/Preprocessor.h> // for FB_ANONYMOUS_VARIABLE
#include <folly/ScopeGuard.h>
#include <folly/Portability.h>
#include <folly/Preprocessor.h> // for FB_ANONYMOUS_VARIABLE
#include <folly/ScopeGuard.h>
+#include <folly/portability/GFlags.h>
#include <folly/portability/Time.h>
#include <cassert>
#include <folly/portability/Time.h>
#include <cassert>
@@
-27,7
+27,6
@@
#include <boost/function_types/function_arity.hpp>
#include <functional>
#include <glog/logging.h>
#include <boost/function_types/function_arity.hpp>
#include <functional>
#include <glog/logging.h>
-#include <gflags/gflags.h>
#include <limits>
#include <type_traits>
#include <limits>
#include <type_traits>
@@
-376,7
+375,7
@@
void doNotOptimizeAway(T&& datum) {
BENCHMARK_NAMED_PARAM(name, param, param)
/**
BENCHMARK_NAMED_PARAM(name, param, param)
/**
- * Same as BENCHMARK_PARAM, but allows to return the actual number of
+ * Same as BENCHMARK_PARAM, but allows
one
to return the actual number of
* iterations that have been run.
*/
#define BENCHMARK_PARAM_MULTI(name, param) \
* iterations that have been run.
*/
#define BENCHMARK_PARAM_MULTI(name, param) \
@@
-416,7
+415,7
@@
void doNotOptimizeAway(T&& datum) {
}
/**
}
/**
- * Same as BENCHMARK_NAMED_PARAM, but allows to return the actual number
+ * Same as BENCHMARK_NAMED_PARAM, but allows
one
to return the actual number
* of iterations that have been run.
*/
#define BENCHMARK_NAMED_PARAM_MULTI(name, param_name, ...) \
* of iterations that have been run.
*/
#define BENCHMARK_NAMED_PARAM_MULTI(name, param_name, ...) \
@@
-461,7
+460,7
@@
void doNotOptimizeAway(T&& datum) {
__VA_ARGS__)
/**
__VA_ARGS__)
/**
- * Same as BENCHMARK_RELATIVE, but allows to return the actual number
+ * Same as BENCHMARK_RELATIVE, but allows
one
to return the actual number
* of iterations that have been run.
*/
#define BENCHMARK_RELATIVE_MULTI(name, ...) \
* of iterations that have been run.
*/
#define BENCHMARK_RELATIVE_MULTI(name, ...) \
@@
-478,7
+477,7
@@
void doNotOptimizeAway(T&& datum) {
BENCHMARK_RELATIVE_NAMED_PARAM(name, param, param)
/**
BENCHMARK_RELATIVE_NAMED_PARAM(name, param, param)
/**
- * Same as BENCHMARK_RELATIVE_PARAM, but allows to return the actual
+ * Same as BENCHMARK_RELATIVE_PARAM, but allows
one
to return the actual
* number of iterations that have been run.
*/
#define BENCHMARK_RELATIVE_PARAM_MULTI(name, param) \
* number of iterations that have been run.
*/
#define BENCHMARK_RELATIVE_PARAM_MULTI(name, param) \
@@
-498,7
+497,7
@@
void doNotOptimizeAway(T&& datum) {
}
/**
}
/**
- * Same as BENCHMARK_RELATIVE_NAMED_PARAM, but allows to return the
+ * Same as BENCHMARK_RELATIVE_NAMED_PARAM, but allows
one
to return the
* actual number of iterations that have been run.
*/
#define BENCHMARK_RELATIVE_NAMED_PARAM_MULTI(name, param_name, ...) \
* actual number of iterations that have been run.
*/
#define BENCHMARK_RELATIVE_NAMED_PARAM_MULTI(name, param_name, ...) \
@@
-536,5
+535,3
@@
void doNotOptimizeAway(T&& datum) {
if (auto FB_ANONYMOUS_VARIABLE(BENCHMARK_SUSPEND) = \
::folly::BenchmarkSuspender()) {} \
else
if (auto FB_ANONYMOUS_VARIABLE(BENCHMARK_SUSPEND) = \
::folly::BenchmarkSuspender()) {} \
else
-
-#endif // FOLLY_BENCHMARK_H_