Sure. Merged to release_90 in r369738.
On Thu, Aug 22, 2019 at 5:39 PM Anastasia Stulova <anastasia.stul...@arm.com> wrote: > > Hi Hans, > > > Can this still be merged into the release branch please. > > > Thanks in advance, > > Anastasia > > > > ________________________________ > From: cfe-commits <cfe-commits-boun...@lists.llvm.org> on behalf of Yaxun Liu > via cfe-commits <cfe-commits@lists.llvm.org> > Sent: 22 August 2019 12:18 > To: cfe-commits@lists.llvm.org <cfe-commits@lists.llvm.org> > Subject: r369641 - [OpenCL] Fix declaration of enqueue_marker > > Author: yaxunl > Date: Thu Aug 22 04:18:59 2019 > New Revision: 369641 > > URL: http://llvm.org/viewvc/llvm-project?rev=369641&view=rev > Log: > [OpenCL] Fix declaration of enqueue_marker > > Differential Revision: https://reviews.llvm.org/D66512 > > Modified: > cfe/trunk/lib/Headers/opencl-c.h > > Modified: cfe/trunk/lib/Headers/opencl-c.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/opencl-c.h?rev=369641&r1=369640&r2=369641&view=diff > ============================================================================== > --- cfe/trunk/lib/Headers/opencl-c.h (original) > +++ cfe/trunk/lib/Headers/opencl-c.h Thu Aug 22 04:18:59 2019 > @@ -15350,7 +15350,7 @@ ndrange_t __ovld ndrange_3D(const size_t > ndrange_t __ovld ndrange_3D(const size_t[3], const size_t[3]); > ndrange_t __ovld ndrange_3D(const size_t[3], const size_t[3], const > size_t[3]); > > -int __ovld enqueue_marker(queue_t, uint, const __private clk_event_t*, > __private clk_event_t*); > +int __ovld enqueue_marker(queue_t, uint, const clk_event_t*, clk_event_t*); > > void __ovld retain_event(clk_event_t); > > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits > IMPORTANT NOTICE: The contents of this email and any attachments are > confidential and may also be privileged. If you are not the intended > recipient, please notify the sender immediately and do not disclose the > contents to any other person, use it for any purpose, or store or copy the > information in any medium. Thank you. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits