extensions/source/propctrlr/propertyeditor.cxx | 6 +++--- extensions/source/propctrlr/propertyeditor.hxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit e2553f5cc4a3cdcb09c1b291082b81d0a5a43b17 Author: Stephan Bergmann <[email protected]> Date: Tue Dec 5 10:46:46 2017 +0100 Replace deprecated std::mem_fun et al in extensions (as std::mem_fun is gone by default at least from recent libc++ in C++17 mode) Change-Id: I109dd7e04ed2914eb8768bb8139758b5ad60dadc Reviewed-on: https://gerrit.libreoffice.org/45862 Tested-by: Jenkins <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 4f8c355c4439..cb266a4780ce 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -273,7 +273,7 @@ namespace pcr } - void OPropertyEditor::Update(const std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction) + void OPropertyEditor::Update(const std::function<void(OBrowserListBox *)>& _aUpdateFunction) { // forward this to all our pages sal_uInt16 nCount = m_aTabControl->GetPageCount(); @@ -288,12 +288,12 @@ namespace pcr void OPropertyEditor::EnableUpdate() { - Update(std::mem_fun(&OBrowserListBox::EnableUpdate)); + Update(std::mem_fn(&OBrowserListBox::EnableUpdate)); } void OPropertyEditor::DisableUpdate() { - Update(std::mem_fun(&OBrowserListBox::DisableUpdate)); + Update(std::mem_fn(&OBrowserListBox::DisableUpdate)); } diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 8b49ea967e0a..5469e372f795 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -120,7 +120,7 @@ namespace pcr OBrowserPage* getPage( const OUString& _rPropertyName ); const OBrowserPage* getPage( const OUString& _rPropertyName ) const; - void Update(const std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction); + void Update(const std::function<void(OBrowserListBox *)>& _aUpdateFunction); typedef void (OPropertyEditor::*PageOperation)( OBrowserPage&, const void* ); void forEachPage( PageOperation _pOperation ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
