Date: Mon, 30 Mar 2020 09:12:30 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529870 - head/graphics/gtimelapse/files Message-ID: <202003300912.02U9CUjt057679@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Mar 30 09:12:30 2020 New Revision: 529870 URL: https://svnweb.freebsd.org/changeset/ports/529870 Log: graphics/gtimelapse: Unbreak build on FreeBSD >= 12.1 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 Modified: head/graphics/gtimelapse/files/patch-src__gtimelapse.cpp Modified: head/graphics/gtimelapse/files/patch-src__gtimelapse.cpp ============================================================================== --- head/graphics/gtimelapse/files/patch-src__gtimelapse.cpp Mon Mar 30 08:35:23 2020 (r529869) +++ head/graphics/gtimelapse/files/patch-src__gtimelapse.cpp Mon Mar 30 09:12:30 2020 (r529870) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003300912.02U9CUjt057679>