Skip to content

Commit

Permalink
Merge bitcoin#26827: doc: use "std lib clock" over "C++11 clock"
Browse files Browse the repository at this point in the history
672f7ad 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 672f7ad
  hebasto:
    re-ACK 672f7ad

Tree-SHA512: 7e3b8b0346ba29b19e6d8536700ca510e2b543cdeecd9e740bba71ea6d0133dd96cdaeaa00f371f8ef85913ff5aaabe12878255f393dac7d354a8b89b58d050a
  • Loading branch information
MarcoFalke authored and PastaPastaPasta committed Aug 12, 2024
1 parent 93c4652 commit b6bde73
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/good_first_issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ assignees: ''

#### Useful skills:

<!-- (For example, “C++11 std::thread”, “Qt5 GUI and async GUI design” or “basic understanding of Bitcoin mining and the Bitcoin Core RPC interface”.) -->
<!-- (For example, “std::thread”, “Qt5 GUI and async GUI design” or “basic understanding of Bitcoin mining and the Bitcoin Core RPC interface”.) -->

#### Want to work on this issue?

Expand Down
4 changes: 2 additions & 2 deletions src/random.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -444,7 +444,7 @@ class RNGState {

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<RNGState, secure_allocator<RNGState>> g_rng(1);
return g_rng[0];
Expand Down
2 changes: 1 addition & 1 deletion src/random.h
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class FastRandomContext
/* 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<uint64_t>::max(); }
Expand Down
2 changes: 1 addition & 1 deletion src/randomenv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/reverse_iterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<int> v = {1, 2, 3, 4, 5};
* for (auto x : reverse_iterate(v))
Expand Down
2 changes: 1 addition & 1 deletion src/test/random_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b6bde73

Please sign in to comment.