Re: [Mageia-dev] Update to boost-1.53 ? (libyui fixing)
On 07/04/13 16:57, Angelo Naselli wrote: I haven't committed anything at the moment, so you can take this as a good patch and decide later if going on or not. Angelo Hi Not had much time to check over weekend. Your last patch fails to apply for some reason, but I will look again - may be something silly. Before I saw your last patch I made one from the upstream git revision, and this applies and builds OK. It is attached. Barry diff -ur libyui-2.42.4-623354b_orig/src/ImplPtr.h libyui-2.42.4-623354b/src/ImplPtr.h --- libyui-2.42.4-623354b_orig/src/ImplPtr.h2013-01-07 21:19:01.0 + +++ libyui-2.42.4-623354b/src/ImplPtr.h 2013-04-08 17:51:10.741171954 +0100 @@ -41,7 +41,9 @@ template class ImplPtr : private boost::noncopyable { +#if defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ) || defined( BOOST_NO_CXX11_NULLPTR ) typedef typename boost::scoped_ptr<_Impl>::unspecified_bool_type unspecified_bool_type; +#endif public: typedef _Impl element_type; @@ -55,7 +57,11 @@ void swap( ImplPtr rhs ) { _impl.swap( rhs._impl ); } public: +#if defined( BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS ) || defined( BOOST_NO_CXX11_NULLPTR ) operator unspecified_bool_type() const { return _impl; } +#else +explicit operator bool () const { return _impl.get() != 0; } +#endif const _Impl & operator*() const { return *_impl; } const _Impl * operator->() const { return _impl.get(); }
Re: [Mageia-dev] Update to boost-1.53 ? (libyui fixing)
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 > Anyway atm only who is working on AdminPanel should really use > libyui in mageia, so i can always provide a fixing later if i find > problems. I made a different patch and sent to libyui devs, that approved it: https://github.com/libyui/libyui/commit/cfcc3d472db6a43a7a8d5edc0187026c9fabe370 Cheers, Angelo -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlFirlgACgkQqEs9DA4DquDA7wCgnBApTELWmqNoG0KxqcSPucFa GPQAn13AEInwq1W/kAlKJ/kYMY3/HIz8 =EEw2 -END PGP SIGNATURE-
Re: [Mageia-dev] Update to boost-1.53 ? (libyui fixing)
Il 06/04/2013 19:09, Barry Jackson ha scritto: > On 05/04/13 00:08, Barry Jackson wrote: >> On 04/04/13 14:24, Angelo Naselli wrote: >> >>> Barry i cannot test this now, but if i understood correctly the problem >>> and talking to libyui developer this patch should work. >>> >>> Can you test it and tell me if it's ok please? >>> >>> Thanks >>> Angelo >> >> I'll try it tomorrow - been out most of the day. >> > Nope it still fails with the patch: > > http://mtf.no-ip.co.uk/pub/linux/barjac/distrib/cauldron/x86_64/core/release/log/libyui-2.42.4-0.git20130107.3.mga3.src.rpm/build.0.20130406163948.log > Attached patch definitely fixes the compile problem, but I'm not sure it's ok from the point of view of who uses libyui. I will ask for this fixing to libyui developers, because if i include it works in mga2 not in mga3, so also the compiler seems to use cxx11, and that means libyui should probably fix the ImplPtr implementation, also for back compatibility. Anyway atm only who is working on AdminPanel should really use libyui in mageia, so i can always provide a fixing later if i find problems. I haven't committed anything at the moment, so you can take this as a good patch and decide later if going on or not. Angelo diff --git a/src/ImplPtr.h b/src/ImplPtr.h index be1cea9..fb0c43c 100644 --- a/src/ImplPtr.h +++ b/src/ImplPtr.h @@ -25,6 +25,9 @@ #ifndef ImplPtr_h #define ImplPtr_h +//#include +#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS + #include #include