compilerplugins/clang/pluginhandler.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e710170d906fcb248a5e4ff5a3a90cbf0e20003d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Sep 29 15:04:06 2015 +0200
Avoid ambiguity with C++14 std::make_unique
Change-Id: I81b8bed175527bab02ffdd2fa17fa6a66c243d95
diff --git a/compilerplugins/clang/pluginhandler.cxx
b/compilerplugins/clang/pluginhandler.cxx
index 0a5af66..6506976 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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
