Avoid using a C++ keyword in header file

petere · petere · commit 0cb2e51992a7 · 2017-04-07T16:32:02.000-04:00
per cpluspluscheck
diff --git a/src/common/unicode/generate-unicode_norm_table.pl b/src/common/unicode/generate-unicode_norm_table.pl
@@ -88,7 +88,7 @@
 typedef struct
 {
 	uint32		codepoint;		/* Unicode codepoint */
-	uint8		class;			/* combining class of character */
+	uint8		comb_class;		/* combining class of character */
 	uint8		dec_size_flags; /* size and flags of decomposition code list */
 	uint16		dec_index;		/* index into UnicodeDecomp_codepoints, or the
 								 * decomposition itself if DECOMP_INLINE */
diff --git a/src/common/unicode_norm.c b/src/common/unicode_norm.c
@@ -369,10 +369,10 @@ unicode_normalize_kc(const pg_wchar *input)
 		 * combining class for the second, and the second is not a starter.  A
 		 * character is a starter if its combining class is 0.
 		 */
-		if (nextEntry->class == 0x0 || prevEntry->class == 0x0)
+		if (nextEntry->comb_class == 0x0 || prevEntry->comb_class == 0x0)
 			continue;
 
-		if (prevEntry->class <= nextEntry->class)
+		if (prevEntry->comb_class <= nextEntry->comb_class)
 			continue;
 
 		/* exchange can happen */
@@ -407,7 +407,7 @@ unicode_normalize_kc(const pg_wchar *input)
 	{
 		pg_wchar	ch = decomp_chars[count];
 		pg_unicode_decomposition *ch_entry = get_code_entry(ch);
-		int			ch_class = (ch_entry == NULL) ? 0 : ch_entry->class;
+		int			ch_class = (ch_entry == NULL) ? 0 : ch_entry->comb_class;
 		pg_wchar	composite;
 
 		if (last_class < ch_class &&
diff --git a/src/include/common/unicode_norm_table.h b/src/include/common/unicode_norm_table.h
@@ -19,7 +19,7 @@
 typedef struct
 {
 	uint32		codepoint;		/* Unicode codepoint */
-	uint8		class;			/* combining class of character */
+	uint8		comb_class;		/* combining class of character */
 	uint8		dec_size_flags; /* size and flags of decomposition code list */
 	uint16		dec_index;		/* index into UnicodeDecomp_codepoints, or the
 								 * decomposition itself if DECOMP_INLINE */

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@`
`88`	`88`	`typedef struct`
`89`	`89`	`{`
`90`	`90`	`uint32 codepoint; /* Unicode codepoint */`
`91`		`- uint8 class; /* combining class of character */`
	`91`	`+ uint8 comb_class; /* combining class of character */`
`92`	`92`	`uint8 dec_size_flags; /* size and flags of decomposition code list */`
`93`	`93`	`uint16 dec_index; /* index into UnicodeDecomp_codepoints, or the`
`94`	`94`	`* decomposition itself if DECOMP_INLINE */`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`typedef struct`
`20`	`20`	`{`
`21`	`21`	`uint32 codepoint; /* Unicode codepoint */`
`22`		`- uint8 class; /* combining class of character */`
	`22`	`+ uint8 comb_class; /* combining class of character */`
`23`	`23`	`uint8 dec_size_flags; /* size and flags of decomposition code list */`
`24`	`24`	`uint16 dec_index; /* index into UnicodeDecomp_codepoints, or the`
`25`	`25`	`* decomposition itself if DECOMP_INLINE */`