[llvm] r217023 - Fix ambiguous call to make_unique and clang-format.

[Yaron Keren]

Author: yrnkrn
Date: Wed Sep  3 03:22:30 2014
New Revision: 217023

URL: http://llvm.org/viewvc/llvm-project?rev=217023&view=rev
Log:
Fix ambiguous call to make_unique and clang-format.


Modified:
    llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.cpp

Modified: llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.cpp?rev=217023&r1=217022&r2=217023&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/FixedLenDecoderEmitter.cpp Wed Sep  3 03:22:30 2014
@@ -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<FilterChooser>(Owner->AllInstructions,
-                                                         VariableInstructions,
-                                                         Owner->Operands,
-                                                         BitValueArray,
-                                                         *Owner)));
+    FilterChooserMap.insert(
+        std::make_pair(-1U, llvm::make_unique<FilterChooser>(
+                                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<FilterChooser>(Owner->AllInstructions,
-                                                         mapIterator->second,
-                                                         Owner->Operands,
-                                                         BitValueArray,
-                                                         *Owner)));
+        mapIterator->first, llvm::make_unique<FilterChooser>(
+                                Owner->AllInstructions, mapIterator->second,
+                                Owner->Operands, BitValueArray, *Owner)));
   }
 }