phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Replace includes uniform_foo with uniform_foo_distribution as it's deprecated in newer versions of boost. It was added in the 1.47 version.

Browse Source 
Reviewed by: @Angen, @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D1823
This was SVN commit r22211.
This commit is contained in:
Stan 2019-04-22 21:45:23 +00:00
parent bc3fd69bf0
commit fd719833ab
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/graphics/ObjectBase.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2018 Wildfire Games.
/* Copyright (C) 2019 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -29,7 +29,7 @@
#include "lib/timer.h"
#include "maths/MathUtil.h"
#include <boost/random/uniform_int.hpp>
#include <boost/random/uniform_int_distribution.hpp>
CObjectBase::CObjectBase(CObjectManager& objectManager)
: m_ObjectManager(objectManager)
@ -554,7 +554,7 @@ std::set<CStr> CObjectBase::CalculateRandomRemainingSelections(rng_t& rng, const
if (allZero) totalFreq = (int)grp->size();
// Choose a random number in the interval [0..totalFreq)
int randNum = boost::uniform_int<>(0, totalFreq-1)(rng);
int randNum = boost::random::uniform_int_distribution<int>(0, totalFreq-1)(rng);
// and use that to choose one of the variants
for (size_t i = 0; i < grp->size(); ++i)

6
source/graphics/ParticleEmitterType.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2015 Wildfire Games.
/* Copyright (C) 2019 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -30,7 +30,7 @@
#include "ps/XML/Xeromyces.h"
#include "renderer/Renderer.h"
#include <boost/random/uniform_real.hpp>
#include <boost/random/uniform_real_distribution.hpp>
/**
@ -120,7 +120,7 @@ public:
virtual float Compute(CParticleEmitterType& type, CParticleEmitter& UNUSED(emitter))
{
return boost::uniform_real<>(m_Min, m_Max)(type.m_Manager.m_RNG);
return boost::random::uniform_real_distribution<float>(m_Min, m_Max)(type.m_Manager.m_RNG);
}
virtual float Min(CParticleEmitterType& UNUSED(type))

10
source/maths/tests/test_Sqrt.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2019 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -20,7 +20,7 @@
#include "maths/Sqrt.h"
#include <boost/random/mersenne_twister.hpp>
#include <boost/random/uniform_int.hpp>
#include <boost/random/uniform_int_distribution.hpp>
#include <boost/random/variate_generator.hpp>
class TestSqrt : public CxxTest::TestSuite
@ -76,13 +76,13 @@ public:
// (TODO: This might be making non-portable assumptions about sqrt(double))
boost::mt19937 rng;
boost::uniform_int<u64> ints(0, (u64)-1);
boost::variate_generator<boost::mt19937&, boost::uniform_int<u64> > gen(rng, ints);
boost::random::uniform_int_distribution<u64> ints(0, (u64)-1);
boost::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<u64>> gen(rng, ints);
for (size_t i = 0; i < 1024; ++i)
{
u64 n = gen();
s(n, (u64)sqrt((double)n));
s(n, static_cast<u64>(sqrt(static_cast<double>(n))));
}
}
};