From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 29 Apr 2019 19:30:45 +0000 (+0200)
Subject: patch 8.1.1237: error for using "compl", reserved word in C++
X-Git-Tag: v8.1.1237
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52111f82318dfbeb6a0b06230c0609abff509250;p=vim

patch 8.1.1237: error for using "compl", reserved word in C++

Problem:    Error for using "compl", reserved word in C++.
Solution:   Rename to "complp". (suggestion by Ken Takata)
---

diff --git a/src/proto/usercmd.pro b/src/proto/usercmd.pro
index 45ae3e7fe..a7d0ccccc 100644
--- a/src/proto/usercmd.pro
+++ b/src/proto/usercmd.pro
@@ -1,5 +1,5 @@
 /* usercmd.c */
-char_u *find_ucmd(exarg_T *eap, char_u *p, int *full, expand_T *xp, int *compl);
+char_u *find_ucmd(exarg_T *eap, char_u *p, int *full, expand_T *xp, int *complp);
 char_u *set_context_in_user_cmd(expand_T *xp, char_u *arg_in);
 char_u *get_user_command_name(int idx);
 char_u *get_user_commands(expand_T *xp, int idx);
@@ -7,12 +7,12 @@ char_u *get_user_cmd_addr_type(expand_T *xp, int idx);
 char_u *get_user_cmd_flags(expand_T *xp, int idx);
 char_u *get_user_cmd_nargs(expand_T *xp, int idx);
 char_u *get_user_cmd_complete(expand_T *xp, int idx);
+int cmdcomplete_str_to_type(char_u *complete_str);
 char *uc_fun_cmd(void);
+int parse_compl_arg(char_u *value, int vallen, int *complp, long *argt, char_u **compl_arg);
 void ex_command(exarg_T *eap);
 void ex_comclear(exarg_T *eap);
 void uc_clear(garray_T *gap);
 void ex_delcommand(exarg_T *eap);
 void do_ucmd(exarg_T *eap);
-int parse_compl_arg(char_u *value, int vallen, int *complp, long *argt, char_u **compl_arg);
-int cmdcomplete_str_to_type(char_u *complete_str);
 /* vim: set ft=c : */
diff --git a/src/usercmd.c b/src/usercmd.c
index 737b2feef..db1a77b7f 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -131,7 +131,7 @@ find_ucmd(
     char_u	*p,	// end of the command (possibly including count)
     int		*full,	// set to TRUE for a full match
     expand_T	*xp,	// used for completion, NULL otherwise
-    int		*compl UNUSED)	// completion flags or NULL
+    int		*complp UNUSED)	// completion flags or NULL
 {
     int		len = (int)(p - eap->cmd);
     int		j, k, matchlen = 0;
@@ -188,8 +188,8 @@ find_ucmd(
 		    eap->addr_type = uc->uc_addr_type;
 
 # ifdef FEAT_CMDL_COMPL
-		    if (compl != NULL)
-			*compl = uc->uc_compl;
+		    if (complp != NULL)
+			*complp = uc->uc_compl;
 #  ifdef FEAT_EVAL
 		    if (xp != NULL)
 		    {
@@ -692,7 +692,7 @@ uc_scan_attr(
     long	*argt,
     long	*def,
     int		*flags,
-    int		*compl,
+    int		*complp,
     char_u	**compl_arg,
     int		*addr_type_arg)
 {
@@ -810,7 +810,7 @@ invalid_count:
 		return FAIL;
 	    }
 
-	    if (parse_compl_arg(val, (int)vallen, compl, argt, compl_arg)
+	    if (parse_compl_arg(val, (int)vallen, complp, argt, compl_arg)
 								      == FAIL)
 		return FAIL;
 	}
diff --git a/src/version.c b/src/version.c
index 0e91cc6ea..32fab93d3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1237,
 /**/
     1236,
 /**/