maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

patch by Yaron: Uses rand_s() from stdlib.h (when building for Windows) 

llvm-svn: 192325
This commit is contained in:
Marshall Clow 2013-10-09 21:49:03 +00:00
parent c665c9ecf4
commit 0354b92992
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/include/random
View File

@ -3475,7 +3475,9 @@ typedef shuffle_order_engine<minstd_rand0, 256> knuth_b;
class _LIBCPP_TYPE_VIS random_device class _LIBCPP_TYPE_VIS random_device
{ {
#if !defined(_WIN32)
int __f_; int __f_;
#endif // defined(_WIN32)
public: public:
// types // types
typedef unsigned result_type; typedef unsigned result_type;

26
libcxx/src/random.cpp
View File

@ -7,6 +7,12 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#if defined(_WIN32)
// Must be defined before including stdlib.h to enable rand_s().
#define _CRT_RAND_S
#include <stdio.h>
#endif
#include "random" #include "random"
#include "system_error" #include "system_error"
@ -19,6 +25,25 @@
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#if defined(_WIN32)
random_device::random_device(const string&)
{
}
random_device::~random_device()
{
}
unsigned
random_device::operator()()
{
unsigned r;
errno_t err = rand_s(&r);
if (err)
__throw_system_error(err, "random_device rand_s failed.");
return r;
}
#else
random_device::random_device(const string& __token) random_device::random_device(const string& __token)
: __f_(open(__token.c_str(), O_RDONLY)) : __f_(open(__token.c_str(), O_RDONLY))
{ {
@ -38,6 +63,7 @@ random_device::operator()()
read(__f_, &r, sizeof(r)); read(__f_, &r, sizeof(r));
return r; return r;
} }
#endif // defined(_WIN32)
double double
random_device::entropy() const _NOEXCEPT random_device::entropy() const _NOEXCEPT