From e0c456490aaf306e937cd9fff8c9b8452f5fc7d9 Mon Sep 17 00:00:00 2001
From: Patrick Pelissier <Patrick.Pelissier@gmail.com>
Date: Sat, 15 Sep 2018 17:59:50 +0200
Subject: [PATCH] Fix definition of oplist for containers: if no argument is
 given, it shall behave as if it was defined with a standard C type.

---
 m-array.h     | 2 +-
 m-bptree.h    | 4 ++--
 m-deque.h     | 2 +-
 m-i-list.h    | 2 +-
 m-i-shared.h  | 2 +-
 m-list.h      | 2 +-
 m-prioqueue.h | 2 +-
 m-rbtree.h    | 2 +-
 m-shared.h    | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/m-array.h b/m-array.h
index b9dd5bfa..24f5616d 100644
--- a/m-array.h
+++ b/m-array.h
@@ -38,7 +38,7 @@
    USAGE: ARRAY_OPLIST(name[, oplist of the type]) */
 #define ARRAY_OPLIST(...)                                               \
   ARRAYI_OPLIST(M_IF_NARGS_EQ1(__VA_ARGS__)                             \
-                ((__VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)() ), \
+                ((__VA_ARGS__, M_DEFAULT_OPLIST),			\
                  (__VA_ARGS__ )))
 
 
diff --git a/m-bptree.h b/m-bptree.h
index 1821223a..31d77330 100644
--- a/m-bptree.h
+++ b/m-bptree.h
@@ -53,8 +53,8 @@
    USAGE: BPTREE_OPLIST(name [, oplist_of_the_type]) */
 #define BPTREE_OPLIST(...)                                              \
   BPTREEI_KEY_OPLIST(M_IF_NARGS_EQ1(__VA_ARGS__)                        \
-                     ((__VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)() ), \
-                  (__VA_ARGS__ )))
+                     ((__VA_ARGS__, M_DEFAULT_OPLISTR ),		\
+		      (__VA_ARGS__ )))
 
 /* Define the oplist of a rbtree of type (from BPTREE_DEF2).
    USAGE: BPTREE_OPLIST2(name, key_oplist, value_oplist) */
diff --git a/m-deque.h b/m-deque.h
index 2d9a12a0..8c2f7494 100644
--- a/m-deque.h
+++ b/m-deque.h
@@ -39,7 +39,7 @@
    USAGE: DEQUE_OPLIST(name[, oplist of the type]) */
 #define DEQUE_OPLIST(...)                                            \
   DEQUEI_OPLIST (M_IF_NARGS_EQ1(__VA_ARGS__)                         \
-                 ((__VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)()), \
+                 ((__VA_ARGS__, M_DEFAULT_OPLIST),		     \
                   (__VA_ARGS__ )))
 
 /********************************** INTERNAL ************************************/
diff --git a/m-i-list.h b/m-i-list.h
index 0f27648d..a225f2dc 100644
--- a/m-i-list.h
+++ b/m-i-list.h
@@ -53,7 +53,7 @@
      ILIST_OPLIST(name [, oplist_of_the_type]) */
 #define ILIST_OPLIST(...)                                               \
   ILISTI_OPLIST(M_IF_NARGS_EQ1(__VA_ARGS__)                             \
-                ((__VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)() ), \
+                ((__VA_ARGS__, M_DEFAULT_OPLIST),			\
                  (__VA_ARGS__ )))
 
 
diff --git a/m-i-shared.h b/m-i-shared.h
index 044c0164..2d0c43a2 100644
--- a/m-i-shared.h
+++ b/m-i-shared.h
@@ -32,7 +32,7 @@
    USAGE: ISHARED_OPLIST(name [, oplist_of_the_type]) */
 #define ISHARED_PTR_OPLIST(...)                                      \
   ISHAREDI_PTR_OPLIST(M_IF_NARGS_EQ1(__VA_ARGS__)                    \
-                      ((__VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)() ), \
+                      ((__VA_ARGS__, M_DEFAULT_OPLIST),		     \
                        (__VA_ARGS__ )))
 
 /* Interface to add to a structure to allow intrusive support.
diff --git a/m-list.h b/m-list.h
index d763a27a..b0d08a0a 100644
--- a/m-list.h
+++ b/m-list.h
@@ -45,7 +45,7 @@
    USAGE: LIST_OPLIST(name [, oplist_of_the_type]) */
 #define LIST_OPLIST(...)                                             \
   LISTI_OPLIST(M_IF_NARGS_EQ1(__VA_ARGS__)                           \
-               ((__VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)() ),  \
+               ((__VA_ARGS__, M_DEFAULT_OPLIST ),		     \
                 (__VA_ARGS__ )))
 
 
diff --git a/m-prioqueue.h b/m-prioqueue.h
index b3c958da..92d41b1b 100644
--- a/m-prioqueue.h
+++ b/m-prioqueue.h
@@ -41,7 +41,7 @@
    USAGE: PRIOQUEUE_OPLIST(name[, oplist of the type]) */
 #define PRIOQUEUE_OPLIST(...)                                           \
   PRIOQUEUEI_OPLIST(M_IF_NARGS_EQ1(__VA_ARGS__)                         \
-                    ((__VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)() ), \
+                    ((__VA_ARGS__, M_DEFAULT_OPLIST),			\
                      (__VA_ARGS__ )))
 
 
diff --git a/m-rbtree.h b/m-rbtree.h
index f6881aef..340dd33f 100644
--- a/m-rbtree.h
+++ b/m-rbtree.h
@@ -40,7 +40,7 @@
    USAGE: RBTREE_OPLIST(name [, oplist_of_the_type]) */
 #define RBTREE_OPLIST(...)                                              \
   RBTREEI_OPLIST(M_IF_NARGS_EQ1(__VA_ARGS__)                            \
-                 ((__VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)() ), \
+                 ((__VA_ARGS__, M_DEFAULT_OPLIST),			\
                   (__VA_ARGS__ )))
 
 
diff --git a/m-shared.h b/m-shared.h
index 6b63ec3f..b59c480c 100644
--- a/m-shared.h
+++ b/m-shared.h
@@ -33,7 +33,7 @@
    USAGE: SHARED_OPLIST(name [, oplist_of_the_type]) */
 #define SHARED_PTR_OPLIST(...)                                          \
   SHAREDI_PTR_OPLIST(M_IF_NARGS_EQ1(__VA_ARGS__)                        \
-                     ((__VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)() ), \
+                     ((__VA_ARGS__, M_DEFAULT_OPLIST ),			\
                       _OPLIST(__VA_ARGS__ )))
 
 /* Define shared pointer and its function.