[Libreoffice-commits] core.git: slideshow/source

[Stephan Bergmann]

 slideshow/source/engine/smilfunctionparser.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2b082696754819bb00f3fd382b8a3f376893556d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 5 11:00:22 2017 +0100

    Replace deprecated std::mem_fun et al in slideshow
    
    (as std::mem_fun is gone by default at least from recent libc++ in C++17 mode)
    
    Change-Id: I561f6bda7d2e3aa15ebf3f697f41700082377039
    Reviewed-on: https://gerrit.libreoffice.org/45865
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index d7c5e8befb9f..8b25d849c5cc 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -426,10 +426,10 @@ namespace slideshow
                                     str_p( "$"      )[ ValueTFunctor(                                                              self.getContext()) ]
                               |     str_p( "pi"     )[ ConstantFunctor(M_PI,                                                       self.getContext()) ]
                               |     str_p( "e"      )[ ConstantFunctor(M_E,                                                        self.getContext()) ]
-                              |     str_p( "x"      )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getCenterX),self.getContext()) ]
-                              |     str_p( "y"      )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getCenterY),self.getContext()) ]
-                              |     str_p( "width"  )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getWidth),  self.getContext()) ]
-                              |     str_p( "height" )[ makeShapeBoundsFunctor(::std::mem_fun_ref(&::basegfx::B2DRange::getHeight), self.getContext()) ]
+                              |     str_p( "x"      )[ makeShapeBoundsFunctor(::std::mem_fn(&::basegfx::B2DRange::getCenterX),self.getContext()) ]
+                              |     str_p( "y"      )[ makeShapeBoundsFunctor(::std::mem_fn(&::basegfx::B2DRange::getCenterY),self.getContext()) ]
+                              |     str_p( "width"  )[ makeShapeBoundsFunctor(::std::mem_fn(&::basegfx::B2DRange::getWidth),  self.getContext()) ]
+                              |     str_p( "height" )[ makeShapeBoundsFunctor(::std::mem_fn(&::basegfx::B2DRange::getHeight), self.getContext()) ]
                               ;
 
                         unaryFunction =