Attachment 177194 Details for Bug 214469 – fix

[patch] fix

facter.boost162.diff (text/plain), 1.94 KB, created by Jan Beich on 2016-11-20 03:06:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-11-20 03:06:32 UTC

Size: 1.94 KB

patch

obsolete

>From ab8c4fdcb6b9806c1246781c88dfe2c10cfe862b Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 20 Nov 2016 02:15:37 +0000
>Subject: sysutils/facter: unbreak with boost 1.62
>
>vendor/leatherman/logging/src/logging.cc:75:44: error: no matching constructor for initialization of 'sink_t' (aka 'synchronous_sink<leatherman::logging::color_writer>')
>        boost::shared_ptr<sink_t> sink(new sink_t(&dst));
>                                           ^      ~~~~
>
>Submitted by:	antoine
>Obtained from:	upstream
>Approved by:	portmgr blanket
>---
> .../patch-vendor_leatherman_logging_src_logging.cc    | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
> create mode 100644 sysutils/facter/files/patch-vendor_leatherman_logging_src_logging.cc
>
>diff --git a/sysutils/facter/files/patch-vendor_leatherman_logging_src_logging.cc b/sysutils/facter/files/patch-vendor_leatherman_logging_src_logging.cc
>new file mode 100644
>index 0000000..46c863d
>--- /dev/null
>+++ b/sysutils/facter/files/patch-vendor_leatherman_logging_src_logging.cc
>@@ -0,0 +1,19 @@
>+(LTH-115) Fix Boost.Log sink initialization with Boost 1.62
>+
>+In Boost 1.62, the way sink argument forwarding appears to have changed
>+in such a way that it failed to identify the implicit creation of a
>+color_writer. Switch to explicitly creating the color_writer sink.
>+
>+https://github.com/puppetlabs/leatherman/commit/e8196d55ecac7f2bf3aa5cb0aefef0122e63db21
>+
>+--- vendor/leatherman/logging/src/logging.cc.orig	2015-11-25 00:14:00 UTC
>++++ vendor/leatherman/logging/src/logging.cc
>+@@ -72,7 +72,7 @@ namespace leatherman { namespace logging
>+         core->remove_all_sinks();
>+ 
>+         using sink_t = sinks::synchronous_sink<color_writer>;
>+-        boost::shared_ptr<sink_t> sink(new sink_t(&dst));
>++        boost::shared_ptr<sink_t> sink = boost::make_shared<sink_t>(boost::make_shared<color_writer>(&dst));
>+         core->add_sink(sink);
>+ 
>+ #if (!defined(__sun) && !defined(_AIX)) || !defined(__GNUC__)

Actions: View | Diff

Attachments on bug 214469: 177194