[lld] r343749 - Use std::make_pair rather than brace initialization.

[Rui Ueyama via llvm-commits]

Sorry for the breakage, and thank you for fixing it!

On Wed, Oct 3, 2018 at 5:37 PM Matt Morehouse via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: morehouse
> Date: Wed Oct  3 17:35:24 2018
> New Revision: 343749
>
> URL: http://llvm.org/viewvc/llvm-project?rev=343749&view=rev
> Log:
> Use std::make_pair rather than brace initialization.
>
> r343732 broke the Windows bot.  Seems like the compiler on that bot
> doesn't like brace initialization.
>
> Modified:
>     lld/trunk/ELF/Relocations.cpp
>
> Modified: lld/trunk/ELF/Relocations.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Relocations.cpp?rev=343749&r1=343748&r2=343749&view=diff
>
> ==============================================================================
> --- lld/trunk/ELF/Relocations.cpp (original)
> +++ lld/trunk/ELF/Relocations.cpp Wed Oct  3 17:35:24 2018
> @@ -1347,12 +1347,12 @@ std::pair<Thunk *, bool> ThunkCreator::g
>    for (Thunk *T : *ThunkVec)
>      if (T->isCompatibleWith(Type) &&
>          Target->inBranchRange(Type, Src, T->getThunkTargetSym()->getVA()))
> -      return {T, false};
> +      return std::make_pair(T, false);
>
>    // No existing compatible Thunk in range, create a new one
>    Thunk *T = addThunk(Type, Sym);
>    ThunkVec->push_back(T);
> -  return {T, true};
> +  return std::make_pair(T, true);
>  }
>
>  // Call Fn on every executable InputSection accessed via the linker script
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181004/d8f9e950/attachment.html>