Inkscape

Merge lp:~alexhenrie24/inkscape/inkscape into lp:~inkscape.dev/inkscape/trunk

  1. inkscape
  2. Merge into trunk
Proposed by Alex Henrie
Status: Merged
Merged at revision: 15017
Proposed branch: lp:~alexhenrie24/inkscape/inkscape
Merge into: lp:~inkscape.dev/inkscape/trunk
Diff against target: 51 lines (+4/-4)
4 files modified
src/ui/dialog/knot-properties.cpp (+1/-1)
src/ui/dialog/layer-properties.cpp (+1/-1)
src/ui/dialog/lpe-fillet-chamfer-properties.cpp (+1/-1)
src/ui/dialog/lpe-powerstroke-properties.cpp (+1/-1)
To merge this branch: bzr merge lp:~alexhenrie24/inkscape/inkscape
Reviewer Review Type Date Requested Status
Mc code Approve
Review via email: mp+300369@code.launchpad.net

Description of the change

This fixes the compilation for me on Arch Linux, and should fix it for Fedora and upcoming Ubuntu releases too.

To post a comment you must log in.
lp:~alexhenrie24/inkscape/inkscape updated
15017. By Alex Henrie

Disambiguate sigc::ptr_fun to fix C++14 compilation.

Revision history for this message
Mc (mc...) wrote :

Code looks ok, build still works.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ui/dialog/knot-properties.cpp'
2--- src/ui/dialog/knot-properties.cpp 2016-02-07 15:49:01 +0000
3+++ src/ui/dialog/knot-properties.cpp 2016-07-18 17:27:15 +0000
4@@ -145,7 +145,7 @@
5 destroy_();
6 Glib::signal_idle().connect(
7 sigc::bind_return(
8- sigc::bind(sigc::ptr_fun(&::operator delete), this),
9+ sigc::bind(sigc::ptr_fun<void*, void>(&::operator delete), this),
10 false
11 )
12 );
13
14=== modified file 'src/ui/dialog/layer-properties.cpp'
15--- src/ui/dialog/layer-properties.cpp 2014-12-21 21:58:32 +0000
16+++ src/ui/dialog/layer-properties.cpp 2016-07-18 17:27:15 +0000
17@@ -146,7 +146,7 @@
18 destroy_();
19 Glib::signal_idle().connect(
20 sigc::bind_return(
21- sigc::bind(sigc::ptr_fun(&::operator delete), this),
22+ sigc::bind(sigc::ptr_fun<void*, void>(&::operator delete), this),
23 false
24 )
25 );
26
27=== modified file 'src/ui/dialog/lpe-fillet-chamfer-properties.cpp'
28--- src/ui/dialog/lpe-fillet-chamfer-properties.cpp 2015-07-24 18:50:50 +0000
29+++ src/ui/dialog/lpe-fillet-chamfer-properties.cpp 2016-07-18 17:27:15 +0000
30@@ -177,7 +177,7 @@
31 destroy_();
32 Glib::signal_idle().connect(
33 sigc::bind_return(
34- sigc::bind(sigc::ptr_fun(&::operator delete), this),
35+ sigc::bind(sigc::ptr_fun<void*, void>(&::operator delete), this),
36 false
37 )
38 );
39
40=== modified file 'src/ui/dialog/lpe-powerstroke-properties.cpp'
41--- src/ui/dialog/lpe-powerstroke-properties.cpp 2015-05-20 15:51:48 +0000
42+++ src/ui/dialog/lpe-powerstroke-properties.cpp 2016-07-18 17:27:15 +0000
43@@ -146,7 +146,7 @@
44 destroy_();
45 Glib::signal_idle().connect(
46 sigc::bind_return(
47- sigc::bind(sigc::ptr_fun(&::operator delete), this),
48+ sigc::bind(sigc::ptr_fun<void*, void>(&::operator delete), this),
49 false
50 )
51 );