| 1 |
mr_bones_ 09/04/25 23:59:18 |
| 2 |
|
| 3 |
Added: freelords-0.3.8-gcc43.patch |
| 4 |
Log: |
| 5 |
gcc43 patch from Petr Behan (bug #267204); tidy |
| 6 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-strategy/freelords/files/freelords-0.3.8-gcc43.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freelords/files/freelords-0.3.8-gcc43.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/freelords/files/freelords-0.3.8-gcc43.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: freelords-0.3.8-gcc43.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur freelords-0.3.8/work/freelords-0.3.8/src/ArmyInfo.h xlords/src/ArmyInfo.h |
| 17 |
--- freelords-0.3.8/work/freelords-0.3.8/src/ArmyInfo.h 2007-05-02 23:40:55.000000000 +0200 |
| 18 |
+++ xlords/src/ArmyInfo.h 2009-04-23 14:16:51.000000000 +0200 |
| 19 |
@@ -55,6 +55,8 @@ |
| 20 |
*/ |
| 21 |
static void setPressable(ArmyInfo* armyinfo, bool pressable = true) |
| 22 |
{armyinfo->d_pressable = pressable;} |
| 23 |
+ static void enablePressable(ArmyInfo* armyinfo) |
| 24 |
+ {setPressable(armyinfo, true);} |
| 25 |
|
| 26 |
private: |
| 27 |
// EVENT HANDLER |
| 28 |
diff -ur freelords-0.3.8/work/freelords-0.3.8/src/Threatlist.cpp xlords/src/Threatlist.cpp |
| 29 |
--- freelords-0.3.8/work/freelords-0.3.8/src/Threatlist.cpp 2007-05-02 23:40:55.000000000 +0200 |
| 30 |
+++ xlords/src/Threatlist.cpp 2009-04-23 14:07:04.000000000 +0200 |
| 31 |
@@ -12,6 +12,7 @@ |
| 32 |
// along with this program; if not, write to the Free Software |
| 33 |
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 34 |
|
| 35 |
+#include <algorithm> |
| 36 |
#include <iostream> |
| 37 |
|
| 38 |
#include "Threatlist.h" |
| 39 |
@@ -226,7 +227,7 @@ |
| 40 |
|
| 41 |
bool Threatlist::flRemove(Threat* object) |
| 42 |
{ |
| 43 |
- iterator threatit = find(begin(), end(), object); |
| 44 |
+ iterator threatit = std::find(begin(), end(), object); |
| 45 |
if (threatit != end()) |
| 46 |
{ |
| 47 |
delete object; |
| 48 |
diff -ur freelords-0.3.8/work/freelords-0.3.8/src/stackinfo.cpp xlords/src/stackinfo.cpp |
| 49 |
--- freelords-0.3.8/work/freelords-0.3.8/src/stackinfo.cpp 2007-05-02 23:40:56.000000000 +0200 |
| 50 |
+++ xlords/src/stackinfo.cpp 2009-04-23 14:16:53.000000000 +0200 |
| 51 |
@@ -71,7 +71,7 @@ |
| 52 |
if (selected == 1) ArmyInfo::setPressable(d_armyinfovector[last_selected_army], false); |
| 53 |
else |
| 54 |
{ |
| 55 |
- for_each(d_armyinfovector.begin(), d_armyinfovector.end(), ArmyInfo::setPressable); |
| 56 |
+ std::for_each(d_armyinfovector.begin(), d_armyinfovector.end(), ArmyInfo::enablePressable); |
| 57 |
} |
| 58 |
} |
| 59 |
|
| 60 |
diff -ur freelords-0.3.8/work/freelords-0.3.8/src/stacklist.cpp xlords/src/stacklist.cpp |
| 61 |
--- freelords-0.3.8/work/freelords-0.3.8/src/stacklist.cpp 2007-05-02 23:40:56.000000000 +0200 |
| 62 |
+++ xlords/src/stacklist.cpp 2009-04-23 14:06:30.000000000 +0200 |
| 63 |
@@ -12,6 +12,8 @@ |
| 64 |
// along with this program; if not, write to the Free Software |
| 65 |
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 66 |
|
| 67 |
+#include <algorithm> |
| 68 |
+ |
| 69 |
#include "stacklist.h" |
| 70 |
#include "stack.h" |
| 71 |
#include "path.h" |
| 72 |
@@ -333,7 +335,7 @@ |
| 73 |
bool Stacklist::flRemove(Stack* object) |
| 74 |
{ |
| 75 |
debug("removing stack with id " << object->getId() << endl); |
| 76 |
- iterator stackit = find(begin(), end(), object); |
| 77 |
+ iterator stackit = std::find(begin(), end(), object); |
| 78 |
if (stackit != end()) |
| 79 |
{ |
| 80 |
if (d_activestack == object) |
| 81 |
diff -ur freelords-0.3.8/work/freelords-0.3.8/src/stacklist.h xlords/src/stacklist.h |
| 82 |
--- freelords-0.3.8/work/freelords-0.3.8/src/stacklist.h 2007-05-02 23:40:56.000000000 +0200 |
| 83 |
+++ xlords/src/stacklist.h 2009-04-23 14:05:44.000000000 +0200 |
| 84 |
@@ -15,6 +15,7 @@ |
| 85 |
#ifndef STACKLIST_H |
| 86 |
#define STACKLIST_H |
| 87 |
|
| 88 |
+#include <string> |
| 89 |
#include <list> |
| 90 |
#include <pgmessageobject.h> |
| 91 |
#include <sigc++/object_slot.h> |
| 92 |
diff -ur freelords-0.3.8/work/freelords-0.3.8/src/utils/extractv.cpp xlords/src/utils/extractv.cpp |
| 93 |
--- freelords-0.3.8/work/freelords-0.3.8/src/utils/extractv.cpp 2007-05-02 23:41:02.000000000 +0200 |
| 94 |
+++ xlords/src/utils/extractv.cpp 2009-04-23 14:18:26.000000000 +0200 |
| 95 |
@@ -15,6 +15,7 @@ |
| 96 |
// Andrea Paternesi 17/02/2005 |
| 97 |
|
| 98 |
#include <stdio.h> |
| 99 |
+#include <string.h> |
| 100 |
#include <string> |
| 101 |
#include <vector> |
| 102 |
#include <iostream> |
Archives