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
|
Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192]
helo=mx.sourceforge.net)
by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76)
(envelope-from <luke@dashjr.org>) id 1QuSFl-0000X8-JC
for bitcoin-development@lists.sourceforge.net;
Fri, 19 Aug 2011 16:49:05 +0000
X-ACL-Warn:
Received: from zinan.dashjr.org ([173.242.112.54])
by sog-mx-2.v43.ch3.sourceforge.com with esmtp (Exim 4.76)
id 1QuSFg-0003RZ-Fg for bitcoin-development@lists.sourceforge.net;
Fri, 19 Aug 2011 16:49:05 +0000
Received: from ishibashi.localnet (fl-184-4-160-40.dhcp.embarqhsd.net
[184.4.160.40]) (Authenticated sender: luke-jr)
by zinan.dashjr.org (Postfix) with ESMTPSA id 976A2560537
for <bitcoin-development@lists.sourceforge.net>;
Fri, 19 Aug 2011 16:48:52 +0000 (UTC)
From: "Luke-Jr" <luke@dashjr.org>
To: bitcoin-development@lists.sourceforge.net
Date: Fri, 19 Aug 2011 12:48:33 -0400
User-Agent: KMail/1.13.7 (Linux/2.6.39-gentoo; KDE/4.6.4; x86_64; ; )
X-PGP-Key-Fingerprint: CE5A D56A 36CC 69FA E7D2 3558 665F C11D D53E 9583
X-PGP-Key-ID: 665FC11DD53E9583
X-PGP-Keyserver: x-hkp://subkeys.pgp.net
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
boundary="Boundary-00=_kPpTOFP8IFnM1mH"
Message-Id: <201108191248.36093.luke@dashjr.org>
X-Spam-Score: -1.0 (-)
X-Spam-Report: Spam Filtering performed by mx.sourceforge.net.
See http://spamassassin.org/tag/ for more details.
-1.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay
domain
X-Headers-End: 1QuSFg-0003RZ-Fg
Subject: [Bitcoin-development] [PATCH] Boost filesystem v3 support
X-BeenThere: bitcoin-development@lists.sourceforge.net
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: <bitcoin-development.lists.sourceforge.net>
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/bitcoin-development>,
<mailto:bitcoin-development-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development>
List-Post: <mailto:bitcoin-development@lists.sourceforge.net>
List-Help: <mailto:bitcoin-development-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/bitcoin-development>,
<mailto:bitcoin-development-request@lists.sourceforge.net?subject=subscribe>
X-List-Received-Date: Fri, 19 Aug 2011 16:49:05 -0000
--Boundary-00=_kPpTOFP8IFnM1mH
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
This patch conditionally adapts the one line needed to support boost
filesystem version 3 (default in Boost 1.46+ and required for 1.48+)
I have tested it with Boost 1.41.0 to verify it still works on these older
versions too.
--Boundary-00=_kPpTOFP8IFnM1mH
Content-Type: text/x-patch; charset="UTF-8";
name="0001-Support-for-boost-filesystem-version-3.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="0001-Support-for-boost-filesystem-version-3.patch"
=46rom 1012103c4e7c24177f4ee7e15a64e5be5fec35ff Mon Sep 17 00:00:00 2001
=46rom: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 19 Aug 2011 12:45:27 -0400
Subject: [PATCH] Support for boost filesystem version 3
=2D--
src/ui.cpp | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/ui.cpp b/src/ui.cpp
index 372808f..a5252f8 100644
=2D-- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1808,7 +1808,11 @@ void SetStartOnSystemStartup(bool fAutoStart)
{
if (!fAutoStart)
{
+#if defined(BOOST_FILESYSTEM_VERSION) && BOOST_FILESYSTEM_VERSION >=3D 3
+ unlink(GetAutostartFilePath().string().c_str());
+#else
unlink(GetAutostartFilePath().native_file_string().c_str());
+#endif
}
else
{
=2D-=20
1.7.3.4
--Boundary-00=_kPpTOFP8IFnM1mH--
|
