blob: 5798119b72524e259ad53fa8790411ef4913afc1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-dev] Update to boost-1.53 ? (libyui fixing)
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20Update%20to%20boost-1.53%20%3F%20%28libyui%20fixing%29&In-Reply-To=%3C51630876.1040709%40zen.co.uk%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="024293.html">
<LINK REL="Next" HREF="024123.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-dev] Update to boost-1.53 ? (libyui fixing)</H1>
<B>Barry Jackson</B>
<A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20Update%20to%20boost-1.53%20%3F%20%28libyui%20fixing%29&In-Reply-To=%3C51630876.1040709%40zen.co.uk%3E"
TITLE="[Mageia-dev] Update to boost-1.53 ? (libyui fixing)">zen25000 at zen.co.uk
</A><BR>
<I>Mon Apr 8 20:12:06 CEST 2013</I>
<P><UL>
<LI>Previous message: <A HREF="024293.html">[Mageia-dev] Update to boost-1.53 ? (libyui fixing)
</A></li>
<LI>Next message: <A HREF="024123.html">[Mageia-dev] Update to boost-1.53 ?
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#24305">[ date ]</a>
<a href="thread.html#24305">[ thread ]</a>
<a href="subject.html#24305">[ subject ]</a>
<a href="author.html#24305">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>On 07/04/13 16:57, Angelo Naselli wrote:
><i>
</I>><i> I haven't committed anything at the moment, so you can take this as a
</I>><i> good patch and decide later if going on or not.
</I>><i>
</I>><i> Angelo
</I>><i>
</I>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(); }
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="024293.html">[Mageia-dev] Update to boost-1.53 ? (libyui fixing)
</A></li>
<LI>Next message: <A HREF="024123.html">[Mageia-dev] Update to boost-1.53 ?
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#24305">[ date ]</a>
<a href="thread.html#24305">[ thread ]</a>
<a href="subject.html#24305">[ subject ]</a>
<a href="author.html#24305">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev
mailing list</a><br>
</body></html>
|
