From 75d117fcb5cce9025a7dfdb2fd67aa8782dfa34b Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Thu, 22 Dec 2016 11:36:35 +0000
Subject: Improve C++ portability.

---
 games/bastet/distinfo               |  3 ++-
 games/bastet/patches/patch-Well.hpp | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 games/bastet/patches/patch-Well.hpp

(limited to 'games')

diff --git a/games/bastet/distinfo b/games/bastet/distinfo
index 5210c6c2bee..beae155cf0f 100644
--- a/games/bastet/distinfo
+++ b/games/bastet/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2016/10/15 00:45:15 kamil Exp $
+$NetBSD: distinfo,v 1.7 2016/12/22 11:36:35 joerg Exp $
 
 SHA1 (bastet-0.43.1.tar.gz) = 003e342df526211a9a811c2235a02b2d8288e020
 RMD160 (bastet-0.43.1.tar.gz) = dde16fd74747bbd9dcc3a9762c0e681b7c9318ce
 SHA512 (bastet-0.43.1.tar.gz) = b2b67cd5bcc015629bd679b2bce696bd9e944cd233c78a9d49f91d340cd57f36f17181ffee5637c5883d5d28d4a1e3378697c5015dfd1cdac55e4a893c025e6f
 Size (bastet-0.43.1.tar.gz) = 82802 bytes
 SHA1 (patch-Makefile) = e372e9c19166dbfb4b432e720a0c56990792297e
+SHA1 (patch-Well.hpp) = d4f84a24f39aae1a84d62ad3e33fb9466dc2bbbe
diff --git a/games/bastet/patches/patch-Well.hpp b/games/bastet/patches/patch-Well.hpp
new file mode 100644
index 00000000000..36ffc5cfb69
--- /dev/null
+++ b/games/bastet/patches/patch-Well.hpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-Well.hpp,v 1.1 2016/12/22 11:36:35 joerg Exp $
+
+friend declaration should not contain default arguments.
+
+--- Well.hpp.orig	2016-12-22 10:46:03.217308267 +0000
++++ Well.hpp
+@@ -30,7 +30,8 @@
+ #include <iostream>
+ 
+ namespace Bastet{
+-  
++  long Evaluate(const Well *w, int extralines = 0);
++
+   class GameOver{}; //used as an exception
+ 
+   class WellLine: public std::bitset<WellWidth>{
+@@ -66,7 +67,7 @@ namespace Bastet{
+     LinesCompleted Lock(BlockType t, const BlockPosition &p); //permanently adds a tetromino to the well; returns a bitset of 4 bits where return[i]==1 iff line (start of fb)+i is complete
+     void ClearLines(const LinesCompleted &lc); //removes the given lines from the well (whether they are completed or not)
+     int LockAndClearLines(BlockType t, const BlockPosition &p); //locks, clear lines, returns number of lines cleared
+-    friend long Evaluate(const Well *w, int extralines=0); //for BastetBlockChooser
++    friend long Evaluate(const Well *w, int extralines); //for BastetBlockChooser
+     std::string PrettyPrint() const;
+   };
+   
-- 
cgit v1.2.3