From 6e4ecd6e19427ac5ec0e0cc3d67bc9e857cf9961 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Fri, 23 Oct 2015 20:21:17 +0200 Subject: [PATCH] Allow calling RandomGenerator::get() on child classes (failed due to overridden overload) --- random/OSRandomGenerator.h | 4 ++-- random/PseudoRandomPool.h | 4 ++-- random/RandomGenerator.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/random/OSRandomGenerator.h b/random/OSRandomGenerator.h index 10853102..13e8db49 100644 --- a/random/OSRandomGenerator.h +++ b/random/OSRandomGenerator.h @@ -11,12 +11,12 @@ namespace cpputils { OSRandomGenerator(); protected: - void get(void *target, size_t bytes) override; + void _get(void *target, size_t bytes) override; }; inline OSRandomGenerator::OSRandomGenerator() {} - inline void OSRandomGenerator::get(void *target, size_t bytes) { + inline void OSRandomGenerator::_get(void *target, size_t bytes) { CryptoPP::OS_GenerateRandomBlock(true, (byte*)target, bytes); } } diff --git a/random/PseudoRandomPool.h b/random/PseudoRandomPool.h index 978ed1a9..f440fccf 100644 --- a/random/PseudoRandomPool.h +++ b/random/PseudoRandomPool.h @@ -15,7 +15,7 @@ namespace cpputils { PseudoRandomPool(); protected: - void get(void *target, size_t bytes) override; + void _get(void *target, size_t bytes) override; private: static constexpr size_t MIN_BUFFER_SIZE = 1*1024*1024; // 1MB @@ -27,7 +27,7 @@ namespace cpputils { }; - inline void PseudoRandomPool::get(void *target, size_t bytes) { + inline void PseudoRandomPool::_get(void *target, size_t bytes) { _buffer.get(target, bytes); } diff --git a/random/RandomGenerator.h b/random/RandomGenerator.h index d41676c4..51641aeb 100644 --- a/random/RandomGenerator.h +++ b/random/RandomGenerator.h @@ -11,20 +11,20 @@ namespace cpputils { Data get(size_t size); protected: - virtual void get(void *target, size_t bytes) = 0; + virtual void _get(void *target, size_t bytes) = 0; private: static std::mutex _mutex; }; template inline FixedSizeData RandomGenerator::getFixedSize() { FixedSizeData result = FixedSizeData::Null(); - get(result.data(), SIZE); + _get(result.data(), SIZE); return result; } inline Data RandomGenerator::get(size_t size) { Data result(size); - get(result.data(), size); + _get(result.data(), size); return result; } }