commit e5529933b2dbee52feb5497c5410cb3647f2e90d
author Fredrik Roubert <roubert@google.com> Wed Sep 18 20:26:03 2019 +0200
committer Steven R. Loomis <srl295@gmail.com> Wed Sep 25 08:06:29 2019 -0700
tree b0cce53a4056b331391adf1f74cb0ecd0ba7ccfd
parent 791980cf416149fb779f4f687806f4c664b35194

ICU-20819 Correct placement of parentheses in preprocessor macro.

The purpose of the FIELD_NAME_STR() macro is to create a string literal
by using the # preprocessing operator and then skip the first 5 chars of
this string by using the +5 pointer arithmetic. This is all intentional,
but if the parentheses are misplaced the compiler might think that this
is a mistake, a failed string concatenation (-Wstring-plus-int).

icu4c/source/test/intltest/caltest.cpp

diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp
index 677c98a..82e34f2 100644
--- a/icu4c/source/test/intltest/caltest.cpp
+++ b/icu4c/source/test/intltest/caltest.cpp
@@ -354,7 +354,7 @@
 
 UnicodeString CalendarTest::fieldName(UCalendarDateFields f) {
     switch (f) {
-#define FIELD_NAME_STR(x) case x: return (#x+5)
+#define FIELD_NAME_STR(x) case x: return (#x)+5
       FIELD_NAME_STR( UCAL_ERA );
       FIELD_NAME_STR( UCAL_YEAR );
       FIELD_NAME_STR( UCAL_MONTH );