mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-08 06:48:28 +00:00
Code Issues Releases Activity

graphics/gtimelapse: Unbreak build on FreeBSD >= 12.1

Browse Source 
gtimelapse.cpp:753:2: error: reference to 'thread' is ambiguous
        thread = CreateThread();
        ^
./globals.h:23:18: note: candidate found by name lookup is 'thread'
extern MyThread *thread;
                 ^
/usr/include/c++/v1/__threading_support:397:24: note: candidate found by name lookup is 'std::__1::thread'
class _LIBCPP_TYPE_VIS thread;
                       ^

http://beefy6.nyi.freebsd.org/data/121amd64-default/529299/logs/errors/gtimelapse-0.1_16.log
This commit is contained in:
Tobias Kortkamp 2020-03-30 09:12:30 +00:00
parent 948b7d0f40
commit 5592a99bba
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=529870
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
graphics/gtimelapse/files/patch-src__gtimelapse.cpp
View File

@ -1,6 +1,6 @@
--- src/gtimelapse.cpp.orig 2009-06-08 12:13:59 UTC
+++ src/gtimelapse.cpp
@@ -155,7 +155,11 @@ wxPanel *display_widgets (wxPanel *panel
@@ -155,7 +155,11 @@ wxPanel *display_widgets (wxPanel *panel, CameraWidget
//cout << "type: RADIO" << endl;
//cout << "current: " << current << endl;
@ -12,7 +12,7 @@
for ( i=0; i<cnt; i++) {
const char *choice;
@@ -165,6 +169,10 @@ wxPanel *display_widgets (wxPanel *panel
@@ -165,6 +169,10 @@ wxPanel *display_widgets (wxPanel *panel, CameraWidget
choices[i] = mystring;
}
@ -23,3 +23,15 @@
wxString title(label, wxConvUTF8);
wxString default_choice(current, wxConvUTF8);
wxString choice_label(uselabel, wxConvUTF8);
@@ -742,9 +750,9 @@ void MyFrame::StartCapture(wxCommandEvent& event){
button2->Disable();
button4->Enable();
- thread = CreateThread();
+ ::thread = CreateThread();
- if ( thread->Run() != wxTHREAD_NO_ERROR ){
+ if ( ::thread->Run() != wxTHREAD_NO_ERROR ){
wxLogError(wxT("Can't start thread!"));
}else{
//cout << "Thread started." << endl;