From 4e6dad939ab5a5428d0c37ae27f95e0399b335ee Mon Sep 17 00:00:00 2001
From: Patrick Pelissier <patrick.pelissier@gmail.com>
Date: Sat, 27 Oct 2018 22:56:00 +0200
Subject: [PATCH] API Compatibility change: rename _remove for DICT & B+TREE
 into _erase for API uniformization.

---
 README.md         |   4 ++--
 doc/API.txt       |   3 +++
 doc/Container.ods | Bin 44361 -> 44391 bytes
 m-bptree.h        |   8 +++++++-
 m-core.h          |   7 +++++++
 m-dict.h          |  10 ++++++++--
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 51f74be2..2c817bfc 100644
--- a/README.md
+++ b/README.md
@@ -2013,7 +2013,7 @@ This method is only defined for associative containers (no SET).
 Push the value referenced by key 'key' into the dictionary 'dict'.
 This method is only defined for SET.
 
-##### void name\_remove(name\_t dict, const key\_type key)
+##### void name\_erase(name\_t dict, const key\_type key)
 
 Remove the element referenced by key 'key' in the dictionary 'dict'.
 Do nothing if 'key' is no present in the dictionary.
@@ -2745,7 +2745,7 @@ and save the popped value into 'dest' if the pointer is not null
 while keeping the tree balanced.
 Do nothing if 'data' is no present in the B+Tree.
 
-##### bool name\_remove(name\_t tree, const key\_type data)
+##### bool name\_erase(name\_t tree, const key\_type data)
 
 Remove 'data' from the B+Tree 'tree'
 while keeping the tree balanced.
diff --git a/doc/API.txt b/doc/API.txt
index b36d050a..eca4d3c7 100644
--- a/doc/API.txt
+++ b/doc/API.txt
@@ -27,4 +27,7 @@ V0.2.*: * worker_start takes a 'worker_t' as an additional parameter
         change name of _get_ ## field into _get_at_ ## fields
         Since there is a name collision with other methods
         if a field is named 'str'.
+        * Rename _remove into _erase for dictionary & B+TREE (adding a compatibility layer) for API uniformization.
+        The provided _remove doesn't use an iterator but a 'key', incompatible with the one of array or list.
+        But is like the one provided by the priority queue.
         
diff --git a/doc/Container.ods b/doc/Container.ods
index 0951ce972cbce7a1a406ac15d1aa5e16ea16bcd7..42866e02548f2e54a5bb0c7c435aedb8d6993222 100644
GIT binary patch
delta 6977
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
G8UJ6c>in7j

delta 6913
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

diff --git a/m-bptree.h b/m-bptree.h
index 31d77330..b5678f29 100644
--- a/m-bptree.h
+++ b/m-bptree.h
@@ -663,7 +663,7 @@
     return -1; /* unreachable */					\
   }                                                                     \
                                                                         \
-  static inline bool M_C(name, _remove)(tree_t b, key_t const key)      \
+  static inline bool M_C(name, _erase)(tree_t b, key_t const key)       \
   {                                                                     \
     BPTREEI_CONTRACT(N, key_oplist, b);                                 \
     pit_t pit;                                                          \
@@ -715,6 +715,12 @@
     }                                                                   \
   }                                                                     \
                                                                         \
+  static inline bool M_ATTR_DEPRECATED                                  \
+  M_C(name, _remove)(tree_t b, key_t const key)                         \
+  {                                                                     \
+    return M_C(name, _erase)(b, key);                                   \
+  }                                                                     \
+                                                                        \
   static inline bool M_C(name, _pop_at)(value_t *ptr, tree_t b, key_t const key) \
   {                                                                     \
     if (ptr != NULL) {                                                  \
diff --git a/m-core.h b/m-core.h
index ae8ea830..b61a10cc 100644
--- a/m-core.h
+++ b/m-core.h
@@ -85,6 +85,13 @@
 # define M_ALIGN_FOR_CACHELINE_EXCLUSION 64
 #endif
 
+/* Deprecated attribute for function */
+#if defined(__GNUC__) &&  __GNUC__ >= 4
+#define M_ATTR_DEPRECATED __attribute__((deprecated))
+#else
+#define M_ATTR_DEPRECATED
+#endif
+
 /***************************************************************/
 /****************** Preprocessing Times Macro ******************/
 /***************************************************************/
diff --git a/m-dict.h b/m-dict.h
index fddd123d..97cdce82 100644
--- a/m-dict.h
+++ b/m-dict.h
@@ -457,7 +457,7 @@
   }                                                                     \
                                                                         \
   static inline bool                                                    \
-  M_C(name, _remove)(dict_t map, key_type const key)			\
+  M_C(name, _erase)(dict_t map, key_type const key)			\
   {                                                                     \
     DICTI_CONTRACT(name, map);                                          \
                                                                         \
@@ -604,6 +604,12 @@
    Do not used any fields of the dictionnary but the public API */
 #define DICTI_FUNC_ADDITIONAL_DEF2(name, key_type, key_oplist, value_type, value_oplist, isSet, dict_t, dict_it_t) \
   									\
+  static inline bool M_ATTR_DEPRECATED                                  \
+  M_C(name, _remove)(dict_t map, key_type const key)			\
+  {                                                                     \
+    return M_C(name, _erase)(map, key);                                 \
+  }                                                                     \
+                                                                        \
   M_IF_METHOD_BOTH(GET_STR, key_oplist, value_oplist)(			\
   static inline void                                                    \
   M_C(name, _get_str)(string_t str, const dict_t dict, const bool append) \
@@ -1271,7 +1277,7 @@ typedef enum {
   }                                                                     \
                                                                         \
   static inline bool                                                    \
-  M_C(name,_remove)(dict_t dict, const key_type key)			\
+  M_C(name,_erase)(dict_t dict, const key_type key)			\
   {                                                                     \
     DICTI_OA_CONTRACT(dict);                                            \
     /* NOTE: key can't be the representation of empty or deleted */	\