Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1332627 into lp:widelands

2014-07-14 Thread GunChleoc
I merged it into another branch and it worked :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1332627. ___ Mailing list: https://

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1332627 into lp:widelands

2014-07-14 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1332627 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628 -- https://code.launchpad.net/~widelands-dev/widelands/bug-13

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1332627 into lp:widelands

2014-07-14 Thread SirVer
On second thought, that cannot really explain linker errors. If you still have them after a make clean please open a bug report and we'll investigate. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628 Your team Widelands Developers is subscribed to branch lp:~widel

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1332627 into lp:widelands

2014-07-14 Thread SirVer
Awesome! Merged. I tweaked the codecheck rule and fixed the remaining boost::noncopyable. The linking error probably came from not fixing the dependencies in the CMakeLists.txt files. make codecheck lists those. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628 Yo

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1332627 into lp:widelands

2014-07-14 Thread GunChleoc
src/wui/unique_window_handler.h creates a linking problem. so I reverted it. All the rest are done. Please double-check the codecheck rule. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wi

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1332627 into lp:widelands

2014-07-14 Thread SirVer
TypeName() = default; should be here ITransportCostCalculator() = default And I was wrong in my first comment. It is needed when the copy constructor is deleted. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1332627/+merge/226628 Your team Widelands Developers is subscribed to bran

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1332627 into lp:widelands

2014-07-14 Thread GunChleoc
I did the change to the macro. struct ITransportCostCalculator { virtual ~ITransportCostCalculator() {} virtual int32_t calc_cost_estimate(Coords, Coords) const = 0; DISALLOW_COPY_AND_ASSIGN(ITransportCostCalculator); TypeName() = default; }; results in: [ 5%]

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1332627 into lp:widelands

2014-07-13 Thread SirVer
Review: Needs Fixing Great work!!! - I think we should be consistent about where to place these macros. 1) Google style is to have them as the last thing in the class and always in a private statement. I like this because I am used to it and because it is already 'out there'. 2) One could a

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1332627 into lp:widelands

2014-07-13 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/bug-1332627 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1332627 in widelands: "Remove use of boost::noncopyable" https://bugs.launchpad.net/widelands/+bug/1332627 For more details, see