From b9ccc39a412b86a0bfb425c4d0815a2bb67330d1 Mon Sep 17 00:00:00 2001 From: Arthur O'Dwyer Date: Fri, 24 Jan 2025 12:15:05 -0500 Subject: [PATCH] ICU-22920 Avoid CTAD in Formattable's constructor. NFC This line uses CTAD on `pair`, when every other place in the codebase uses a function call to `make_pair` (and no other place uses CTAD on any class template at all). Assume this was unintentional, and fix it. warning: class template argument deduction is incompatible with C++ standards before C++17; for compatibility, use explicit type name 'std::pair' (aka 'pair') [-Wctad] Formattable(const Formattable* arr, int32_t len) : contents(std::pair(arr, len)) {} ^~~~~~~~~ --- icu4c/source/i18n/unicode/messageformat2_formattable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icu4c/source/i18n/unicode/messageformat2_formattable.h b/icu4c/source/i18n/unicode/messageformat2_formattable.h index 53c500dac2f..528e755e036 100644 --- a/icu4c/source/i18n/unicode/messageformat2_formattable.h +++ b/icu4c/source/i18n/unicode/messageformat2_formattable.h @@ -389,7 +389,7 @@ namespace message2 { * @internal ICU 75 technology preview * @deprecated This API is for technology preview only. */ - Formattable(const Formattable* arr, int32_t len) : contents(std::pair(arr, len)) {} + Formattable(const Formattable* arr, int32_t len) : contents(std::make_pair(arr, len)) {} /** * Object constructor. *