summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2017-04-07 20:32:02 +0000
committerPeter Eisentraut2017-04-07 20:32:02 +0000
commit0cb2e51992a7940f9e577a74da250508aedcecf7 (patch)
tree37c39570126c1b3442125d080703cc66c3d25a8e
parent817cb100136a15796cbd9e70f49d20625108d782 (diff)
Avoid using a C++ keyword in header file
per cpluspluscheck
-rw-r--r--src/common/unicode/generate-unicode_norm_table.pl2
-rw-r--r--src/common/unicode_norm.c6
-rw-r--r--src/include/common/unicode_norm_table.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/common/unicode/generate-unicode_norm_table.pl b/src/common/unicode/generate-unicode_norm_table.pl
index 6d6e803b08..41792afd3e 100644
--- a/src/common/unicode/generate-unicode_norm_table.pl
+++ b/src/common/unicode/generate-unicode_norm_table.pl
@@ -88,7 +88,7 @@ print $OUTPUT <<HEADER;
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
index 9eddadeda2..740b10d22a 100644
--- 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
index a0181f1b96..3bcf05e5ee 100644
--- 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 */