[gentoo-commits] gentoo-x86 commit in games-board/hexxagon/files: hexxagon-1.0-toolchain.patch hexxagon-1.0-gcc42.patch

[gentoo-commits] gentoo-x86 commit in games-board/hexxagon/files: hexxagon-1.0-toolchain.patch hexxagon-1.0-gcc42.patch

[Samuli Suominen (ssuominen)]

ssuominen    09/08/12 20:32:39

  Added:                hexxagon-1.0-toolchain.patch
  Removed:              hexxagon-1.0-gcc42.patch
  Log:
  Fix building with GCC 4.4+ wrt #273226, thanks to vasuvi from #gentoo-kde for patch.
  (Portage version: 2.2_rc38/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  games-board/hexxagon/files/hexxagon-1.0-toolchain.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-board/hexxagon/files/hexxagon-1.0-toolchain.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-board/hexxagon/files/hexxagon-1.0-toolchain.patch?rev=1.1&content-type=text/plain

Index: hexxagon-1.0-toolchain.patch
===================================================================
diff -ur hexxagon-1.0/src/libhexx/bitboard64.h ../BUILD/hexxagon-1.0/src/libhexx/bitboard64.h
--- hexxagon-1.0/src/libhexx/bitboard64.h	2005-01-13 13:19:07.000000000 -0800
+++ ../BUILD/hexxagon-1.0/src/libhexx/bitboard64.h	2009-08-12 13:11:57.663180010 -0700
@@ -19,12 +19,12 @@
  * 
  */
 
-
 #ifndef _BITBOARD64_H
 #define _BITBOARD64_H
 
 #include <netinet/in.h>
 #include <iostream>
+#include <cstdio>
 
 namespace libhexx 
 {
@@ -54,14 +54,12 @@
         {
             printf("0x%X, 0x%X\n", lowbits, highbits);
         };
-        
-        friend std::ostream& operator<<(std::ostream &output, const class BitBoard64 &b);
-		friend std::istream& operator>>(std::istream &input, class BitBoard64 &b);
-		
-	private:
-		
+
 		uint32_t lowbits, highbits;
 	};
+	
+	std::ostream& operator<<(std::ostream &output, const class BitBoard64 &b);
+	std::istream& operator>>(std::istream &input, class BitBoard64 &b);
 }
 
 #endif
diff -ur hexxagon-1.0/src/libhexx/board.h ../BUILD/hexxagon-1.0/src/libhexx/board.h
--- hexxagon-1.0/src/libhexx/board.h	2005-01-16 03:12:23.000000000 -0800
+++ ../BUILD/hexxagon-1.0/src/libhexx/board.h	2009-08-12 13:11:35.577180031 -0700
@@ -33,8 +33,21 @@
 
 namespace libhexx 
 {
-    class Move;
-    class MoveList;
+	class Move
+	{
+		public:
+            Move();
+            Move(int t);
+            Move(int f, int t);
+
+            operator bool() const;
+            
+            char from, to;
+            int score;
+	};
+
+    bool scoreMoves(std::vector<Move> &moves, class Board board,
+		const LookUp& lookUp, int depth, bool (*callback)(), int maxtime);
 
     enum 
     {
diff -ur hexxagon-1.0/src/libhexx/libhexx.h ../BUILD/hexxagon-1.0/src/libhexx/libhexx.h
--- hexxagon-1.0/src/libhexx/libhexx.h	2005-01-13 13:19:07.000000000 -0800
+++ ../BUILD/hexxagon-1.0/src/libhexx/libhexx.h	2009-08-12 12:02:28.756180003 -0700
@@ -19,7 +19,6 @@
  * 
  */
 
-
 #include "bitboard64.h"
 #include "move.h"
 #include "board.h"
diff -ur hexxagon-1.0/src/libhexx/lookup.h ../BUILD/hexxagon-1.0/src/libhexx/lookup.h
--- hexxagon-1.0/src/libhexx/lookup.h	2005-01-13 13:19:07.000000000 -0800
+++ ../BUILD/hexxagon-1.0/src/libhexx/lookup.h	2009-08-12 11:58:08.758180417 -0700
@@ -27,6 +27,8 @@
 
 namespace libhexx
 {
+	class BitBoard64;
+
 	int getHexxagonIndex(int x, int y);
 
 	class LookUp
diff -ur hexxagon-1.0/src/libhexx/move.cpp ../BUILD/hexxagon-1.0/src/libhexx/move.cpp
--- hexxagon-1.0/src/libhexx/move.cpp	2005-01-16 03:12:23.000000000 -0800
+++ ../BUILD/hexxagon-1.0/src/libhexx/move.cpp	2009-08-12 13:12:27.140180083 -0700
@@ -114,4 +114,11 @@
     return true;
 }
 
-
+Move::Move() { from = 99; to = 99;};
+Move::Move(int t) { from = t; to = t; };
+Move::Move(int f, int t) { from = f; to = t; };
+          
+Move::operator bool() const
+{
+	return from != 99 && to != 99;
+}
diff -ur hexxagon-1.0/src/libhexx/move.h ../BUILD/hexxagon-1.0/src/libhexx/move.h
--- hexxagon-1.0/src/libhexx/move.h	2005-01-13 13:19:07.000000000 -0800
+++ ../BUILD/hexxagon-1.0/src/libhexx/move.h	2009-08-12 13:12:50.146179982 -0700
@@ -23,19 +23,19 @@
 #ifndef _MOVE_H
 #define _MOVE_H
 
-#include "board.h"
-
 #include <list>
 #include <vector>
 
 namespace libhexx 
 {
+	class Board;
+	
     class Move
     {
         public:
-            Move() { from = 99; to = 99;};
-            Move(int t) { from = t; to = t; };
-            Move(int f, int t) { from = f; to = t; };
+            Move();
+            Move(int t);
+            Move(int f, int t);
 
             inline bool operator<(const Move &r) const
             {
@@ -47,7 +47,7 @@
                 return (score != r.score);
             };
           
-            operator bool() const { return from != 99 && to != 99; };
+            operator bool() const;
             
             char from, to;
             int score;