widelands

Merge lp://staging/~widelands-dev/widelands/bug1203121 into lp://staging/widelands

  1. bug1203121
  2. Merge into trunk
Proposed by Jens Beyer
Status: Merged
Merged at revision: 6642
Proposed branch: lp://staging/~widelands-dev/widelands/bug1203121
Merge into: lp://staging/widelands
Diff against target: 15 lines (+2/-2)
1 file modified
src/helper.cc (+2/-2)
To merge this branch: bzr merge lp://staging/~widelands-dev/widelands/bug1203121
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+175987@code.staging.launchpad.net

Description of the change

Fixes the build to run with boost 1.46

Problem is that boost::random::uniform_int_distribution<> and boost::random::mt19937 have been introduced with boost 1.47

But boost 1.46 defines boost::mt19937 and boost::random_int<> (which basically, on later boost versions, call the functions from boost::random namespace).

This branch compiles fine on Ubuntu 12.04 with boost 1.46, and on Gentoo with boost 1.49.

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

Thanks for tracking this down jens! Lgtm.

review: Approve
Revision history for this message
SirVer (sirver) wrote :

I was in a merging mood, so I just merged this :).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: