From d9696cbda84631f20449a483fed09fff05298638 Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@google.com>
Date: Sat, 18 Jan 2014 00:27:03 +0000
Subject: [PATCH] Using "final" as a variable name is a bit confusing in C++11,
 so rename it.

llvm-svn: 199526
---
 lld/include/lld/Core/Resolver.h | 2 +-
 lld/lib/Core/Resolver.cpp       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lld/include/lld/Core/Resolver.h b/lld/include/lld/Core/Resolver.h
index 53bce19a12a6..4722b30aa00f 100644
--- a/lld/include/lld/Core/Resolver.h
+++ b/lld/include/lld/Core/Resolver.h
@@ -71,7 +71,7 @@ private:
   bool resolveUndefines();
   void updateReferences();
   void deadStripOptimize();
-  bool checkUndefines(bool final);
+  bool checkUndefines(bool isFinal);
   void removeCoalescedAwayAtoms();
   void checkDylibSymbolCollisions();
   void linkTimeOptimize();
diff --git a/lld/lib/Core/Resolver.cpp b/lld/lib/Core/Resolver.cpp
index 4673e77556bb..33c9008f764b 100644
--- a/lld/lib/Core/Resolver.cpp
+++ b/lld/lib/Core/Resolver.cpp
@@ -360,9 +360,9 @@ void Resolver::deadStripOptimize() {
 }
 
 // error out if some undefines remain
-bool Resolver::checkUndefines(bool final) {
+bool Resolver::checkUndefines(bool isFinal) {
   // when using LTO, undefines are checked after bitcode is optimized
-  if (_haveLLVMObjs && !final)
+  if (_haveLLVMObjs && !isFinal)
     return false;
 
   // build vector of remaining undefined symbols