Merge pull request #216 from sergiopasra/cpp17

Fix removed structures in c++17
guaix-ucm · Nov 2, 2023 · 83b6dde · 83b6dde
2 parents 47edec6 + 70986ef
commit 83b6dde
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 59 deletions.
diff --git a/src/numina/array/src/functional.h b/src/numina/array/src/functional.h
diff --git a/src/numina/array/src/nu_combine_methods.cc b/src/numina/array/src/nu_combine_methods.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2014 Universidad Complutense de Madrid
+ * Copyright 2008-2023 Universidad Complutense de Madrid
  *
  * This file is part of Numina
  *
@@ -23,7 +23,6 @@
 #include <cmath>
 
 #include "nu_combine_defs.h"
-#include "functional.h"
 #include "operations.h"
 #include "zip_iterator.h"
 

diff --git a/src/numina/array/src/operations.h b/src/numina/array/src/operations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2014 Universidad Complutense de Madrid
+ * Copyright 2008-2023 Universidad Complutense de Madrid
  *
  * This file is part of Numina
  *
@@ -295,7 +295,7 @@ inline std::pair<Iterator, Iterator> reject_min_max(Iterator begin,
 // if the first component of the first is less than the first component
 // of the second std::pair
 template<typename T, typename U>
-struct LessPair1st : public std::binary_function<T,U,bool> {
+struct LessPair1st {
   bool operator()(const T& a, const U& b) const {
     return a.first < b.first;
   }
@@ -305,7 +305,7 @@ struct LessPair1st : public std::binary_function<T,U,bool> {
 // is inside the range (low, high)
 // equivalent to return (low < x.first) && (high > x.first);
 template<typename T>
-class RangePair1st : public std::unary_function<T,bool> {
+class RangePair1st {
 public:
   RangePair1st(double low, double high) : m_low(low), m_high(high)
   {}