diff options
| author | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-07-20 09:01:49 +0000 |
|---|---|---|
| committer | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-07-20 09:01:49 +0000 |
| commit | 17119392f431c916d4c2e9d0ef60e75f76dcc0ad (patch) | |
| tree | 0ecf30116d415a4ef0063481b71deea00a219cfe /src | |
| parent | Changed arguments and names of selection chemistry functions (diff) | |
| parent | Disambiguate sigc::ptr_fun to fix C++14 compilation. (diff) | |
| download | inkscape-17119392f431c916d4c2e9d0ef60e75f76dcc0ad.tar.gz inkscape-17119392f431c916d4c2e9d0ef60e75f76dcc0ad.zip | |
Merged trunk
(bzr r14954.1.23)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/knot-properties.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/layer-properties.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/lpe-fillet-chamfer-properties.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/lpe-powerstroke-properties.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/dialog/knot-properties.cpp b/src/ui/dialog/knot-properties.cpp index 9c23c33e1..a91a09a4f 100644 --- a/src/ui/dialog/knot-properties.cpp +++ b/src/ui/dialog/knot-properties.cpp @@ -145,7 +145,7 @@ KnotPropertiesDialog::_close() destroy_(); Glib::signal_idle().connect( sigc::bind_return( - sigc::bind(sigc::ptr_fun(&::operator delete), this), + sigc::bind(sigc::ptr_fun<void*, void>(&::operator delete), this), false ) ); diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp index 1b8fbb3f7..5d550ed48 100644 --- a/src/ui/dialog/layer-properties.cpp +++ b/src/ui/dialog/layer-properties.cpp @@ -146,7 +146,7 @@ LayerPropertiesDialog::_close() destroy_(); Glib::signal_idle().connect( sigc::bind_return( - sigc::bind(sigc::ptr_fun(&::operator delete), this), + sigc::bind(sigc::ptr_fun<void*, void>(&::operator delete), this), false ) ); diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp index 5ccee103c..b0cc91868 100644 --- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp +++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp @@ -177,7 +177,7 @@ void FilletChamferPropertiesDialog::_close() destroy_(); Glib::signal_idle().connect( sigc::bind_return( - sigc::bind(sigc::ptr_fun(&::operator delete), this), + sigc::bind(sigc::ptr_fun<void*, void>(&::operator delete), this), false ) ); diff --git a/src/ui/dialog/lpe-powerstroke-properties.cpp b/src/ui/dialog/lpe-powerstroke-properties.cpp index cfc972547..a6dcce907 100644 --- a/src/ui/dialog/lpe-powerstroke-properties.cpp +++ b/src/ui/dialog/lpe-powerstroke-properties.cpp @@ -146,7 +146,7 @@ PowerstrokePropertiesDialog::_close() destroy_(); Glib::signal_idle().connect( sigc::bind_return( - sigc::bind(sigc::ptr_fun(&::operator delete), this), + sigc::bind(sigc::ptr_fun<void*, void>(&::operator delete), this), false ) ); |