diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-28 21:48:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-03 12:21:03 +0200 |
| commit | c4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d (patch) | |
| tree | 128225fc91bd7da687f965337a49b9b64fbe8a79 /slideshow/source | |
| parent | 5034e8217c9844293dc94e5dff0bdc865ad7a91a (diff) | |
C++11 remove std::unary_function bases from functors
std::unary_function is deprecated since C++11 and removed in C++17
90% done with regexp magic.
removed obsolete <functional> includes.
The std::unary_function base class was used in 3 places:
* chart2/source/tools/DataSeriesHelper.cxx: lcl_MatchesRole
is used in a std::not1 function helper who uses the members
return_type and argument_type.
- replace deprecated std::not1 with a lambda
* chart2/source/tools/ModifyListenerHelper.cxx:
lcl_weakReferenceToSame used the argument_type member in the
operator() parameter.
- inline the parameter type.
* xmloff/source/chart/SchXMLExport.cxx: lcl_SequenceToMapElement
used result_type and argument_type in operator().
- inline the types
Also fix compile error with gcc about finding std::for_each.
Change-Id: I073673beb01410c3108e7d0346d9e7d6b9ad2e2f
Reviewed-on: https://gerrit.libreoffice.org/39358
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'slideshow/source')
| -rw-r--r-- | slideshow/source/engine/animationfactory.cxx | 4 | ||||
| -rw-r--r-- | slideshow/source/inc/eventqueue.hxx | 3 | ||||
| -rw-r--r-- | slideshow/source/inc/tools.hxx | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx index 30449a965d09..607e79b973af 100644 --- a/slideshow/source/engine/animationfactory.cxx +++ b/slideshow/source/engine/animationfactory.cxx @@ -36,8 +36,6 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <functional> - using namespace ::com::sun::star; @@ -578,7 +576,7 @@ namespace slideshow }; //Current c++0x draft (apparently) has std::identity, but not operator() - template<typename T> struct SGI_identity : public std::unary_function<T,T> + template<typename T> struct SGI_identity { T& operator()(T& x) const { return x; } const T& operator()(const T& x) const { return x; } diff --git a/slideshow/source/inc/eventqueue.hxx b/slideshow/source/inc/eventqueue.hxx index 613135b0d1c0..76c7eecbda3c 100644 --- a/slideshow/source/inc/eventqueue.hxx +++ b/slideshow/source/inc/eventqueue.hxx @@ -25,7 +25,6 @@ #include "event.hxx" -#include <functional> #include <queue> #include <vector> @@ -121,7 +120,7 @@ namespace slideshow private: mutable ::osl::Mutex maMutex; - struct EventEntry : public ::std::unary_function<EventEntry, bool> + struct EventEntry { EventSharedPtr pEvent; double nTime; diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index 0b8337764857..646c646e7d62 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -38,7 +38,6 @@ #include "hslcolor.hxx" #include <memory> -#include <functional> #include <cstdlib> #include <string.h> #include <algorithm> @@ -78,7 +77,7 @@ namespace slideshow // xxx todo: remove with boost::hash when 1.33 is available template <typename T> - struct hash : ::std::unary_function<T, ::std::size_t> + struct hash { ::std::size_t operator()( T const& val ) const { return hash_value(val); |