From f981bc990db77f79cca2118ab9ee0cd4b6200ccf Mon Sep 17 00:00:00 2001
From: Patrick Pelissier <Patrick.Pelissier@gmail.com>
Date: Wed, 16 Aug 2017 08:17:27 +0200
Subject: [PATCH] Port to new helper function.

---
 m-string.h | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/m-string.h b/m-string.h
index d8a33a96..3f308cf9 100644
--- a/m-string.h
+++ b/m-string.h
@@ -912,32 +912,25 @@ namespace m_string {
 
 /* Macro encapsulation to give default value for start offset */
 #define string_search_char(v, ...)					\
-  M_IF_NARGS_EQ1(__VA_ARGS__)(string_search_char(v, __VA_ARGS__, 0),	\
-			      string_search_char(v, __VA_ARGS__) )
+  M_APPLY(string_search_char, v, M_IF_DEFAULT1(0, __VA_ARGS__))
 
 #define string_search_rchar(v, ...)					\
-  M_IF_NARGS_EQ1(__VA_ARGS__)(string_search_rchar(v, __VA_ARGS__, 0),	\
-			      string_search_rchar(v, __VA_ARGS__) )
+  M_APPLY(string_search_rchar, v, M_IF_DEFAULT1(0, __VA_ARGS__))
 
 #define string_search_str(v, ...)					\
-  M_IF_NARGS_EQ1(__VA_ARGS__)(string_search_str(v, __VA_ARGS__, 0),	\
-			      string_search_str(v, __VA_ARGS__) )
+  M_APPLY(string_search_str, v, M_IF_DEFAULT1(0, __VA_ARGS__))
 
 #define string_search(v, ...)						\
-  M_IF_NARGS_EQ1(__VA_ARGS__)(string_search(v, __VA_ARGS__, 0),		\
-			      string_search(v, __VA_ARGS__) )
+  M_APPLY(string_search, v, M_IF_DEFAULT1(0, __VA_ARGS__))
 
 #define string_search_pbrk(v, ...)					\
-  M_IF_NARGS_EQ1(__VA_ARGS__)(string_search_pbrk(v, __VA_ARGS__, 0),	\
-			      string_search_pbrk(v, __VA_ARGS__) )
+  M_APPLY(string_search_pbrk, v, M_IF_DEFAULT1(0, __VA_ARGS__))
 
 #define string_replace_str(v, s1, ...)					\
-  M_IF_NARGS_EQ1(__VA_ARGS__)(string_replace_str(v, s1,  __VA_ARGS__, 0), \
-			      string_replace_str(v, s1, __VA_ARGS__) )
+  M_APPLY(string_replace_str, v, s1, M_IF_DEFAULT1(0, __VA_ARGS__))
 
 #define string_replace(v, s1, ...)					\
-  M_IF_NARGS_EQ1(__VA_ARGS__)(string_replace(v, s1,  __VA_ARGS__, 0),	\
-			      string_replace(v, s1, __VA_ARGS__) )
+  M_APPLY(string_replace, v, s1, M_IF_DEFAULT1(0, __VA_ARGS__))
 
 /* Macro encapsulation for C11 */
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
@@ -969,7 +962,7 @@ namespace m_string {
 #undef string_search
 #define string_search(v, ...)						\
   M_APPLY(STRINGI_SELECT3, string_search, string_search_str,		\
-	  v, __VA_ARGS__ M_IF_NARGS_EQ1(__VA_ARGS__)(M_DEFERRED_COMMA 0, ))
+	  v, M_IF_DEFAULT1(0, __VA_ARGS__))
 
 #endif