Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Rename global rng() to sharedRng()

Commit
359cd6187d7e8fe40dec82e77bafe5066115cb53
Author
Martin Hořeňovský ·
Parents
9c72b303d9ed

Files · Download .tar.gz

Changes

 src/catch2/generators/catch_generators_random.hpp | 4 ++--
 src/catch2/internal/catch_context.cpp             | 2 +-
 src/catch2/internal/catch_context.hpp             | 2 +-
 src/catch2/internal/catch_run_context.cpp         | 2 +-
 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() {