mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-11 19:20:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using a C++ keyword in header file

Browse Source 
per cpluspluscheck
This commit is contained in:
Peter Eisentraut 2017-04-07 16:32:02 -04:00
parent 817cb10013
commit 0cb2e51992
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/unicode/generate-unicode_norm_table.pl
View File

@ -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 */

6
src/common/unicode_norm.c
View File

@ -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 &&

2
src/include/common/unicode_norm_table.h
View File

@ -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 */