From 879f6d9ecf67ad68a4f2fdf14254048330e4e683 Mon Sep 17 00:00:00 2001
From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Fri, 21 Oct 2011 23:07:53 +0200
Subject: [PATCH] Make mamer compilable

Apparently some non-compliancies that were still accepted under
Ubuntu 8.04 are not accepted anymore.
---
 lasker-2.2.3/bots/mamer/Game.hh           |    4 ++--
 lasker-2.2.3/bots/mamer/Mamer.hh          |    6 ++++--
 lasker-2.2.3/bots/mamer/Player.hh         |    4 ++--
 lasker-2.2.3/bots/mamer/Storage.hh        |    4 ++--
 lasker-2.2.3/bots/mamer/Tourney.hh        |    4 ++--
 lasker-2.2.3/bots/mamer/TourneyPlayers.hh |    4 ++--
 lasker-2.2.3/bots/mamer/User.hh           |    6 ++++--
 lasker-2.2.3/bots/mamer/main.cc           |    7 ++++---
 8 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/lasker-2.2.3/bots/mamer/Game.hh b/lasker-2.2.3/bots/mamer/Game.hh
index cf9f6e0..7e27de7 100644
--- a/lasker-2.2.3/bots/mamer/Game.hh
+++ b/lasker-2.2.3/bots/mamer/Game.hh
@@ -26,8 +26,8 @@
 #ifndef _Game_
 #define _Game_
 
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
 
 extern "C" {
 #include <sys/param.h>
diff --git a/lasker-2.2.3/bots/mamer/Mamer.hh b/lasker-2.2.3/bots/mamer/Mamer.hh
index 73f38a2..92db571 100644
--- a/lasker-2.2.3/bots/mamer/Mamer.hh
+++ b/lasker-2.2.3/bots/mamer/Mamer.hh
@@ -47,8 +47,10 @@
 #ifndef _MAMER_
 #define _MAMER_
 
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
+
+using namespace std;
 
 extern "C" {
 #include <sys/param.h>
diff --git a/lasker-2.2.3/bots/mamer/Player.hh b/lasker-2.2.3/bots/mamer/Player.hh
index 43daac0..2a2be8d 100644
--- a/lasker-2.2.3/bots/mamer/Player.hh
+++ b/lasker-2.2.3/bots/mamer/Player.hh
@@ -29,8 +29,8 @@
 #ifndef _Player_
 #define _Player_
 
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
 
 extern "C" {
 #include <sys/param.h>
diff --git a/lasker-2.2.3/bots/mamer/Storage.hh b/lasker-2.2.3/bots/mamer/Storage.hh
index efb5394..5b5c6ab 100644
--- a/lasker-2.2.3/bots/mamer/Storage.hh
+++ b/lasker-2.2.3/bots/mamer/Storage.hh
@@ -32,8 +32,8 @@
 #ifndef _Storage_
 #define _Storage_
 
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
 
 extern "C" {
 #include <sys/param.h>
diff --git a/lasker-2.2.3/bots/mamer/Tourney.hh b/lasker-2.2.3/bots/mamer/Tourney.hh
index 0abe3ac..7fc71ab 100644
--- a/lasker-2.2.3/bots/mamer/Tourney.hh
+++ b/lasker-2.2.3/bots/mamer/Tourney.hh
@@ -16,8 +16,8 @@
 
 #define log22(x) (log(x)/log(2))
 
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
 
 extern "C" {
 #include <sys/param.h>
diff --git a/lasker-2.2.3/bots/mamer/TourneyPlayers.hh b/lasker-2.2.3/bots/mamer/TourneyPlayers.hh
index 25c3e20..41596b0 100644
--- a/lasker-2.2.3/bots/mamer/TourneyPlayers.hh
+++ b/lasker-2.2.3/bots/mamer/TourneyPlayers.hh
@@ -35,8 +35,8 @@
 #ifndef _TOURNEYPLAYERS_
 #define _TOURNEYPLAYERS_
 
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
 
 extern "C" {
 #include <sys/param.h>
diff --git a/lasker-2.2.3/bots/mamer/User.hh b/lasker-2.2.3/bots/mamer/User.hh
index 9ef55e6..26d41f0 100644
--- a/lasker-2.2.3/bots/mamer/User.hh
+++ b/lasker-2.2.3/bots/mamer/User.hh
@@ -40,8 +40,10 @@
 #ifndef _USER_
 #define _USER_
 
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
+
+using namespace std;
 
 extern "C" {
 #include <sys/param.h>
diff --git a/lasker-2.2.3/bots/mamer/main.cc b/lasker-2.2.3/bots/mamer/main.cc
index 9144604..4895fd4 100644
--- a/lasker-2.2.3/bots/mamer/main.cc
+++ b/lasker-2.2.3/bots/mamer/main.cc
@@ -45,10 +45,11 @@ int main(int argc, char **argv) {
 	    gMamer.Shutdown();
 	}
 	else
-	    cerr << "ERROR: couldn't open server connection!" << endl;
+//	    cerr << "ERROR: couldn't open server connection!" << endl;
+;
     else
-	cerr << "ERROR: couldn't initialize mamer!" << endl;
-
+//	cerr << "ERROR: couldn't initialize mamer!" << endl;
+;
     exit(0);
 } //- End of main
 
-- 
1.7.0.4