commit 003bb09e78e6b187b0692ffda0e6b3c1f84e6283
author Reid Kleckner <rnk@google.com> Tue Sep 13 22:22:56 2016 +0000
committer Reid Kleckner <rnk@google.com> Tue Sep 13 22:22:56 2016 +0000
tree 5923cf68f53a33660fffe198610e7caf12e62f38
parent 7398b178f1fbc1bfff26a63b327439f6a11620e7

Fix a FIXME about MSVC 2013 in the diagnostic doc generation code

Ultimately it boiled down to adding a move constructor.

llvm-svn: 281408

clang/utils/TableGen/ClangDiagnosticsEmitter.cpp

diff --git a/clang/utils/TableGen/ClangDiagnosticsEmitter.cpp b/clang/utils/TableGen/ClangDiagnosticsEmitter.cpp
index 00769a4..036e742 100644
--- a/clang/utils/TableGen/ClangDiagnosticsEmitter.cpp
+++ b/clang/utils/TableGen/ClangDiagnosticsEmitter.cpp
@@ -928,13 +928,14 @@
     void print(std::vector<std::string> &RST) override;
   };
   struct SelectPiece : Piece {
+    SelectPiece() {}
+    SelectPiece(SelectPiece &&O) LLVM_NOEXCEPT : Options(std::move(O.Options)) {
+    }
     std::vector<DiagText> Options;
     void print(std::vector<std::string> &RST) override;
   };
 
-  // FIXME: This should be a unique_ptr, but I can't figure out how to get MSVC
-  // to not issue errors on that.
-  std::vector<std::shared_ptr<Piece>> Pieces;
+  std::vector<std::unique_ptr<Piece>> Pieces;
 
   DiagText();
   DiagText(DiagText &&O) LLVM_NOEXCEPT : Pieces(std::move(O.Pieces)) {}
@@ -943,7 +944,7 @@
   DiagText(StringRef Kind, StringRef Text);
 
   template<typename P> void add(P Piece) {
-    Pieces.push_back(std::make_shared<P>(std::move(Piece)));
+    Pieces.push_back(llvm::make_unique<P>(std::move(Piece)));
   }
   void print(std::vector<std::string> &RST);
 };
@@ -1040,7 +1041,8 @@
   Prefix.Role = Kind;
   Prefix.Text = Kind;
   Prefix.Text += ": ";
-  Pieces.insert(Pieces.begin(), std::make_shared<TextPiece>(std::move(Prefix)));
+  Pieces.insert(Pieces.begin(),
+                llvm::make_unique<TextPiece>(std::move(Prefix)));
 }
 
 void escapeRST(StringRef Str, std::string &Out) {