Author: suokko
Date: Tue Mar 24 14:30:54 2009
New Revision: 34087
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34087&view=rev
Log:
Fixed compilation with -D_GLIBCXX_PARALLEL
Modified:
branches/1.6/changelog
branches/1.6/src/gui/widgets/window_builder.cpp
branches/1.6/src/terrain_filter.cpp
branches/1.6/src/unit_animation.cpp
Modified: branches/1.6/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/changelog?rev=34087&r1=34086&r2=34087&view=diff
==============================================================================
--- branches/1.6/changelog (original)
+++ branches/1.6/changelog Tue Mar 24 14:30:54 2009
@@ -1,11 +1,13 @@
Version 1.6+svn:
* Editor2:
* New feature: exporting of selection coordinates to system clipboard
- * Graphics:
- * New portrait for Orc Grunt, Dwarf Fighter (alternative)
- * Language and i18n:
+ * Graphics:
+ * New portrait for Orc Grunt, Dwarf Fighter (alternative)
+ * Language and i18n:
* updated translations: British English, Catalan, Chinese (Simplified),
- German, Finnish, Hebrew, Italian, Slovak, Turkish
+ German, Finnish, Hebrew, Italian, Slovak, Turkish
+ * General:
+ * Fixed compilation with -D_GLIBCXX_PARALLEL
Version 1.6a:
* User interface:
Modified: branches/1.6/src/gui/widgets/window_builder.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/gui/widgets/window_builder.cpp?rev=34087&r1=34086&r2=34087&view=diff
==============================================================================
--- branches/1.6/src/gui/widgets/window_builder.cpp (original)
+++ branches/1.6/src/gui/widgets/window_builder.cpp Tue Mar 24 14:30:54 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: branches/1.6/src/terrain_filter.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/terrain_filter.cpp?rev=34087&r1=34086&r2=34087&view=diff
==============================================================================
--- branches/1.6/src/terrain_filter.cpp (original)
+++ branches/1.6/src/terrain_filter.cpp Tue Mar 24 14:30:54 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: branches/1.6/src/unit_animation.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/unit_animation.cpp?rev=34087&r1=34086&r2=34087&view=diff
==============================================================================
--- branches/1.6/src/unit_animation.cpp (original)
+++ branches/1.6/src/unit_animation.cpp Tue Mar 24 14:30:54 2009
@@ -310,7 +310,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
