Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

libZRCola: Resolve some warnings reported by -Wall

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2022-09-15 09:17:17 +02:00
parent 52391d9a08
commit 8bb1049cf0
6 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libZRCola/include/zrcola/character.h
View File

@ -408,8 +408,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const chrcat &a, _In_ const chrcat &b) const virtual int compare(_In_ const chrcat &a, _In_ const chrcat &b) const
{ {
if (a.cat < b.cat) return -1; if (a.cat < b.cat) return -1;
else if (a.cat > b.cat) return 1; if (a.cat > b.cat) return 1;
return 0; return 0;
} }
@ -441,8 +441,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const chrcat &a, _In_ const chrcat &b) const virtual int compare(_In_ const chrcat &a, _In_ const chrcat &b) const
{ {
if (a.rank < b.rank) return -1; if (a.rank < b.rank) return -1;
else if (a.rank > b.rank) return +1; if (a.rank > b.rank) return +1;
return 0; return 0;
} }

4
lib/libZRCola/include/zrcola/highlight.h
View File

@ -113,8 +113,8 @@ namespace ZRCola {
int r = ZRCola::CompareString(a.chr(), a.chr_len(), b.chr(), b.chr_len()); int r = ZRCola::CompareString(a.chr(), a.chr_len(), b.chr(), b.chr_len());
if (r != 0) return r; if (r != 0) return r;
if (a.set < b.set) return -1; if (a.set < b.set) return -1;
else if (a.set > b.set) return +1; if (a.set > b.set) return +1;
return 0; return 0;
} }

12
lib/libZRCola/include/zrcola/language.h
View File

@ -97,8 +97,8 @@ namespace ZRCola {
int r = ZRCola::CompareString(a.chr(), a.chr_len(), b.chr(), b.chr_len()); int r = ZRCola::CompareString(a.chr(), a.chr_len(), b.chr(), b.chr_len());
if (r != 0) return r; if (r != 0) return r;
if (a.lang < b.lang) return -1; if (a.lang < b.lang) return -1;
else if (a.lang > b.lang) return 1; if (a.lang > b.lang) return 1;
return 0; return 0;
} }
@ -132,8 +132,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const langchar &a, _In_ const langchar &b) const virtual int compare(_In_ const langchar &a, _In_ const langchar &b) const
{ {
if (a.lang < b.lang) return -1; if (a.lang < b.lang) return -1;
else if (a.lang > b.lang) return 1; if (a.lang > b.lang) return 1;
int r = ZRCola::CompareString(a.chr, a.chr_len(), b.chr(), b.chr_len()); int r = ZRCola::CompareString(a.chr, a.chr_len(), b.chr(), b.chr_len());
if (r != 0) return r; if (r != 0) return r;
@ -258,8 +258,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const language &a, _In_ const language &b) const virtual int compare(_In_ const language &a, _In_ const language &b) const
{ {
if (a.lang < b.lang) return -1; if (a.lang < b.lang) return -1;
else if (a.lang > b.lang) return 1; if (a.lang > b.lang) return 1;
return 0; return 0;
} }

16
lib/libZRCola/include/zrcola/tag.h
View File

@ -153,8 +153,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const chrtag &a, _In_ const chrtag &b) const virtual int compare(_In_ const chrtag &a, _In_ const chrtag &b) const
{ {
if (a.tag < b.tag) return -1; if (a.tag < b.tag) return -1;
else if (a.tag > b.tag) return 1; if (a.tag > b.tag) return 1;
return 0; return 0;
} }
@ -336,8 +336,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const tagname &a, _In_ const tagname &b) const virtual int compare(_In_ const tagname &a, _In_ const tagname &b) const
{ {
if (a.locale < b.locale) return -1; if (a.locale < b.locale) return -1;
else if (a.locale > b.locale) return 1; if (a.locale > b.locale) return 1;
int r = tagname::CompareName(a.locale, a.name(), a.name_len(), b.name(), b.name_len()); int r = tagname::CompareName(a.locale, a.name(), a.name_len(), b.name(), b.name_len());
if (r != 0) return r; if (r != 0) return r;
@ -398,11 +398,11 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const tagname &a, _In_ const tagname &b) const virtual int compare(_In_ const tagname &a, _In_ const tagname &b) const
{ {
if (a.locale < b.locale) return -1; if (a.locale < b.locale) return -1;
else if (a.locale > b.locale) return 1; if (a.locale > b.locale) return 1;
if (a.tag < b.tag) return -1; if (a.tag < b.tag) return -1;
else if (a.tag > b.tag) return 1; if (a.tag > b.tag) return 1;
return 0; return 0;
} }

20
lib/libZRCola/include/zrcola/translate.h
View File

@ -158,8 +158,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const translation &a, _In_ const translation &b) const virtual int compare(_In_ const translation &a, _In_ const translation &b) const
{ {
if (a.set < b.set) return -1; if (a.set < b.set) return -1;
else if (a.set > b.set) return +1; if (a.set > b.set) return +1;
int r = ZRCola::CompareString(a.src(), a.src_len(), b.src(), b.src_len()); int r = ZRCola::CompareString(a.src(), a.src_len(), b.src(), b.src_len());
if (r != 0) return r; if (r != 0) return r;
@ -223,8 +223,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const translation &a, _In_ const translation &b) const virtual int compare(_In_ const translation &a, _In_ const translation &b) const
{ {
if (a.set < b.set) return -1; if (a.set < b.set) return -1;
else if (a.set > b.set) return +1; if (a.set > b.set) return +1;
int r = ZRCola::CompareString(a.dst(), a.dst_len(), b.dst(), b.dst_len()); int r = ZRCola::CompareString(a.dst(), a.dst_len(), b.dst(), b.dst_len());
if (r != 0) return r; if (r != 0) return r;
@ -410,8 +410,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const transet &a, _In_ const transet &b) const virtual int compare(_In_ const transet &a, _In_ const transet &b) const
{ {
if (a.set < b.set) return -1; if (a.set < b.set) return -1;
else if (a.set > b.set) return 1; if (a.set > b.set) return 1;
return 0; return 0;
} }
@ -530,8 +530,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const transeq &a, _In_ const transeq &b) const virtual int compare(_In_ const transeq &a, _In_ const transeq &b) const
{ {
if (a.seq < b.seq) return -1; if (a.seq < b.seq) return -1;
else if (a.seq > b.seq) return 1; if (a.seq > b.seq) return 1;
return 0; return 0;
} }
@ -563,8 +563,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const transeq &a, _In_ const transeq &b) const virtual int compare(_In_ const transeq &a, _In_ const transeq &b) const
{ {
if (a.rank < b.rank) return -1; if (a.rank < b.rank) return -1;
else if (a.rank > b.rank) return +1; if (a.rank > b.rank) return +1;
return 0; return 0;
} }

4
lib/libZRColaUI/include/zrcolaui/chargroup.h
View File

@ -126,8 +126,8 @@ namespace ZRCola {
/// ///
virtual int compare(_In_ const chrgrp &a, _In_ const chrgrp &b) const virtual int compare(_In_ const chrgrp &a, _In_ const chrgrp &b) const
{ {
if (a.rank < b.rank) return -1; if (a.rank < b.rank) return -1;
else if (a.rank > b.rank) return +1; if (a.rank > b.rank) return +1;
return 0; return 0;
} }