diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-31 02:58:34 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-31 02:58:34 (GMT) |
| commit | 997a0afac3f9b3a7aa2c4a8d351c3697bc91f7aa (patch) | |
| tree | 3b3816d1557746f5f2e3e86a9239821472012024 /src/func.cc | |
| parent | d0de384a7e1642d09726579fdd75f1588cfaada7 (diff) | |
| parent | af0658a8fe441ebb0eb3d238e7055fd592343605 (diff) | |
Merge branch 'master' and fix bugs
Conflicts:
src/openscad.cc
tests/CMakeLists.txt
Diffstat (limited to 'src/func.cc')
| -rw-r--r-- | src/func.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/func.cc b/src/func.cc index 5dcb3e9..791e957 100644 --- a/src/func.cc +++ b/src/func.cc @@ -43,7 +43,7 @@ */ #include <boost/random/mersenne_twister.hpp> -#include <boost/random/uniform_real_distribution.hpp> +#include <boost/random/uniform_real.hpp> #ifdef __WIN32__ #include <process.h> @@ -54,8 +54,8 @@ int process_id = _getpid(); int process_id = getpid(); #endif -boost::random::mt19937 deterministic_rng; -boost::random::mt19937 lessdeterministic_rng( std::time(0) + process_id ); +boost::mt19937 deterministic_rng; +boost::mt19937 lessdeterministic_rng( std::time(0) + process_id ); AbstractFunction::~AbstractFunction() { @@ -167,7 +167,7 @@ Value builtin_rands(const Context *, const std::vector<std::string>&, const std: double min = std::min( args[0].toDouble(), args[1].toDouble() ); double max = std::max( args[0].toDouble(), args[1].toDouble() ); - boost::random::uniform_real_distribution<> distributor( min, max ); + boost::uniform_real<> distributor( min, max ); Value::VectorType vec; for (int i=0; i<args[2].toDouble(); i++) { if ( deterministic ) { |