Merge lp:~widelands-dev/widelands/bug-1776008-boost-deleted-uuid-function into lp:widelands
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 8731 | ||||
Proposed branch: | lp:~widelands-dev/widelands/bug-1776008-boost-deleted-uuid-function | ||||
Merge into: | lp:widelands | ||||
Diff against target: |
24 lines (+2/-2) 2 files modified
src/random/random.cc (+1/-1) src/wlapplication.cc (+1/-1) |
||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands/bug-1776008-boost-deleted-uuid-function | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
kaputtnik (community) | testing | Approve | |
Review via email: mp+347773@code.launchpad.net |
Commit message
Removing explicit assignment when creating random UUID generator.
Description of the change
Removing explicit assignment when creating random generator. This fixes a problem with the current version of the boost library which no longer permits assignments.
I can't confirm the linked bug since I am using an older version of boost, so I need someone to compile this with the new version (1.67). On my system the changed code still compiles and works as expected with the old boost version.
For a quick test, open ~/.widelands/config and look at the line which is similar to:
uuid=
when removing the line "last_start=..." it should generate a new UUID in the file on start of widelands. The new UUID should be something similar long with this branch and with trunk.
The change in wlapplication.cc is a bug I encountered while testing: When removing only the "uuid=..." line it crashes when trying to join the metaserver lobby as an unregistered user. The change fixes that by making sure the configuration value is initialized.
Compiling works fine :-) (beside the known issues)
Here are the values of your quick test:
Old values: dc2e-46b8- ac1f-7487343547 e6" "1528746135"
uuid="3436e035-
last_start=
After deleting last_start: 04c9-4588- 9bbd-7c42e83eb1 e6" "1528746335"
uuid="a9f6baf2-
last_start=
After deleting uuid: e1b7-47e2- 9d49-6f21be977b e9" "1528746469"
uuid="93113199-
last_start=
After deleting both: 1109-4c85- bed2-c049e043e9 09" "1528746596"
uuid="8fb0f3f7-
last_start=
Did also run the regression tests (no idea if this is importand :-D ):
> Ran 42 tests in 513.259s
> OK
From my side all fine now.