diff options
author | Vitaly Buka <vitalybuka@google.com> | 2017-08-31 05:32:36 +0000 |
---|---|---|
committer | Vitaly Buka <vitalybuka@google.com> | 2017-08-31 05:32:36 +0000 |
commit | 639888fca52f97f41ed9d876f68a443dfea6581c (patch) | |
tree | c7083fa8ee05c1028f383dd339b7503f38f0906c /lib/WindowsManifest | |
parent | 99469895318be8283586e314b145d1552cb687c6 (diff) |
Revert "llvm-mt: Fix release of OutputDoc"
Multiple bots are broken.
This reverts commit r312207.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@312212 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/WindowsManifest')
-rw-r--r-- | lib/WindowsManifest/WindowsManifestMerger.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/WindowsManifest/WindowsManifestMerger.cpp b/lib/WindowsManifest/WindowsManifestMerger.cpp index da968c4ae1a..91547c98469 100644 --- a/lib/WindowsManifest/WindowsManifestMerger.cpp +++ b/lib/WindowsManifest/WindowsManifestMerger.cpp @@ -652,13 +652,11 @@ WindowsManifestMerger::WindowsManifestMergerImpl::getMergedManifest() { xmlNodePtr CombinedRoot = xmlDocGetRootElement(CombinedDoc); std::vector<xmlNsPtr> RequiredPrefixes; checkAndStripPrefixes(CombinedRoot, RequiredPrefixes); - std::unique_ptr<xmlDoc, decltype(&xmlFreeDoc)> OutputDoc( - xmlNewDoc((const unsigned char *)"1.0"), &xmlFreeDoc); + std::unique_ptr<xmlDoc> OutputDoc(xmlNewDoc((const unsigned char *)"1.0")); xmlDocSetRootElement(OutputDoc.get(), CombinedRoot); xmlKeepBlanksDefault(0); xmlDocDumpFormatMemoryEnc(OutputDoc.get(), &XmlBuff, &BufferSize, "UTF-8", 1); - xmlDocSetRootElement(OutputDoc.get(), nullptr); } if (BufferSize == 0) return nullptr; |