Index: ps/trunk/source/graphics/ObjectBase.cpp =================================================================== --- ps/trunk/source/graphics/ObjectBase.cpp +++ ps/trunk/source/graphics/ObjectBase.cpp @@ -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 +#include CObjectBase::CObjectBase(CObjectManager& objectManager) : m_ObjectManager(objectManager) @@ -554,7 +554,7 @@ 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(0, totalFreq-1)(rng); // and use that to choose one of the variants for (size_t i = 0; i < grp->size(); ++i) Index: ps/trunk/source/graphics/ParticleEmitterType.cpp =================================================================== --- ps/trunk/source/graphics/ParticleEmitterType.cpp +++ ps/trunk/source/graphics/ParticleEmitterType.cpp @@ -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 +#include /** @@ -120,7 +120,7 @@ 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(m_Min, m_Max)(type.m_Manager.m_RNG); } virtual float Min(CParticleEmitterType& UNUSED(type)) Index: ps/trunk/source/maths/tests/test_Sqrt.h =================================================================== --- ps/trunk/source/maths/tests/test_Sqrt.h +++ ps/trunk/source/maths/tests/test_Sqrt.h @@ -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 -#include +#include #include class TestSqrt : public CxxTest::TestSuite @@ -76,13 +76,13 @@ // (TODO: This might be making non-portable assumptions about sqrt(double)) boost::mt19937 rng; - boost::uniform_int ints(0, (u64)-1); - boost::variate_generator > gen(rng, ints); + boost::random::uniform_int_distribution ints(0, (u64)-1); + boost::variate_generator> gen(rng, ints); for (size_t i = 0; i < 1024; ++i) { u64 n = gen(); - s(n, (u64)sqrt((double)n)); + s(n, static_cast(sqrt(static_cast(n)))); } } };