[llvm] r314472 - [llvm-rc] Fix-up for r314468 (argument-dependent lookup in make_unique).

Marek Sokolowski via llvm-commits llvm-commits at lists.llvm.org
Thu Sep 28 16:12:53 PDT 2017


Author: mnbvmar
Date: Thu Sep 28 16:12:53 2017
New Revision: 314472

URL: http://llvm.org/viewvc/llvm-project?rev=314472&view=rev
Log:
[llvm-rc] Fix-up for r314468 (argument-dependent lookup in make_unique).

Modified:
    llvm/trunk/tools/llvm-rc/ResourceScriptParser.cpp

Modified: llvm/trunk/tools/llvm-rc/ResourceScriptParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-rc/ResourceScriptParser.cpp?rev=314472&r1=314471&r2=314472&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-rc/ResourceScriptParser.cpp (original)
+++ llvm/trunk/tools/llvm-rc/ResourceScriptParser.cpp Thu Sep 28 16:12:53 2017
@@ -327,8 +327,8 @@ RCParser::ParseType RCParser::parseDialo
 RCParser::ParseType RCParser::parseVersionInfoResource() {
   ASSIGN_OR_RETURN(FixedResult, parseVersionInfoFixed());
   ASSIGN_OR_RETURN(BlockResult, parseVersionInfoBlockContents(StringRef()));
-  return make_unique<VersionInfoResource>(std::move(**BlockResult),
-                                          std::move(*FixedResult));
+  return llvm::make_unique<VersionInfoResource>(std::move(**BlockResult),
+                                                std::move(*FixedResult));
 }
 
 Expected<Control> RCParser::parseControl() {
@@ -459,7 +459,7 @@ Expected<std::unique_ptr<VersionInfoBloc
 RCParser::parseVersionInfoBlockContents(StringRef BlockName) {
   RETURN_IF_ERROR(consumeType(Kind::BlockBegin));
 
-  auto Contents = make_unique<VersionInfoBlock>(BlockName);
+  auto Contents = llvm::make_unique<VersionInfoBlock>(BlockName);
 
   while (!isNextTokenKind(Kind::BlockEnd)) {
     ASSIGN_OR_RETURN(Stmt, parseVersionInfoStmt());
@@ -490,7 +490,7 @@ Expected<std::unique_ptr<VersionInfoStmt
       ASSIGN_OR_RETURN(ValueResult, readIntOrString());
       Values.push_back(*ValueResult);
     }
-    return make_unique<VersionInfoValue>(*KeyResult, std::move(Values));
+    return llvm::make_unique<VersionInfoValue>(*KeyResult, std::move(Values));
   }
 
   return getExpectedError("BLOCK or VALUE", true);




More information about the llvm-commits mailing list