Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687100-reveal_fields into lp:widelands
Sorry Gun, with your last changes the prior problem appear again: The census and statistics overlay for some buildings suddenly disappear in the seafaring tutorial. I have reverted to revision 8358 and then it works: The census and statistics overlays keep alive. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1687100-reveal_fields/+merge/323721 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1687100-reveal_fields. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687100-reveal_fields into lp:widelands
Thanks for testing again. I thought the new changes would make the code more correct, but I was obviously wrong, since the test suite also blew up. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1687100-reveal_fields/+merge/323721 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1687100-reveal_fields. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc7 into lp:widelands
The gcc-7 package should be available now https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test?field.series_filter=trusty. I've merged latest trunk a couple of times, but it didn't seem like bunnybot picked up the changes. I suspect this might be related to the MP status, so I've taken the liberty of moving it back to needs review. -- https://code.launchpad.net/~widelands-dev/widelands/gcc7/+merge/323576 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gcc7 into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc7 into lp:widelands
Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/gcc7 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/gcc7/+merge/323576 (Note: at the moment this is mainly for testing, not merging. I think branches need a merge proposal in order to find build results from bunnybot, right?) I don't remember the details, but we didn't add GCC7 in the last round of compiler updates due to some issue. Since then, Ubuntu has done a rebuild of the whole archive with GCC7 [1], and Widelands was among the build failures [2]. GCC 7.1 has now been officially released [3], so it is likely only a question of time before it becomes the default compiler on a lot of systems. I pushed this branch now to check if we still have a build failure in the development version and if we do, it should naturally be fixed. It isn't unlikely that someone will look for a similar patch for build19 too in the future, so we should probably mark it in such a way that it is easily findable. Could save people some time and duplicated work, assuming the code hasn't changed too much in the meantime. For instance, distros tend to treat build failures pretty seriously since if they cannot build the package it becomes impossible to ship patches or updates to it so they will want to keep build19 buildable. [1] more details on https://lists.ubuntu.com/archives/ubuntu-devel/2017-March/039749.html [2] http://qa.ubuntuwire.org/ftbfs/rebuilds/test-rebuild-20170322.1-gcc7-zesty.html [3] https://gcc.gnu.org/gcc-7/ -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gcc7 into lp:widelands. === modified file '.travis.yml' --- .travis.yml 2017-02-13 17:15:49 + +++ .travis.yml 2017-05-28 09:42:41 + @@ -36,14 +36,14 @@ - compiler: gcc env: GCC_VERSION="4.9" BUILD_TYPE="Debug" - compiler: gcc - env: GCC_VERSION="5" BUILD_TYPE="Debug" - - compiler: gcc env: GCC_VERSION="6" BUILD_TYPE="Debug" - compiler: gcc + env: GCC_VERSION="7" BUILD_TYPE="Debug" + - compiler: gcc env: GCC_VERSION="4.8" BUILD_TYPE="Release" - compiler: gcc env: GCC_VERSION="4.9" BUILD_TYPE="Release" - compiler: gcc - env: GCC_VERSION="5" BUILD_TYPE="Release" - - compiler: gcc env: GCC_VERSION="6" BUILD_TYPE="Release" + - compiler: gcc + env: GCC_VERSION="7" BUILD_TYPE="Release" ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands
So, code is cleaned up. A review of the new apple specific parts and maybe another short test, then it can go? -- https://code.launchpad.net/~widelands-dev/widelands/net-boost-asio/+merge/324364 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/net-boost-asio. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove_namespace_std into lp:widelands
SirVer has proposed merging lp:~widelands-dev/widelands/remove_namespace_std
into lp:widelands.
Commit message:
Wanted to remove 'using namespace std;' in all places where it was only for
convenience. Turns out there were no non-lazy uses.
A tiny cleanup to make clearer in places what is actually used (for example min
-> std::min improves readability).
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/remove_namespace_std/+merge/324890
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/remove_namespace_std into lp:widelands.
=== modified file 'src/base/md5.cc'
--- src/base/md5.cc 2017-01-25 18:55:59 +
+++ src/base/md5.cc 2017-05-31 21:30:58 +
@@ -27,13 +27,11 @@
#include "base/macros.h"
-using namespace std;
-
/**
* Create a hex string out of the MD5 checksum.
*/
-string Md5Checksum::str() const {
- string s;
+std::string Md5Checksum::str() const {
+ std::string s;
for (uint32_t i = 0; i < sizeof(data); ++i) {
char buf[3];
=== modified file 'src/graphic/animation.cc'
--- src/graphic/animation.cc 2017-05-21 18:15:17 +
+++ src/graphic/animation.cc 2017-05-31 21:30:58 +
@@ -41,9 +41,8 @@
#include "sound/note_sound.h"
#include "sound/sound_handler.h"
-using namespace std;
-
namespace {
+
// Parses an array { 12, 23 } into a point.
void get_point(const LuaTable& table, Vector2i* p) {
std::vector pts = table.array_entries();
@@ -97,13 +96,13 @@
std::vector pc_mask_image_files_;
float scale_;
- vector frames_;
- vector pcmasks_;
+ std::vector frames_;
+ std::vector pcmasks_;
// name of sound effect that will be played at frame 0.
// TODO(sirver): this should be done using play_sound in a program instead of
// binding it to the animation.
- string sound_effect_;
+ std::string sound_effect_;
bool play_once_;
};
=== modified file 'src/graphic/graphic.cc'
--- src/graphic/graphic.cc 2017-02-28 20:07:07 +
+++ src/graphic/graphic.cc 2017-05-31 21:30:58 +
@@ -41,8 +41,6 @@
#include "io/streamwrite.h"
#include "notifications/notifications.h"
-using namespace std;
-
Graphic* g_gr;
namespace {
@@ -232,6 +230,6 @@
/**
* Save a screenshot to the given file.
*/
-void Graphic::screenshot(const string& fname) {
+void Graphic::screenshot(const std::string& fname) {
screenshot_filename_ = fname;
}
=== modified file 'src/graphic/text/rt_render.cc'
--- src/graphic/text/rt_render.cc 2017-05-23 21:07:47 +
+++ src/graphic/text/rt_render.cc 2017-05-31 21:30:58 +
@@ -52,7 +52,6 @@
#include "io/filesystem/filesystem_exceptions.h"
#include "io/filesystem/layered_filesystem.h"
-using namespace std;
// TODO(GunChleoc): text line can start with space text node when it's within a div.
namespace RT {
@@ -86,7 +85,7 @@
struct NodeStyle {
UI::FontSet const* fontset;
- string font_face;
+ std::string font_face;
uint16_t font_size;
RGBColor font_color;
int font_style;
@@ -94,7 +93,7 @@
uint8_t spacing;
UI::Align halign;
UI::Align valign;
- string reference;
+ std::string reference;
};
/*
@@ -109,15 +108,15 @@
private:
struct FontDescr {
- string face;
+ std::string face;
uint16_t size;
bool operator<(const FontDescr& o) const {
return size < o.size || (size == o.size && face < o.face);
}
};
- using FontMap = map;
- using FontMapPair = pair>;
+ using FontMap = std::map;
+ using FontMapPair = std::pair>;
FontMap fontmap_;
@@ -195,14 +194,14 @@
struct Reference {
Recti dim;
- string ref;
+ std::string ref;
};
class RefMap : public IRefMap {
public:
- RefMap(const vector& refs) : refs_(refs) {
+ RefMap(const std::vector& refs) : refs_(refs) {
}
- string query(int16_t x, int16_t y) override {
+ std::string query(int16_t x, int16_t y) override {
// Should this linear algorithm proof to be too slow (doubtful), the
// RefMap could also be efficiently implemented using an R-Tree
for (const Reference& c : refs_)
@@ -212,7 +211,7 @@
}
private:
- vector refs_;
+ std::vector refs_;
};
class RenderNode {
@@ -247,8 +246,8 @@
virtual void set_w(uint16_t) {
} // Only, when is_expanding
- virtual const vector get_references() {
- return vector();
+ virtual const std::vector get_references() {
+ return std::vector();
}
Floating get_floating() const {
@@ -316,7 +315,7 @@
class Layout {
public:
- Layout(vector& all) : h_(0), idx_(0), all_nodes_(all) {
+ Layout(std::vector& all) : h_(0), idx_(0), all_nodes_(all) {
}
virtual ~Layout() {
}
@@ -324,7 +323,7 @@
uint16_t height() {
return h_;
}
- uint16_t fit_nodes(vector& rv, uint16_t w, Borders p, bool shrink_to_fit);
+ uint16_t fit_nodes(std::vector& rv, uint16_t w, Borders p, bool shrink_to_fit);
private:
// Represents a change in the rendering constraints. For example when an
@@ -340,16 +339,16 @@
}
};
- uint16_t fit_line(uint16_t w, const Borders&, v
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc7 into lp:widelands
Continuous integration builds have changed state: Travis build 2266. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/238045527. Appveyor build 2101. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_gcc7-2101. -- https://code.launchpad.net/~widelands-dev/widelands/gcc7/+merge/323576 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gcc7 into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/net-boost-asio into lp:widelands
Continuous integration builds have changed state: Travis build 2267. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/238067343. Appveyor build 2102. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_net_boost_asio-2102. -- https://code.launchpad.net/~widelands-dev/widelands/net-boost-asio/+merge/324364 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/net-boost-asio. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove_namespace_std into lp:widelands
Continuous integration builds have changed state: Travis build 2268. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/238121054. Appveyor build 2103. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_remove_namespace_std-2103. -- https://code.launchpad.net/~widelands-dev/widelands/remove_namespace_std/+merge/324890 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/remove_namespace_std into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
