From 522e100534c78b026d170d5625c1e72046a6953c Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 2 Oct 2017 10:34:27 -0400 Subject: Use std::make_tuple This CL updates cfx_fontmapper to use std::make_tuple instead of the {} variant. Change-Id: I1eeeeed803fd4b813f3dbf7b3d23416af9400b6f Reviewed-on: https://pdfium-review.googlesource.com/15131 Reviewed-by: dsinclair Commit-Queue: dsinclair --- core/fxge/cfx_fontmapper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/fxge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp index 362e9bc0b4..00372885f6 100644 --- a/core/fxge/cfx_fontmapper.cpp +++ b/core/fxge/cfx_fontmapper.cpp @@ -243,7 +243,7 @@ const struct FX_FontStyle { std::tuple GetStyleType(const ByteString& bsStyle, bool bReverse) { if (bsStyle.IsEmpty()) - return {false, FXFONT_NORMAL, 0}; + return std::make_tuple(false, FXFONT_NORMAL, 0); for (int i = FX_ArraySize(g_FontStyles) - 1; i >= 0; --i) { const FX_FontStyle* pStyle = g_FontStyles + i; @@ -252,13 +252,13 @@ std::tuple GetStyleType(const ByteString& bsStyle, if (bReverse) { if (bsStyle.Right(pStyle->len).Compare(pStyle->name) == 0) - return {true, pStyle->style, pStyle->len}; + return std::make_tuple(true, pStyle->style, pStyle->len); } else { if (bsStyle.Left(pStyle->len).Compare(pStyle->name) == 0) - return {true, pStyle->style, pStyle->len}; + return std::make_tuple(true, pStyle->style, pStyle->len); } } - return {false, FXFONT_NORMAL, 0}; + return std::make_tuple(false, FXFONT_NORMAL, 0); } bool CheckSupportThirdPartFont(ByteString name, int& PitchFamily) { -- cgit v1.2.3