Skip to content

Commit 99334ab

Browse files
committed
Merge branch 'dev' of https://github.com/sunxfancy/zeroerr into dev
2 parents 067a7d9 + 02ca58d commit 99334ab

5 files changed

Lines changed: 2266 additions & 2116 deletions

File tree

include/zeroerr/benchmark.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ using Clock = std::conditional<std::chrono::high_resolution_clock::is_steady,
4747

4848
namespace detail {
4949
struct LinuxPerformanceCounter;
50+
struct WindowsPerformanceCounter;
5051
}
5152

5253
/**
@@ -73,6 +74,7 @@ struct PerformanceCounter {
7374
PerfCountSet<bool> _has;
7475

7576
detail::LinuxPerformanceCounter* _perf = nullptr;
77+
detail::WindowsPerformanceCounter* win_perf = nullptr;
7678
};
7779

7880
/**

scripts/gen-single-file.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ file(APPEND zeroerr.hpp "${config}\n${color}\n${console}\n${debugbreak}\n${threa
5353
file(APPEND zeroerr.hpp "${domain}\n${in_range}\n${element_of}\n${container_of}\n${aggregate_of}\n${arbitrary}\n")
5454
file(APPEND zeroerr.hpp "${benchmark}\n${assert}\n${dbg}\n${format}\n${log}\n${table}\n${profiler}\n${unittest}\n${fuzztest}\n")
5555
file(APPEND zeroerr.hpp "#ifdef ZEROERR_IMPLEMENTATION\n")
56-
file(APPEND zeroerr.hpp "${benchmark_cpp}\n${rng_cpp}\n${color_cpp}\n${print_cpp}\n${console_cpp}\n${log_cpp}\n${table_cpp}\n${unittest_cpp}\n${fuzztest_cpp}\n")
56+
file(APPEND zeroerr.hpp "${rng_cpp}\n${color_cpp}\n${print_cpp}\n${console_cpp}\n${log_cpp}\n${table_cpp}\n${unittest_cpp}\n${fuzztest_cpp}\n${benchmark_cpp}\n")
5757
file(APPEND zeroerr.hpp "#endif // ZEROERR_IMPLEMENTATION\n")

0 commit comments

Comments
 (0)