Date: Thu, 8 Aug 2013 15:19:25 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324399 - head/games/enigma/files Message-ID: <201308081519.r78FJP4B018451@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"); + } + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308081519.r78FJP4B018451>