path: root/unoxml
diff options
authorJochen Nitschke <>2017-06-28 21:48:22 +0200
committerStephan Bergmann <>2017-07-03 12:21:03 +0200
commitc4ddf6cd6d97e7ce7c2e63e4d393bbeffcb34e4d (patch)
tree128225fc91bd7da687f965337a49b9b64fbe8a79 /unoxml
parent5034e8217c9844293dc94e5dff0bdc865ad7a91a (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: Reviewed-by: Stephan Bergmann <> Tested-by: Stephan Bergmann <>
Diffstat (limited to 'unoxml')
1 files changed, 1 insertions, 2 deletions
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 920c52aa1327..1b2fa29c2fe5 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -25,7 +25,6 @@
#include <memory>
#include <set>
#include <iterator>
-#include <functional>
#include <algorithm>
#include <boost/optional.hpp>
@@ -584,7 +583,7 @@ librdf_QuerySelectResult::hasMoreElements()
return !librdf_query_results_finished(m_pQueryResult.get());
-class NodeArrayDeleter : public std::unary_function<librdf_node**, void>
+class NodeArrayDeleter
const int m_Count;