[Mageia-dev] Update to boost-1.53 ? (libyui fixing)

Mon Apr 8 20:12:06 CEST 2013

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
+-------------- next part --------------
+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.h	2013-01-07 21:19:01.000000000 +0000
++++ libyui-2.42.4-623354b/src/ImplPtr.h	2013-04-08 17:51:10.741171954 +0100
+@@ -41,7 +41,9 @@
+ template<class _Impl>
+ 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(); }
+