From e710170d906fcb248a5e4ff5a3a90cbf0e20003d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 29 Sep 2015 15:04:06 +0200
Subject: Avoid ambiguity with C++14 std::make_unique

Change-Id: I81b8bed175527bab02ffdd2fa17fa6a66c243d95
---
 compilerplugins/clang/pluginhandler.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'compilerplugins/clang/pluginhandler.cxx')

diff --git a/compilerplugins/clang/pluginhandler.cxx b/compilerplugins/clang/pluginhandler.cxx
index 0a5af667e9db..65069766ba42 100644
--- a/compilerplugins/clang/pluginhandler.cxx
+++ b/compilerplugins/clang/pluginhandler.cxx
@@ -244,7 +244,7 @@ void PluginHandler::HandleTranslationUnit( ASTContext& context )
 #if (__clang_major__ == 3 && __clang_minor__ >= 6) || __clang_major__ > 3
 std::unique_ptr<ASTConsumer> LibreOfficeAction::CreateASTConsumer( CompilerInstance& Compiler, StringRef )
     {
-    return make_unique<PluginHandler>( Compiler, _args );
+    return llvm::make_unique<PluginHandler>( Compiler, _args );
     }
 #else
 ASTConsumer* LibreOfficeAction::CreateASTConsumer( CompilerInstance& Compiler, StringRef )
-- 
cgit