Author: suokko
Date: Tue Mar 24 13:58:14 2009
New Revision: 34086
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34086&view=rev
Log:
Fixed compilation with -D_GLIBCXX_PARALLEL
Modified:
trunk/changelog
trunk/src/gui/widgets/window_builder.cpp
trunk/src/terrain_filter.cpp
trunk/src/unit_animation.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=34086&r1=34085&r2=34086&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Tue Mar 24 13:58:14 2009
@@ -6,6 +6,7 @@
* General:
* The add-ons directory, <preferences>/data/campaigns, has been renamed
and it is now <preferences>/data/add-ons
+ * Fixed compilation with -D_GLIBCXX_PARALLEL
* Graphics:
* The ~RC() image functor does not accept the special palette switch
~RC(palette1=palette2) syntax anymore. ~PAL(palette1>palette2) should
Modified: trunk/src/gui/widgets/window_builder.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/window_builder.cpp?rev=34086&r1=34085&r2=34086&view=diff
==============================================================================
--- trunk/src/gui/widgets/window_builder.cpp (original)
+++ trunk/src/gui/widgets/window_builder.cpp Tue Mar 24 13:58:14 2009
@@ -73,20 +73,20 @@
unsigned get_border(const std::vector<std::string>& border)
{
- if(std::find(border.begin(), border.end(), "all") != border.end()) {
+ if(std::find(border.begin(), border.end(), std::string("all")) !=
border.end()) {
return tgrid::BORDER_TOP
| tgrid::BORDER_BOTTOM | tgrid::BORDER_LEFT |
tgrid::BORDER_RIGHT;
} else {
- if(std::find(border.begin(), border.end(), "top") !=
border.end()) {
+ if(std::find(border.begin(), border.end(), std::string("top"))
!= border.end()) {
return tgrid::BORDER_TOP;
}
- if(std::find(border.begin(), border.end(), "bottom") !=
border.end()) {
+ if(std::find(border.begin(), border.end(),
std::string("bottom")) != border.end()) {
return tgrid::BORDER_BOTTOM;
}
- if(std::find(border.begin(), border.end(), "left") !=
border.end()) {
+ if(std::find(border.begin(), border.end(), std::string("left"))
!= border.end()) {
return tgrid::BORDER_LEFT;
}
- if(std::find(border.begin(), border.end(), "right") !=
border.end()) {
+ if(std::find(border.begin(), border.end(),
std::string("right")) != border.end()) {
return tgrid::BORDER_RIGHT;
}
}
Modified: trunk/src/terrain_filter.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/terrain_filter.cpp?rev=34086&r1=34085&r2=34086&view=diff
==============================================================================
--- trunk/src/terrain_filter.cpp (original)
+++ trunk/src/terrain_filter.cpp Tue Mar 24 13:58:14 2009
@@ -223,15 +223,15 @@
if(!tod_type.empty()) {
const std::vector<std::string>& vals = utils::split(tod_type);
if(tod.lawful_bonus<0) {
- if(std::find(vals.begin(),vals.end(),"chaotic") ==
vals.end()) {
+
if(std::find(vals.begin(),vals.end(),std::string("chaotic")) == vals.end()) {
return false;
}
} else if(tod.lawful_bonus>0) {
- if(std::find(vals.begin(),vals.end(),"lawful") ==
vals.end()) {
+
if(std::find(vals.begin(),vals.end(),std::string("lawful")) == vals.end()) {
return false;
}
} else {
- if(std::find(vals.begin(),vals.end(),"neutral") ==
vals.end()) {
+
if(std::find(vals.begin(),vals.end(),std::string("neutral")) == vals.end()) {
return false;
}
}
Modified: trunk/src/unit_animation.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_animation.cpp?rev=34086&r1=34085&r2=34086&view=diff
==============================================================================
--- trunk/src/unit_animation.cpp (original)
+++ trunk/src/unit_animation.cpp Tue Mar 24 13:58:14 2009
@@ -303,7 +303,7 @@
std::vector<unit_animation>::const_iterator itor;
add_anims(animations,cfg);
for(itor = animations.begin(); itor != animations.end() ; itor++) {
- if
(std::find(itor->event_.begin(),itor->event_.end(),"default")!=
itor->event_.end()) {
+ if
(std::find(itor->event_.begin(),itor->event_.end(),std::string("default"))!=
itor->event_.end()) {
animation_base.push_back(*itor);
animation_base.back().base_score_ =
unit_animation::DEFAULT_ANIM;
animation_base.back().event_.clear();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
