1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

games/dangerdeep: Unbreak build on FreeBSD >= 12.1

src/subsim.cpp:1739:2: error: reference to 'thread' is ambiguous
        thread::auto_ptr<music> mmusic(new music(use_sound));
        ^
src/thread.h:37:7: note: candidate found by name lookup is 'thread'
class thread
      ^
/usr/include/c++/v1/__threading_support:397:24: note: candidate found by name lookup is 'std::__1::thread'
class _LIBCPP_TYPE_VIS thread;
                       ^
2 warnings and 1 error generated.

http://beefy6.nyi.freebsd.org/data/121amd64-default/529299/logs/errors/dangerdeep-0.3.0_14.log
This commit is contained in:
Tobias Kortkamp 2020-03-29 10:16:27 +00:00
parent 8ae5316825
commit 0aab853ca6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=529788
2 changed files with 32 additions and 3 deletions

View File

@ -1,6 +1,6 @@
--- ./src/subsim.cpp.orig 2007-06-11 11:16:23.000000000 -0400
+++ ./src/subsim.cpp 2014-08-11 09:56:15.000000000 -0400
@@ -31,6 +31,7 @@
--- src/subsim.cpp.orig 2007-06-11 15:16:23 UTC
+++ src/subsim.cpp
@@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston,
#else
#include "oglext/OglExt.h"
#endif
@ -8,3 +8,12 @@
#include <glu.h>
#include <SDL.h>
#include <SDL_net.h>
@@ -1735,7 +1736,7 @@ int mymain(list<string>& args)
glEnable(GL_LIGHT0);
// create and start thread for music handling.
- thread::auto_ptr<music> mmusic(new music(use_sound));
+ ::thread::auto_ptr<music> mmusic(new music(use_sound));
mmusic->start();
reset_loading_screen();

View File

@ -0,0 +1,20 @@
--- src/coastmap.h.orig 2020-03-29 09:04:12 UTC
+++ src/coastmap.h
@@ -151,7 +151,7 @@ class coastmap
void process_coastline(int x, int y);
void process_segment(int x, int y);
- class worker : public thread
+ class worker : public ::thread
{
coastmap& cm;
public:
@@ -163,7 +163,7 @@ class coastmap
}
};
- thread::auto_ptr<worker> myworker;
+ ::thread::auto_ptr<worker> myworker;
void construction_threaded();
public: