public inbox for bitcoindev@googlegroups.com
 help / color / mirror / Atom feed
From: "Luke-Jr" <luke@dashjr•org>
To: bitcoin-development@lists•sourceforge.net
Subject: [Bitcoin-development] [PATCH] Boost filesystem v3 support
Date: Fri, 19 Aug 2011 12:48:33 -0400	[thread overview]
Message-ID: <201108191248.36093.luke@dashjr.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

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.

[-- Attachment #2: 0001-Support-for-boost-filesystem-version-3.patch --]
[-- Type: text/x-patch, Size: 771 bytes --]

From 1012103c4e7c24177f4ee7e15a64e5be5fec35ff Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios•org>
Date: Fri, 19 Aug 2011 12:45:27 -0400
Subject: [PATCH] Support for boost filesystem version 3

---
 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
--- 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 >= 3
+        unlink(GetAutostartFilePath().string().c_str());
+#else
         unlink(GetAutostartFilePath().native_file_string().c_str());
+#endif
     }
     else
     {
-- 
1.7.3.4


             reply	other threads:[~2011-08-19 16:49 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-19 16:48 Luke-Jr [this message]
2011-08-24 19:19 ` Jeff Garzik
2011-08-24 19:21   ` Luke-Jr
2011-08-24 19:29     ` Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201108191248.36093.luke@dashjr.org \
    --to=luke@dashjr$(echo .)org \
    --cc=bitcoin-development@lists$(echo .)sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox