From 793134d1ba38e86ca900c502801d46634cbad5f8 Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <guilhem.lavaux@iap.fr>
Date: Sun, 20 Jun 2021 15:41:21 +0200
Subject: [PATCH] Update patch

---
 external/patch-omptl | 132 +++++++++++++++++++++++++++++++------------
 1 file changed, 96 insertions(+), 36 deletions(-)

diff --git a/external/patch-omptl b/external/patch-omptl
index 8d5887b..5a40388 100644
--- a/external/patch-omptl
+++ b/external/patch-omptl
@@ -1,6 +1,6 @@
-diff -ur omptl.orig/omptl_algorithm omptl/omptl_algorithm
---- omptl.orig/omptl_algorithm	2017-01-16 14:58:37.996690639 +0100
-+++ omptl/omptl_algorithm	2017-01-16 15:00:26.678641720 +0100
+diff -ur omptl.old/algorithm omptl/algorithm
+--- omptl.old/algorithm	2012-04-22 16:29:41.000000000 +0200
++++ omptl/algorithm	2021-06-20 15:40:29.000000000 +0200
 @@ -20,7 +20,7 @@
  #define OMPTL_ALGORITHM 1
  
@@ -22,23 +22,9 @@ diff -ur omptl.orig/omptl_algorithm omptl/omptl_algorithm
  #endif
  
  #endif /* OMPTL_ALGORITHM */
-diff -ur omptl.orig/omptl_algorithm_par.h omptl/omptl_algorithm_par.h
---- omptl.orig/omptl_algorithm_par.h	2017-01-16 14:58:37.996690639 +0100
-+++ omptl/omptl_algorithm_par.h	2017-01-16 14:59:57.974126410 +0100
-@@ -21,8 +21,8 @@
- #include <cmath>
- #include <cstdlib>
- 
--#include <omptl/omptl_tools.h>
--#include <omptl/omptl_numeric>
-+#include "omptl_tools.h"
-+#include "omptl_numeric"
- 
- #include <iterator>
- 
-diff -ur omptl.orig/omptl_numeric omptl/omptl_numeric
---- omptl.orig/omptl_numeric	2017-01-16 14:58:37.996690639 +0100
-+++ omptl/omptl_numeric	2017-01-16 15:00:57.051186974 +0100
+diff -ur omptl.old/numeric omptl/numeric
+--- omptl.old/numeric	2012-04-22 16:29:41.000000000 +0200
++++ omptl/numeric	2021-06-20 15:40:29.000000000 +0200
 @@ -19,7 +19,7 @@
  #define OMPTL_NUMERIC 1
  
@@ -63,9 +49,83 @@ diff -ur omptl.orig/omptl_numeric omptl/omptl_numeric
 +#include "omptl_numeric_extensions.h"
  
  #endif /* OMPTL_NUMERIC */
-diff -ur omptl.orig/omptl_numeric_extensions.h omptl/omptl_numeric_extensions.h
---- omptl.orig/omptl_numeric_extensions.h	2017-01-16 14:58:37.996690639 +0100
-+++ omptl/omptl_numeric_extensions.h	2017-01-16 14:59:21.549472508 +0100
+diff -ur omptl.old/omptl_algorithm omptl/omptl_algorithm
+--- omptl.old/omptl_algorithm	2012-04-22 16:29:41.000000000 +0200
++++ omptl/omptl_algorithm	2021-06-20 15:40:29.000000000 +0200
+@@ -20,7 +20,7 @@
+ #define OMPTL_ALGORITHM 1
+ 
+ #include <algorithm>
+-#include <omptl/omptl>
++#include "omptl"
+ 
+ namespace omptl
+ {
+@@ -553,9 +553,9 @@
+ } // namespace omptl
+ 
+ #ifdef _OPENMP
+-  #include <omptl/omptl_algorithm_par.h>
++  #include "omptl_algorithm_par.h"
+ #else
+-  #include <omptl/omptl_algorithm_ser.h>
++  #include "omptl_algorithm_ser.h"
+ #endif
+ 
+ #endif /* OMPTL_ALGORITHM */
+diff -ur omptl.old/omptl_algorithm_par.h omptl/omptl_algorithm_par.h
+--- omptl.old/omptl_algorithm_par.h	2012-04-22 16:29:41.000000000 +0200
++++ omptl/omptl_algorithm_par.h	2021-06-20 15:40:50.000000000 +0200
+@@ -21,8 +21,8 @@
+ #include <cmath>
+ #include <cstdlib>
+ 
+-#include <omptl/omptl_tools.h>
+-#include <omptl/omptl_numeric>
++#include "omptl_tools.h"
++#include "omptl_numeric"
+ 
+ #include <iterator>
+ 
+@@ -1700,7 +1700,7 @@
+ 
+ 	std::vector<char> pivot_used(pivots.size(), false); // can't be bool due to parallel write
+ 
+-	const unsigned max_depth = std::floor(std::tr1::log2(P));
++	const unsigned max_depth = unsigned(std::floor(std::log2(P)));
+ 	assert(1u << max_depth <= P);
+ 	for (unsigned i = 0; i < max_depth; ++i)
+ 	{
+diff -ur omptl.old/omptl_numeric omptl/omptl_numeric
+--- omptl.old/omptl_numeric	2012-04-22 16:29:41.000000000 +0200
++++ omptl/omptl_numeric	2021-06-20 15:40:29.000000000 +0200
+@@ -19,7 +19,7 @@
+ #define OMPTL_NUMERIC 1
+ 
+ #include <numeric>
+-#include <omptl/omptl>
++#include "omptl"
+ 
+ namespace omptl
+ {
+@@ -73,11 +73,11 @@
+ } // namespace omptl
+ 
+ #ifdef _OPENMP
+-  #include <omptl/omptl_numeric_par.h>
++  #include "omptl_numeric_par.h"
+ #else
+-  #include <omptl/omptl_numeric_ser.h>
++  #include "omptl_numeric_ser.h"
+ #endif
+ 
+-#include <omptl/omptl_numeric_extensions.h>
++#include "omptl_numeric_extensions.h"
+ 
+ #endif /* OMPTL_NUMERIC */
+diff -ur omptl.old/omptl_numeric_extensions.h omptl/omptl_numeric_extensions.h
+--- omptl.old/omptl_numeric_extensions.h	2012-04-22 16:29:41.000000000 +0200
++++ omptl/omptl_numeric_extensions.h	2021-06-20 15:40:29.000000000 +0200
 @@ -51,9 +51,9 @@
  } // namespace
  
@@ -78,9 +138,9 @@ diff -ur omptl.orig/omptl_numeric_extensions.h omptl/omptl_numeric_extensions.h
  #endif
  
  namespace omptl
-diff -ur omptl.orig/omptl_numeric_par.h omptl/omptl_numeric_par.h
---- omptl.orig/omptl_numeric_par.h	2017-01-16 14:58:37.996690639 +0100
-+++ omptl/omptl_numeric_par.h	2017-01-16 14:59:36.397739066 +0100
+diff -ur omptl.old/omptl_numeric_par.h omptl/omptl_numeric_par.h
+--- omptl.old/omptl_numeric_par.h	2012-04-22 16:29:41.000000000 +0200
++++ omptl/omptl_numeric_par.h	2021-06-20 15:40:29.000000000 +0200
 @@ -23,8 +23,8 @@
  #include <functional>
  #include <iterator>
@@ -92,15 +152,15 @@ diff -ur omptl.orig/omptl_numeric_par.h omptl/omptl_numeric_par.h
  
  namespace omptl
  {
-diff -ur omptl.orig/omptl_algorithm_par.h omptl/omptl_algorithm_par.h
---- omptl.orig/omptl_algorithm_par.h	2021-05-09 14:26:47.227632829 +0300
-+++ omptl/omptl_algorithm_par.h	2021-05-09 14:27:02.815744567 +0300
-@@ -1700,7 +1700,7 @@
+diff -ur omptl.old/omptl_tools.h omptl/omptl_tools.h
+--- omptl.old/omptl_tools.h	2012-04-22 16:29:41.000000000 +0200
++++ omptl/omptl_tools.h	2021-06-20 15:40:42.000000000 +0200
+@@ -25,7 +25,7 @@
+ #include <climits>
+ #include <iterator>
  
- 	std::vector<char> pivot_used(pivots.size(), false); // can't be bool due to parallel write
+-#include <tr1/cmath>
++#include <cmath>
  
--	const unsigned max_depth = std::floor(std::tr1::log2(P));
-+	const unsigned max_depth = unsigned(std::floor(std::tr1::log2(P)));
- 	assert(1u << max_depth <= P);
- 	for (unsigned i = 0; i < max_depth; ++i)
- 	{
+ namespace omptl
+ {