git: 23306f7a0a73 - main - games/xye: Fix build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 18 Dec 2024 20:51:32 UTC
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=23306f7a0a7359e340e232cf3f839d690f32e158 commit 23306f7a0a7359e340e232cf3f839d690f32e158 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-12-18 20:51:00 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-12-18 20:51:00 +0000 games/xye: Fix build Reported by: fallout --- games/xye/files/patch-src_xye__script.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/games/xye/files/patch-src_xye__script.cpp b/games/xye/files/patch-src_xye__script.cpp new file mode 100644 index 000000000000..b95da5057445 --- /dev/null +++ b/games/xye/files/patch-src_xye__script.cpp @@ -0,0 +1,16 @@ +- fix compilation: +- error: reference to 'lock' is ambiguous +- note: candidate found by name lookup is 'lock' +- note: candidate found by name lookup is 'std::lock' + +--- src/xye_script.cpp.orig 2012-09-15 20:21:06 UTC ++++ src/xye_script.cpp +@@ -859,7 +859,7 @@ void Load_Lock(TiXmlElement* el) + el->QueryIntAttribute("x",&LastX); + el->QueryIntAttribute("y",&LastY); + blockcolor c=GetElementBlockColor(el); +- lock* bc=new lock(game::SquareN(LastX,LastY),c); ++ ::lock* bc=new ::lock(game::SquareN(LastX,LastY),c); + } + + /* Load Key*/