[liblemon] Apply patches for C++20 compatibility

Author: cbentejac

ports/liblemon/cpp-20-adaptors.patch

@@ -0,0 +1,13 @@
+diff --git a/lemon/adaptors.h b/lemon/adaptors.h
+index 1a40f8e..ffeb12d 100644
+--- a/lemon/adaptors.h
++++ b/lemon/adaptors.h
+@@ -37,7 +37,7 @@
+ 
+ namespace lemon {
+ 
+-#ifdef _MSC_VER
++#if defined _MSC_VER and __cplusplus < 202002L
+ #define LEMON_SCOPE_FIX(OUTER, NESTED) OUTER::NESTED
+ #else
+ #define LEMON_SCOPE_FIX(OUTER, NESTED) typename OUTER::template NESTED

ports/liblemon/cpp-20-arraymap.patch

@@ -0,0 +1,106 @@
+diff --git a/lemon/bits/array_map.h b/lemon/bits/array_map.h
+index 355ee00..c3992cf 100644
+--- a/lemon/bits/array_map.h
++++ b/lemon/bits/array_map.h
+@@ -88,7 +88,7 @@ namespace lemon {
+       Item it;
+       for (nf->first(it); it != INVALID; nf->next(it)) {
+         int id = nf->id(it);;
+-        allocator.construct(&(values[id]), Value());
++        std::allocator_traits<Allocator>::construct(allocator, &(values[id]), Value());
+       }
+     }
+ 
+@@ -102,7 +102,7 @@ namespace lemon {
+       Item it;
+       for (nf->first(it); it != INVALID; nf->next(it)) {
+         int id = nf->id(it);;
+-        allocator.construct(&(values[id]), value);
++        std::allocator_traits<Allocator>::construct(allocator, &(values[id]), value);
+       }
+     }
+ 
+@@ -121,7 +121,7 @@ namespace lemon {
+       Item it;
+       for (nf->first(it); it != INVALID; nf->next(it)) {
+         int id = nf->id(it);;
+-        allocator.construct(&(values[id]), copy.values[id]);
++        std::allocator_traits<Allocator>::construct(allocator, &(values[id]), copy.values[id]);
+       }
+     }
+ 
+@@ -218,15 +218,15 @@ namespace lemon {
+         for (nf->first(it); it != INVALID; nf->next(it)) {
+           int jd = nf->id(it);;
+           if (id != jd) {
+-            allocator.construct(&(new_values[jd]), values[jd]);
+-            allocator.destroy(&(values[jd]));
++            std::allocator_traits<Allocator>::construct(allocator, &(new_values[jd]), values[jd]);
++            std::allocator_traits<Allocator>::destroy(allocator, &(values[jd]));
+           }
+         }
+         if (capacity != 0) allocator.deallocate(values, capacity);
+         values = new_values;
+         capacity = new_capacity;
+       }
+-      allocator.construct(&(values[id]), Value());
++      std::allocator_traits<Allocator>::construct(allocator, &(values[id]), Value());
+     }
+ 
+     // \brief Adds more new keys to the map.
+@@ -260,8 +260,8 @@ namespace lemon {
+             }
+           }
+           if (found) continue;
+-          allocator.construct(&(new_values[id]), values[id]);
+-          allocator.destroy(&(values[id]));
++          std::allocator_traits<Allocator>::construct(allocator, &(new_values[id]), values[id]);
++          std::allocator_traits<Allocator>::destroy(allocator, &(values[id]));
+         }
+         if (capacity != 0) allocator.deallocate(values, capacity);
+         values = new_values;
+@@ -269,7 +269,7 @@ namespace lemon {
+       }
+       for (int i = 0; i < int(keys.size()); ++i) {
+         int id = nf->id(keys[i]);
+-        allocator.construct(&(values[id]), Value());
++        std::allocator_traits<Allocator>::construct(allocator, &(values[id]), Value());
+       }
+     }
+ 
+@@ -279,7 +279,7 @@ namespace lemon {
+     // and it overrides the erase() member function of the observer base.
+     virtual void erase(const Key& key) {
+       int id = Parent::notifier()->id(key);
+-      allocator.destroy(&(values[id]));
++      std::allocator_traits<Allocator>::destroy(allocator, &(values[id]));
+     }
+ 
+     // \brief Erase more keys from the map.
+@@ -289,7 +289,7 @@ namespace lemon {
+     virtual void erase(const std::vector<Key>& keys) {
+       for (int i = 0; i < int(keys.size()); ++i) {
+         int id = Parent::notifier()->id(keys[i]);
+-        allocator.destroy(&(values[id]));
++        std::allocator_traits<Allocator>::destroy(allocator, &(values[id]));
+       }
+     }
+ 
+@@ -303,7 +303,7 @@ namespace lemon {
+       Item it;
+       for (nf->first(it); it != INVALID; nf->next(it)) {
+         int id = nf->id(it);;
+-        allocator.construct(&(values[id]), Value());
++        std::allocator_traits<Allocator>::construct(allocator, &(values[id]), Value());
+       }
+     }
+ 
+@@ -317,7 +317,7 @@ namespace lemon {
+         Item it;
+         for (nf->first(it); it != INVALID; nf->next(it)) {
+           int id = nf->id(it);
+-          allocator.destroy(&(values[id]));
++          std::allocator_traits<Allocator>::destroy(allocator, &(values[id]));
+         }
+         allocator.deallocate(values, capacity);
+         capacity = 0;

ports/liblemon/portfile.cmake

@@ -14,12 +14,13 @@ vcpkg_extract_source_archive(
     SOURCE_BASE "${VERSION}"
     PATCHES
         fix-cmake.patch
+        cpp-20-arraymap.patch
+        cpp-20-adaptors.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DCMAKE_CXX_STANDARD=14
         -DLEMON_ENABLE_GLPK=OFF
         -DLEMON_ENABLE_ILOG=OFF
         -DLEMON_ENABLE_COIN=OFF