Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x

This commit is contained in:
gabime 2020-09-26 15:49:21 +03:00
commit 69b54dd9e4
2 changed files with 3 additions and 3 deletions

View File

@ -9,7 +9,7 @@
// //
// Support for logging binary data as hex // Support for logging binary data as hex
// format flags: // format flags, any combination of the followng:
// {:X} - print in uppercase. // {:X} - print in uppercase.
// {:s} - don't separate each byte with space. // {:s} - don't separate each byte with space.
// {:p} - don't print the position on each line start. // {:p} - don't print the position on each line start.

View File

@ -5,7 +5,7 @@
#include <spdlog/fmt/fmt.h> #include <spdlog/fmt/fmt.h>
// Stopwatch support for spdlog (using std::chrono::high_resolution_clock). // Stopwatch support for spdlog (using std::chrono::steady_clock).
// Displays elapsed seconds since construction as double. // Displays elapsed seconds since construction as double.
// //
// Usage: // Usage:
@ -27,7 +27,7 @@
namespace spdlog { namespace spdlog {
class stopwatch class stopwatch
{ {
using clock = std::chrono::high_resolution_clock; using clock = std::chrono::steady_clock;
std::chrono::time_point<clock> start_tp_; std::chrono::time_point<clock> start_tp_;
public: public: