diff options
| author | MITSUNARI Shigeo <herumi@nifty.com> | 2018-02-20 09:30:13 +0800 |
|---|---|---|
| committer | MITSUNARI Shigeo <herumi@nifty.com> | 2018-02-20 09:30:13 +0800 |
| commit | bd6c09fd3bcb89214effdbc82cd5c7d5fa3d1e60 (patch) | |
| tree | 4336e7e5bb5a6945e2d0b7195180776b4d0848e2 | |
| parent | afbdcf4a24ad8130a23e8b8aaae76406ae6cc66a (diff) | |
| download | tangerine-mcl-bd6c09fd3bcb89214effdbc82cd5c7d5fa3d1e60.tar.gz tangerine-mcl-bd6c09fd3bcb89214effdbc82cd5c7d5fa3d1e60.tar.zst tangerine-mcl-bd6c09fd3bcb89214effdbc82cd5c7d5fa3d1e60.zip | |
fix for VC
| -rw-r--r-- | include/mcl/randgen.hpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/mcl/randgen.hpp b/include/mcl/randgen.hpp index 9e078d4..aee8cb5 100644 --- a/include/mcl/randgen.hpp +++ b/include/mcl/randgen.hpp @@ -7,7 +7,13 @@ http://opensource.org/licenses/BSD-3-Clause */ #include <cybozu/random_generator.hpp> - +#if CYBOZU_CPP_VERSION >= CYBOZU_CPP_VERSION_CPP11 +#include <random> +#endif +#ifdef _MSC_VER + #pragma warning(push) + #pragma warning(disable : 4521) +#endif namespace mcl { namespace fp { namespace local { @@ -20,7 +26,7 @@ void readWrapper(void *self, void *buf, uint32_t bufSize) #if CYBOZU_CPP_VERSION >= CYBOZU_CPP_VERSION_CPP11 template<> -void readWrapper<std::random_device>(void *self, void *buf, uint32_t bufSize) +inline void readWrapper<std::random_device>(void *self, void *buf, uint32_t bufSize) { std::random_device& rg = *reinterpret_cast<std::random_device*>(self); uint8_t *p = reinterpret_cast<uint8_t*>(buf); @@ -64,7 +70,7 @@ public: } void read(void *out, size_t byteSize) { - readFunc_(self_, out, byteSize); + readFunc_(self_, out, static_cast<uint32_t>(byteSize)); } bool isZero() const { return self_ == 0 && readFunc_ == 0; } static RandGen& get() @@ -84,3 +90,7 @@ public: }; } } // mcl::fp + +#ifdef _MSC_VER + #pragma warning(pop) +#endif |