- Fix build with clang

3 files changed, 43 insertions, 0 deletions

diff --git a/games/enigma/files/patch-lib-src-enigma-core-ecl__alist.hh b/games/enigma/files/patch-lib-src-enigma-core-ecl__alist.hh
new file mode 100644
index 000000000000..0029d2ecd18c
--- /dev/null
+++ b/games/enigma/files/patch-lib-src-enigma-core-ecl__alist.hh
@@ -0,0 +1,11 @@
+--- lib-src/enigma-core/ecl_alist.hh.orig	2007-09-08 16:20:05.000000000 +0400
++++ lib-src/enigma-core/ecl_alist.hh	2013-07-10 23:10:11.780119603 +0400
+@@ -61,7 +61,7 @@
+ 	VAL &operator[] (const key_type &key) { 
+             iterator i=find(key);
+             if (i==this->end())
+-                i=insert(this->end(), make_pair(key, VAL()));
++                i=this->insert(this->end(), make_pair(key, VAL()));
+             return i->second;
+         }
+     };
diff --git a/games/enigma/files/patch-lib-src-enigma-core-ecl__dict.hh b/games/enigma/files/patch-lib-src-enigma-core-ecl__dict.hh
new file mode 100644
index 000000000000..1cb2c6268fce
--- /dev/null
+++ b/games/enigma/files/patch-lib-src-enigma-core-ecl__dict.hh
@@ -0,0 +1,10 @@
+--- lib-src/enigma-core/ecl_dict.hh.orig	2007-09-08 16:20:05.000000000 +0400
++++ lib-src/enigma-core/ecl_dict.hh	2013-07-10 23:08:37.858113264 +0400
+@@ -27,6 +27,7 @@
+     extern unsigned hash(const std::string &key);
+ 
+     class XInvalidKey : XGeneric {
++    public:
+ 	XInvalidKey () : XGeneric("invalid dictionary key")
+         {}
+     };
diff --git a/games/enigma/files/patch-src-oxyd.cc b/games/enigma/files/patch-src-oxyd.cc
new file mode 100644
index 000000000000..2efd9145949d
--- /dev/null
+++ b/games/enigma/files/patch-src-oxyd.cc
@@ -0,0 +1,22 @@
+--- src/oxyd.cc.orig	2007-09-08 16:20:02.000000000 +0400
++++ src/oxyd.cc	2013-08-07 20:36:58.150878990 +0400
+@@ -130,7 +130,7 @@
+         }
+     }
+ 
+-    GridLoc to_gridloc (const SignalLocation &a)
++    GridLoc signal_to_gridloc (const SignalLocation &a)
+     {
+         assert (a.getGridType() >= GridType_First &&
+                 a.getGridType() <= GridType_Last);
+@@ -644,8 +644,8 @@
+         int nrec = level.getNumRecipients(sender);
+         for (int irec=0; irec<nrec; ++irec) {
+             SignalLocation recipient = level.getRecipient(sender, irec);
+-            GridLoc src = to_gridloc(sender);
+-            GridLoc dst = to_gridloc(recipient);
++            GridLoc src = signal_to_gridloc(sender);
++            GridLoc dst = signal_to_gridloc(recipient);
+             world::AddSignal (src, dst, "signal");
+         }
+     }