From b6bde7322c5a80795f2d3f86ee68c382247d70e7 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Thu, 12 Jan 2023 16:49:25 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#26827: doc: use "std lib clock" over "C++11 clock" 672f7ad747ecc6e04472f96fa88332be1f39d39b doc: remove usages of C++11 (fanquake) Pull request description: These were new in C++11, and now they are just our standard library. ACKs for top commit: jarolrod: re-ACK 672f7ad747ecc6e04472f96fa88332be1f39d39b hebasto: re-ACK 672f7ad747ecc6e04472f96fa88332be1f39d39b Tree-SHA512: 7e3b8b0346ba29b19e6d8536700ca510e2b543cdeecd9e740bba71ea6d0133dd96cdaeaa00f371f8ef85913ff5aaabe12878255f393dac7d354a8b89b58d050a --- .github/ISSUE_TEMPLATE/good_first_issue.md | 2 +- src/random.cpp | 4 ++-- src/random.h | 2 +- src/randomenv.cpp | 2 +- src/reverse_iterator.h | 2 +- src/test/random_tests.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/good_first_issue.md b/.github/ISSUE_TEMPLATE/good_first_issue.md index 952e5b3c35..42d7cbbbed 100644 --- a/.github/ISSUE_TEMPLATE/good_first_issue.md +++ b/.github/ISSUE_TEMPLATE/good_first_issue.md @@ -15,7 +15,7 @@ assignees: '' #### Useful skills: - + #### Want to work on this issue? diff --git a/src/random.cpp b/src/random.cpp index ef4bfce2c0..614ddeb11c 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -64,7 +64,7 @@ static inline int64_t GetPerformanceCounter() noexcept __asm__ volatile ("rdtsc" : "=a"(r1), "=d"(r2)); // Constrain r1 to rax and r2 to rdx. return (r2 << 32) | r1; #else - // Fall back to using C++11 clock (usually microsecond or nanosecond precision) + // Fall back to using standard library clock (usually microsecond or nanosecond precision) return std::chrono::high_resolution_clock::now().time_since_epoch().count(); #endif } @@ -444,7 +444,7 @@ public: RNGState& GetRNGState() noexcept { - // This C++11 idiom relies on the guarantee that static variable are initialized + // This idiom relies on the guarantee that static variable are initialized // on first call, even when multiple parallel calls are permitted. static std::vector> g_rng(1); return g_rng[0]; diff --git a/src/random.h b/src/random.h index cae1ea6ce9..d461318e6c 100644 --- a/src/random.h +++ b/src/random.h @@ -232,7 +232,7 @@ public: /* interval [0..0] */ Dur{0}; }; - // Compatibility with the C++11 UniformRandomBitGenerator concept + // Compatibility with the UniformRandomBitGenerator concept typedef uint64_t result_type; static constexpr uint64_t min() { return 0; } static constexpr uint64_t max() { return std::numeric_limits::max(); } diff --git a/src/randomenv.cpp b/src/randomenv.cpp index bf23ea4a12..05aa0c2d2c 100644 --- a/src/randomenv.cpp +++ b/src/randomenv.cpp @@ -251,7 +251,7 @@ void RandAddDynamicEnv(CSHA512& hasher) gettimeofday(&tv, nullptr); hasher << tv; #endif - // Probably redundant, but also use all the clocks C++11 provides: + // Probably redundant, but also use all the standard library clocks: hasher << std::chrono::system_clock::now().time_since_epoch().count(); hasher << std::chrono::steady_clock::now().time_since_epoch().count(); hasher << std::chrono::high_resolution_clock::now().time_since_epoch().count(); diff --git a/src/reverse_iterator.h b/src/reverse_iterator.h index 729d8c11cc..4db001c04b 100644 --- a/src/reverse_iterator.h +++ b/src/reverse_iterator.h @@ -4,7 +4,7 @@ #define BITCOIN_REVERSE_ITERATOR_H /** - * Template used for reverse iteration in C++11 range-based for loops. + * Template used for reverse iteration in range-based for loops. * * std::vector v = {1, 2, 3, 4, 5}; * for (auto x : reverse_iterate(v)) diff --git a/src/test/random_tests.cpp b/src/test/random_tests.cpp index 258a3eafef..bdb6b9650e 100644 --- a/src/test/random_tests.cpp +++ b/src/test/random_tests.cpp @@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE(fastrandom_randbits) } } -/** Does-it-compile test for compatibility with standard C++11 RNG interface. */ +/** Does-it-compile test for compatibility with standard library RNG interface. */ BOOST_AUTO_TEST_CASE(stdrandom_test) { FastRandomContext ctx;