From 38bee040986e3743eba006fdb415a8a0e02341fa Mon Sep 17 00:00:00 2001 From: Marek Sokolowski Date: Fri, 29 Sep 2017 00:33:57 +0000 Subject: [PATCH] [llvm-rc] Import all make_unique invocations from llvm namespace. Previous patch fixed one of LLVM buildbots (lld-x86_64-win7). However, some others have already been failing because of make_unique compilation error (llvm-clang-x86_64-expensive-checks-win). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@314480 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-rc/ResourceScriptParser.cpp | 42 ++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/tools/llvm-rc/ResourceScriptParser.cpp b/tools/llvm-rc/ResourceScriptParser.cpp index 211d9e7e954..37d82b8182d 100644 --- a/tools/llvm-rc/ResourceScriptParser.cpp +++ b/tools/llvm-rc/ResourceScriptParser.cpp @@ -365,7 +365,8 @@ RCParser::ParseType RCParser::parseAcceleratorsResource() { ASSIGN_OR_RETURN(OptStatements, parseOptionalStatements()); RETURN_IF_ERROR(consumeType(Kind::BlockBegin)); - auto Accels = make_unique(std::move(*OptStatements)); + auto Accels = + llvm::make_unique(std::move(*OptStatements)); while (!consumeOptionalType(Kind::BlockEnd)) { ASSIGN_OR_RETURN(EventResult, readIntOrString()); @@ -381,7 +382,7 @@ RCParser::ParseType RCParser::parseAcceleratorsResource() { RCParser::ParseType RCParser::parseCursorResource() { ASSIGN_OR_RETURN(Arg, readString()); - return make_unique(*Arg); + return llvm::make_unique(*Arg); } RCParser::ParseType RCParser::parseDialogResource(bool IsExtended) { @@ -404,7 +405,7 @@ RCParser::ParseType RCParser::parseDialogResource(bool IsExtended) { "parseOptionalStatements, when successful, halts on BlockBegin."); consume(); - auto Dialog = make_unique( + auto Dialog = llvm::make_unique( (*LocResult)[0], (*LocResult)[1], (*LocResult)[2], (*LocResult)[3], HelpID, std::move(*OptStatements), IsExtended); @@ -422,7 +423,7 @@ RCParser::ParseType RCParser::parseUserDefinedResource(IntOrString Type) { // Check if this is a file resource. if (look().kind() == Kind::String) - return make_unique(Type, read().value()); + return llvm::make_unique(Type, read().value()); RETURN_IF_ERROR(consumeType(Kind::BlockBegin)); std::vector Data; @@ -438,7 +439,7 @@ RCParser::ParseType RCParser::parseUserDefinedResource(IntOrString Type) { Data.push_back(*Item); } - return make_unique(Type, std::move(Data)); + return llvm::make_unique(Type, std::move(Data)); } RCParser::ParseType RCParser::parseVersionInfoResource() { @@ -480,19 +481,19 @@ Expected RCParser::parseControl() { RCParser::ParseType RCParser::parseIconResource() { ASSIGN_OR_RETURN(Arg, readString()); - return make_unique(*Arg); + return llvm::make_unique(*Arg); } RCParser::ParseType RCParser::parseHTMLResource() { ASSIGN_OR_RETURN(Arg, readString()); - return make_unique(*Arg); + return llvm::make_unique(*Arg); } RCParser::ParseType RCParser::parseMenuResource() { ASSIGN_OR_RETURN(OptStatements, parseOptionalStatements()); ASSIGN_OR_RETURN(Items, parseMenuItemsList()); - return make_unique(std::move(*OptStatements), - std::move(*Items)); + return llvm::make_unique(std::move(*OptStatements), + std::move(*Items)); } Expected RCParser::parseMenuItemsList() { @@ -516,7 +517,7 @@ Expected RCParser::parseMenuItemsList() { // Now, expecting SEPARATOR. ASSIGN_OR_RETURN(SeparatorResult, readIdentifier()); if (SeparatorResult->equals_lower("SEPARATOR")) { - List.addDefinition(make_unique()); + List.addDefinition(llvm::make_unique()); continue; } @@ -540,14 +541,14 @@ Expected RCParser::parseMenuItemsList() { if (IsPopup) { // If POPUP, read submenu items recursively. ASSIGN_OR_RETURN(SubMenuResult, parseMenuItemsList()); - List.addDefinition(make_unique(*CaptionResult, *FlagsResult, - std::move(*SubMenuResult))); + List.addDefinition(llvm::make_unique( + *CaptionResult, *FlagsResult, std::move(*SubMenuResult))); continue; } assert(IsMenuItem); List.addDefinition( - make_unique(*CaptionResult, MenuResult, *FlagsResult)); + llvm::make_unique(*CaptionResult, MenuResult, *FlagsResult)); } return std::move(List); @@ -557,7 +558,8 @@ RCParser::ParseType RCParser::parseStringTableResource() { ASSIGN_OR_RETURN(OptStatements, parseOptionalStatements()); RETURN_IF_ERROR(consumeType(Kind::BlockBegin)); - auto Table = make_unique(std::move(*OptStatements)); + auto Table = + llvm::make_unique(std::move(*OptStatements)); // Read strings until we reach the end of the block. while (!consumeOptionalType(Kind::BlockEnd)) { @@ -640,34 +642,34 @@ RCParser::parseVersionInfoFixed() { RCParser::ParseOptionType RCParser::parseLanguageStmt() { ASSIGN_OR_RETURN(Args, readIntsWithCommas(/* min = */ 2, /* max = */ 2)); - return make_unique((*Args)[0], (*Args)[1]); + return llvm::make_unique((*Args)[0], (*Args)[1]); } RCParser::ParseOptionType RCParser::parseCharacteristicsStmt() { ASSIGN_OR_RETURN(Arg, readInt()); - return make_unique(*Arg); + return llvm::make_unique(*Arg); } RCParser::ParseOptionType RCParser::parseVersionStmt() { ASSIGN_OR_RETURN(Arg, readInt()); - return make_unique(*Arg); + return llvm::make_unique(*Arg); } RCParser::ParseOptionType RCParser::parseCaptionStmt() { ASSIGN_OR_RETURN(Arg, readString()); - return make_unique(*Arg); + return llvm::make_unique(*Arg); } RCParser::ParseOptionType RCParser::parseFontStmt() { ASSIGN_OR_RETURN(SizeResult, readInt()); RETURN_IF_ERROR(consumeType(Kind::Comma)); ASSIGN_OR_RETURN(NameResult, readString()); - return make_unique(*SizeResult, *NameResult); + return llvm::make_unique(*SizeResult, *NameResult); } RCParser::ParseOptionType RCParser::parseStyleStmt() { ASSIGN_OR_RETURN(Arg, readInt()); - return make_unique(*Arg); + return llvm::make_unique(*Arg); } Error RCParser::getExpectedError(const Twine Message, bool IsAlreadyRead) { -- 2.11.0