[lld] r307137 - [ELF] Fix Windows build error

Peter Smith via llvm-commits llvm-commits at lists.llvm.org
Wed Jul 5 03:15:46 PDT 2017


Author: psmith
Date: Wed Jul  5 03:15:46 2017
New Revision: 307137

URL: http://llvm.org/viewvc/llvm-project?rev=307137&view=rev
Log:
[ELF] Fix Windows build error

Attempt to fix Windows buildbots From 307131 Replaced return {ET, false};
with return std::make_pair(ET, false);


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=307137&r1=307136&r2=307137&view=diff
==============================================================================
--- lld/trunk/ELF/Relocations.cpp (original)
+++ lld/trunk/ELF/Relocations.cpp Wed Jul  5 03:15:46 2017
@@ -1054,12 +1054,12 @@ std::pair<Thunk *, bool> ThunkCreator::g
     // Check existing Thunks for Body to see if they can be reused
     for (Thunk *ET : Res.first->second)
       if (ET->isCompatibleWith(Type))
-        return {ET, false};
+        return std::make_pair(ET, false);
   }
   // No existing compatible Thunk in range, create a new one
   Thunk *T = addThunk(Type, Body);
   Res.first->second.push_back(T);
-  return {T, true};
+  return std::make_pair(T, true);
 }
 
 // Call Fn on every executable InputSection accessed via the linker script




More information about the llvm-commits mailing list