From owner-svn-ports-head@FreeBSD.ORG  Thu Aug  8 15:19:26 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 12F26620;
 Thu,  8 Aug 2013 15:19:26 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E47322A8C;
 Thu,  8 Aug 2013 15:19:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r78FJPpM018454;
 Thu, 8 Aug 2013 15:19:25 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r78FJP4B018451;
 Thu, 8 Aug 2013 15:19:25 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201308081519.r78FJP4B018451@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 8 Aug 2013 15:19:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r324399 - head/games/enigma/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Aug 2013 15:19:26 -0000

Author: amdmi3
Date: Thu Aug  8 15:19:25 2013
New Revision: 324399
URL: http://svnweb.freebsd.org/changeset/ports/324399

Log:
  - Fix build with clang

Added:
  head/games/enigma/files/patch-lib-src-enigma-core-ecl__alist.hh   (contents, props changed)
  head/games/enigma/files/patch-lib-src-enigma-core-ecl__dict.hh   (contents, props changed)
  head/games/enigma/files/patch-src-oxyd.cc   (contents, props changed)

Added: head/games/enigma/files/patch-lib-src-enigma-core-ecl__alist.hh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/enigma/files/patch-lib-src-enigma-core-ecl__alist.hh	Thu Aug  8 15:19:25 2013	(r324399)
@@ -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;
+         }
+     };

Added: head/games/enigma/files/patch-lib-src-enigma-core-ecl__dict.hh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/enigma/files/patch-lib-src-enigma-core-ecl__dict.hh	Thu Aug  8 15:19:25 2013	(r324399)
@@ -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")
+         {}
+     };

Added: head/games/enigma/files/patch-src-oxyd.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/enigma/files/patch-src-oxyd.cc	Thu Aug  8 15:19:25 2013	(r324399)
@@ -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");
+         }
+     }