From e3e855bb897a3fbf62aa4c9a53e1c0becdb666d5 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Sat, 24 Aug 2013 13:12:34 +0000 Subject: Replace compLocDecl with less_first. llvm-svn: 189170 --- clang/lib/Frontend/ASTUnit.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'clang/lib/Frontend/ASTUnit.cpp') diff --git a/clang/lib/Frontend/ASTUnit.cpp b/clang/lib/Frontend/ASTUnit.cpp index 9080349c956..b6a35c8cd3a 100644 --- a/clang/lib/Frontend/ASTUnit.cpp +++ b/clang/lib/Frontend/ASTUnit.cpp @@ -2644,11 +2644,6 @@ void ASTUnit::TranslateStoredDiagnostics( Result.swap(Out); } -static inline bool compLocDecl(std::pair L, - std::pair R) { - return L.first < R.first; -} - void ASTUnit::addFileLevelDecl(Decl *D) { assert(D); @@ -2684,8 +2679,8 @@ void ASTUnit::addFileLevelDecl(Decl *D) { return; } - LocDeclsTy::iterator - I = std::upper_bound(Decls->begin(), Decls->end(), LocDecl, compLocDecl); + LocDeclsTy::iterator I = + std::upper_bound(Decls->begin(), Decls->end(), LocDecl, less_first()); Decls->insert(I, LocDecl); } @@ -2709,9 +2704,9 @@ void ASTUnit::findFileRegionDecls(FileID File, unsigned Offset, unsigned Length, if (LocDecls.empty()) return; - LocDeclsTy::iterator - BeginIt = std::lower_bound(LocDecls.begin(), LocDecls.end(), - std::make_pair(Offset, (Decl*)0), compLocDecl); + LocDeclsTy::iterator BeginIt = + std::lower_bound(LocDecls.begin(), LocDecls.end(), + std::make_pair(Offset, (Decl *)0), less_first()); if (BeginIt != LocDecls.begin()) --BeginIt; @@ -2722,10 +2717,9 @@ void ASTUnit::findFileRegionDecls(FileID File, unsigned Offset, unsigned Length, BeginIt->second->isTopLevelDeclInObjCContainer()) --BeginIt; - LocDeclsTy::iterator - EndIt = std::upper_bound(LocDecls.begin(), LocDecls.end(), - std::make_pair(Offset+Length, (Decl*)0), - compLocDecl); + LocDeclsTy::iterator EndIt = std::upper_bound( + LocDecls.begin(), LocDecls.end(), + std::make_pair(Offset + Length, (Decl *)0), less_first()); if (EndIt != LocDecls.end()) ++EndIt; -- cgit v1.2.3