From 5c0232a6325aa6462a9c92c8585daae6d2f1693d Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Mon, 11 May 2020 08:32:28 -0700 Subject: [PATCH] deps: backport ICU-21081 for ICU 67.x (constexpr) - Backport of https://github.com/unicode-org/icu/commit/715d254a02b0b22681cb6f861b0921ae668fa7d6 - ICU bug: https://unicode-org.atlassian.net/browse/ICU-21081 PR-URL: https://github.com/nodejs/node/pull/33337 Refs: https://github.com/unicode-org/icu/releases/tag/release-67-1 Reviewed-By: Steven R Loomis --- deps/icu-small/README-SMALL-ICU.txt | 2 +- deps/icu-small/source/common/uassert.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/icu-small/README-SMALL-ICU.txt b/deps/icu-small/README-SMALL-ICU.txt index 1f524e36113af0..b1aeabe031187c 100644 --- a/deps/icu-small/README-SMALL-ICU.txt +++ b/deps/icu-small/README-SMALL-ICU.txt @@ -3,6 +3,6 @@ Small ICU sources - auto generated by shrink-icu-src.py This directory contains the ICU subset used by --with-intl=small-icu (the default) It is a strict subset of ICU 67 source files with the following exception(s): * deps/icu-small/source/data/in/icudt67l.dat : Reduced-size data file - +* deps/icu-small/source/common/uassert.h : Manual backport of ICU-21081 To rebuild this directory, see ../../tools/icu/README.md diff --git a/deps/icu-small/source/common/uassert.h b/deps/icu-small/source/common/uassert.h index 15cd55c873487c..afd31eeffd91a4 100644 --- a/deps/icu-small/source/common/uassert.h +++ b/deps/icu-small/source/common/uassert.h @@ -32,7 +32,7 @@ # include # define U_ASSERT(exp) assert(exp) #elif U_CPLUSPLUS_VERSION -# define U_ASSERT(exp) void() +# define U_ASSERT(exp) (void)0 #else # define U_ASSERT(exp) #endif