DataConversion/SpaceTransform : Avoid std::unary_function

johnhaddon · johnhaddon · commit b01049db967a · 2022-06-09T08:04:54.000+01:00
This was deprecated in C++11 and removed in C++17. It appears to remain available in practice in `libc++` and `libstdc++` but not MSVC.
diff --git a/include/IECore/DataConversion.h b/include/IECore/DataConversion.h
@@ -38,14 +38,12 @@
 #include "boost/static_assert.hpp"
 #include "boost/type_traits/integral_constant.hpp"
 
-#include <functional>
-
 namespace IECore
 {
 
 /// Base class for data conversions
 template<typename F, typename T>
-struct DataConversion : public std::unary_function<F, T>
+struct DataConversion
 {
 	typedef F FromType;
 	typedef T ToType;
diff --git a/include/IECore/SpaceTransform.h b/include/IECore/SpaceTransform.h
@@ -35,15 +35,12 @@
 #ifndef IE_CORE_SPACETRANSFORM_H
 #define IE_CORE_SPACETRANSFORM_H
 
-#include <functional>
-
-
 namespace IECore
 {
 
 /// Base class for data conversions
 template<typename F, typename T>
-struct SpaceTransform : public std::unary_function<F, T>
+struct SpaceTransform
 {
 	typedef F FromType;
 	typedef T ToType;

Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,12 @@`
`38`	`38`	`#include "boost/static_assert.hpp"`
`39`	`39`	`#include "boost/type_traits/integral_constant.hpp"`
`40`	`40`
`41`		`-#include <functional>`
`42`		`-`
`43`	`41`	`namespace IECore`
`44`	`42`	`{`
`45`	`43`
`46`	`44`	`/// Base class for data conversions`
`47`	`45`	`template<typename F, typename T>`
`48`		`-struct DataConversion : public std::unary_function<F, T>`
	`46`	`+struct DataConversion`
`49`	`47`	`{`
`50`	`48`	`typedef F FromType;`
`51`	`49`	`typedef T ToType;`