From 8f2394e5af85cea476fb6b47958e4d549a050973 Mon Sep 17 00:00:00 2001 From: Yaron Keren Date: Wed, 3 Sep 2014 08:22:30 +0000 Subject: [PATCH] Fix ambiguous call to make_unique and clang-format. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217023 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/TableGen/FixedLenDecoderEmitter.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/utils/TableGen/FixedLenDecoderEmitter.cpp b/utils/TableGen/FixedLenDecoderEmitter.cpp index 0a8179f443d..a4eb8292bd2 100644 --- a/utils/TableGen/FixedLenDecoderEmitter.cpp +++ b/utils/TableGen/FixedLenDecoderEmitter.cpp @@ -551,13 +551,10 @@ void Filter::recurse() { // Delegates to an inferior filter chooser for further processing on this // group of instructions whose segment values are variable. - FilterChooserMap.insert(std::make_pair( - -1U, - make_unique(Owner->AllInstructions, - VariableInstructions, - Owner->Operands, - BitValueArray, - *Owner))); + FilterChooserMap.insert( + std::make_pair(-1U, llvm::make_unique( + Owner->AllInstructions, VariableInstructions, + Owner->Operands, BitValueArray, *Owner))); } // No need to recurse for a singleton filtered instruction. @@ -584,12 +581,9 @@ void Filter::recurse() { // Delegates to an inferior filter chooser for further processing on this // category of instructions. FilterChooserMap.insert(std::make_pair( - mapIterator->first, - make_unique(Owner->AllInstructions, - mapIterator->second, - Owner->Operands, - BitValueArray, - *Owner))); + mapIterator->first, llvm::make_unique( + Owner->AllInstructions, mapIterator->second, + Owner->Operands, BitValueArray, *Owner))); } } -- 2.40.0