diff options
| author | Sam Varshavchik | 2021-03-21 09:18:36 -0400 |
|---|---|---|
| committer | Sam Varshavchik | 2021-03-21 09:18:36 -0400 |
| commit | 5c5087a2d7c404538826bb7b4e36a7eeaf73bd67 (patch) | |
| tree | 611093d66164736a1637867e84406c846a7d3894 | |
| parent | b2b87cfec798b26162710f65459abb03675b184d (diff) | |
| download | courier-libs-5c5087a2d7c404538826bb7b4e36a7eeaf73bd67.tar.bz2 | |
Fix compilation error with older gccs.
| -rw-r--r-- | unicode/ChangeLog | 4 | ||||
| -rw-r--r-- | unicode/biditest2.C | 24 | ||||
| -rw-r--r-- | unicode/configure.ac | 3 |
3 files changed, 19 insertions, 12 deletions
diff --git a/unicode/ChangeLog b/unicode/ChangeLog index 03fe2e2..76a059d 100644 --- a/unicode/ChangeLog +++ b/unicode/ChangeLog @@ -1,3 +1,7 @@ +2021-03-21 Sam Varshavchik <mrsam@courier-mta.com> + + * Fix compilation error on CentOS 7. + 2.2.2 2021-03-12 Sam Varshavchik <mrsam@courier-mta.com> diff --git a/unicode/biditest2.C b/unicode/biditest2.C index d3178b8..54a82a8 100644 --- a/unicode/biditest2.C +++ b/unicode/biditest2.C @@ -729,20 +729,22 @@ void direction_test2() void composition_test() { + typedef std::tuple<unicode_bidi_level_t, + size_t, size_t, size_t, + size_t> results_t; + static const struct { std::u32string str; std::vector<unicode_bidi_level_t> levels; - std::vector<std::tuple<unicode_bidi_level_t, - size_t, size_t, size_t, - size_t>> results; + std::vector<results_t> results; } tests[] = { // Test 1 { U"a\u0303\u0303b\u0303\u0303c", {0, 0, 0, 0, 0, 0, 0}, { - {0, 0, 7, 1, 2}, - {0, 0, 7, 4, 2}, + results_t{0, 0, 7, 1, 2}, + results_t{0, 0, 7, 4, 2}, } }, // Test 2 @@ -750,8 +752,8 @@ void composition_test() U"\u0303ab\u0303", {0, 0, 0, 0}, { - {0, 0, 4, 0, 1}, - {0, 0, 4, 3, 1}, + results_t{0, 0, 4, 0, 1}, + results_t{0, 0, 4, 3, 1}, } }, // Test 3 @@ -759,8 +761,8 @@ void composition_test() U"a\u0303\u0303b", {0, 0, 1, 1}, { - {0, 0, 2, 1, 1}, - {1, 2, 2, 2, 1}, + results_t{0, 0, 2, 1, 1}, + results_t{1, 2, 2, 2, 1}, } }, // Test 4 @@ -768,8 +770,8 @@ void composition_test() U"\u0303a\u0303a", {0, 0, 0, 0}, { - {0, 0, 4, 0, 1}, - {0, 0, 4, 2, 1}, + results_t{0, 0, 4, 0, 1}, + results_t{0, 0, 4, 2, 1}, } }, }; diff --git a/unicode/configure.ac b/unicode/configure.ac index b857741..4a77130 100644 --- a/unicode/configure.ac +++ b/unicode/configure.ac @@ -1,6 +1,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([courier-unicode], [2.2.2], [courier-users@lists.sourceforge.net]) +AC_INIT([courier-unicode], [2.2.2.20210321], + [courier-users@lists.sourceforge.net]) >confdefs.h # Kill PACKAGE_ macros |