Tighten up C++ to work with clang.

3 files changed, 41 insertions, 0 deletions

diff --git a/games/seahaven/files/patch-auto-C b/games/seahaven/files/patch-auto-C
new file mode 100644
index 000000000000..6de6bb3c8686
--- /dev/null
+++ b/games/seahaven/files/patch-auto-C
@@ -0,0 +1,18 @@
+diff -ru work/seahaven-1.60/auto.C work.new/seahaven-1.60/auto.C
+--- auto.C	2011-07-10 00:23:59.000000000 -0600
++++ auto.C	2014-02-25 15:10:30.000000000 -0700
+@@ -486,12 +486,10 @@
+ 
+ class MoveCard : public Move {
+     Card& from;
+-    MoveCardToMemberFunction mcmf;
+   public:
+-    MoveCard(Card& f, Dest& d, MoveCardToMemberFunction mf)
+-	: Move(d), from(f), mcmf(mf) { }
++    MoveCard(Card& f, Dest& d)
++	: Move(d), from(f) { }
+     void DoIt() { dest.MoveTo(from); }
+-//  void DoIt() { dest.*mcmf(from); }
+ };
+ 
+ class MoveCardRange : public Move {
diff --git a/games/seahaven/files/patch-main-C b/games/seahaven/files/patch-main-C
new file mode 100644
index 000000000000..d8cb6fef7d44
--- /dev/null
+++ b/games/seahaven/files/patch-main-C
@@ -0,0 +1,11 @@
+diff -ru work/seahaven-1.60/main.C work.new/seahaven-1.60/main.C
+--- main.C	2011-07-10 19:35:12.000000000 -0600
++++ main.C	2014-02-25 15:07:08.000000000 -0700
+@@ -31,6 +31,7 @@
+     exit(0);
+ }
+ 
++int
+ main(int argc, char **argv) {
+     const char *displayname = NULL;
+     const char *name = NULL;
diff --git a/games/seahaven/files/patch-seahaven-h b/games/seahaven/files/patch-seahaven-h
new file mode 100644
index 000000000000..7ce7d700ca78
--- /dev/null
+++ b/games/seahaven/files/patch-seahaven-h
@@ -0,0 +1,12 @@
+diff -ru work/seahaven-1.60/seahaven.h work.new/seahaven-1.60/seahaven.h
+--- seahaven.h	2011-07-10 18:42:44.000000000 -0600
++++ seahaven.h	2014-02-25 15:07:22.000000000 -0700
+@@ -117,7 +117,7 @@
+     const char *message;
+ };
+ 
+-typedef struct ScoreRec *Score;
++typedef class ScoreRec *Score;
+ 
+ class UndoListRec {
+   public: