From 98541b09f482af0233e29f01ca5019f74ec054e7 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 14 Aug 2016 05:07:20 +0000 Subject: [PATCH] Revert "gold: add a cast to appease std::max NFC" This was fixed differently by Teresa and this should no longer be needed. llvm-svn: 278622 --- llvm/tools/gold/gold-plugin.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp index ecc7527..7f38a02 100644 --- a/llvm/tools/gold/gold-plugin.cpp +++ b/llvm/tools/gold/gold-plugin.cpp @@ -626,8 +626,7 @@ static void addModule(LTO &Lto, claimed_file &F, const void *View) { CommonRes.Prevailing = true; CommonRes.VisibleToRegularObj = R.VisibleToRegularObj; } - CommonRes.Size = std::max(CommonRes.Size, - static_cast(ObjSym.getCommonSize())); + CommonRes.Size = std::max(CommonRes.Size, ObjSym.getCommonSize()); CommonRes.Align = std::max(CommonRes.Align, ObjSym.getCommonAlignment()); R.Prevailing = false; } -- 2.7.4