Thursday, January 30, 2025

Re: [llvm 19] boost: fix typo in future.hpp

OK.

On 2025-01-30 4:38 p.m., Theo Buehler wrote:
> This fixes a typo that breaks the build of poedit with LLVM 19.
>
> /usr/local/include/boost/thread/future.hpp:4671:19: error: no member named 'that' in 'run_it<FutureExecutorContinuationSharedState>'; did you mean 'that_'?
> 4671 | that_=x.that;
> | ^~~~
> | that_
> /usr/local/include/boost/thread/future.hpp:4649:55: note: 'that_' declared here
> 4649 | shared_ptr<FutureExecutorContinuationSharedState> that_;
> | ^
>
> Also linked two unmerged PRs hoping one of them will be merged
> at some point.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/boost/Makefile,v
> diff -u -p -r1.149 Makefile
> --- Makefile 7 Jan 2025 07:53:03 -0000 1.149
> +++ Makefile 30 Jan 2025 18:06:13 -0000
> @@ -8,7 +8,7 @@ COMMENT-md= machine-dependent libraries
> VERSION= 1.84.0
> DISTNAME= boost_${VERSION:S/./_/g}
> PKGNAME= boost-${VERSION}
> -REVISION= 5
> +REVISION= 6
> EPOCH= 0
> CATEGORIES= devel
> SITES= https://archives.boost.io/release/${VERSION}/source/
> Index: patches/patch-boost_thread_future_hpp
> ===================================================================
> RCS file: patches/patch-boost_thread_future_hpp
> diff -N patches/patch-boost_thread_future_hpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-boost_thread_future_hpp 30 Jan 2025 18:22:35 -0000
> @@ -0,0 +1,16 @@
> +LLVM 19 build fix
> +https://github.com/boostorg/thread/pull/404
> +https://github.com/boostorg/thread/pull/408
> +
> +Index: boost/thread/future.hpp
> +--- boost/thread/future.hpp.orig
> ++++ boost/thread/future.hpp
> +@@ -4668,7 +4668,7 @@ namespace detail
> + }
> + run_it& operator=(BOOST_THREAD_RV_REF(run_it) x) BOOST_NOEXCEPT {
> + if (this != &x) {
> +- that_=x.that;
> ++ that_=x.that_;
> + x.that_.reset();
> + }
> + return *this;
>

No comments:

Post a Comment