Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-05-17 15:37:14 +0200
committerMartin Hořeňovský2022-05-17 15:43:23 +0200
commit359cd6187d7e8fe40dec82e77bafe5066115cb53 (patch)
tree436799e4f41d017aada2889f3ad7800a0e51925d /src
parent9c72b303d9ed0de4fc1ed3247223e5449cdd328d (diff)
downloadcatch3-359cd6187d7e8fe40dec82e77bafe5066115cb53.tar.gz
Rename global rng() to sharedRng()
Diffstat (limited to 'src')
-rw-r--r--src/catch2/generators/catch_generators_random.hpp4
-rw-r--r--src/catch2/internal/catch_context.cpp2
-rw-r--r--src/catch2/internal/catch_context.hpp2
-rw-r--r--src/catch2/internal/catch_run_context.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/catch2/generators/catch_generators_random.hpp b/src/catch2/generators/catch_generators_random.hpp
index cc66f908..11e997ca 100644
--- a/src/catch2/generators/catch_generators_random.hpp
+++ b/src/catch2/generators/catch_generators_random.hpp
@@ -25,7 +25,7 @@ class RandomFloatingGenerator final : public IGenerator<Float> {
public:
RandomFloatingGenerator(Float a, Float b):
- m_rng(rng()),
+ m_rng(sharedRng()),
m_dist(a, b) {
static_cast<void>(next());
}
@@ -47,7 +47,7 @@ class RandomIntegerGenerator final : public IGenerator<Integer> {
public:
RandomIntegerGenerator(Integer a, Integer b):
- m_rng(rng()),
+ m_rng(sharedRng()),
m_dist(a, b) {
static_cast<void>(next());
}
diff --git a/src/catch2/internal/catch_context.cpp b/src/catch2/internal/catch_context.cpp
index 790a1b23..6811b092 100644
--- a/src/catch2/internal/catch_context.cpp
+++ b/src/catch2/internal/catch_context.cpp
@@ -55,7 +55,7 @@ namespace Catch {
Context::~Context() = default;
- SimplePcg32& rng() {
+ SimplePcg32& sharedRng() {
static SimplePcg32 s_rng;
return s_rng;
}
diff --git a/src/catch2/internal/catch_context.hpp b/src/catch2/internal/catch_context.hpp
index 5b640396..fe129705 100644
--- a/src/catch2/internal/catch_context.hpp
+++ b/src/catch2/internal/catch_context.hpp
@@ -50,7 +50,7 @@ namespace Catch {
void cleanUpContext();
class SimplePcg32;
- SimplePcg32& rng();
+ SimplePcg32& sharedRng();
}
#endif // CATCH_CONTEXT_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_run_context.cpp b/src/catch2/internal/catch_run_context.cpp
index d9f376ed..179eaefb 100644
--- a/src/catch2/internal/catch_run_context.cpp
+++ b/src/catch2/internal/catch_run_context.cpp
@@ -598,7 +598,7 @@ namespace Catch {
}
void seedRng(IConfig const& config) {
- rng().seed(config.rngSeed());
+ sharedRng().seed(config.rngSeed());
}
unsigned int rngSeed() {