From c35146b7254900b34ecad51fb71f9478360ca0b9 Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Tue, 3 Apr 2012 23:36:44 +0000 Subject: [PATCH] Sorry about that. MSVC seems to accept just about any random string you give it ;/ git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153979 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/YAMLParser.h | 20 -------------------- lib/Support/YAMLParser.cpp | 4 ++-- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/include/llvm/Support/YAMLParser.h b/include/llvm/Support/YAMLParser.h index 27d039164c1..c5a51abb051 100644 --- a/include/llvm/Support/YAMLParser.h +++ b/include/llvm/Support/YAMLParser.h @@ -113,7 +113,6 @@ public: }; Node(unsigned int Type, OwningPtr&, StringRef Anchor); - virtual ~Node(); /// @brief Get the value of the anchor attached to this node. If it does not /// have one, getAnchor().size() will be 0. @@ -208,25 +207,6 @@ private: , SmallVectorImpl &Storage) const; }; -static bool getAs(const ScalarNode *SN, bool &Result) { - SmallString<4> Storage; - StringRef Value = SN->getValue(Storage); - if (Value == "true") - Result = true; - else if (Value == "false") - Result = false; - else - return false; - return true; -} - -template -typename enable_if_c::is_integer, bool>::type -getAs(const ScalarNode *SN, T &Result) { - SmallString<4> Storage; - return !SN->getValue(Storage).getAsInteger(0, Result); -} - /// @brief A key and value pair. While not technically a Node under the YAML /// representation graph, it is easier to treat them this way. /// diff --git a/lib/Support/YAMLParser.cpp b/lib/Support/YAMLParser.cpp index 3e302d0eb1b..475c2e5af4f 100644 --- a/lib/Support/YAMLParser.cpp +++ b/lib/Support/YAMLParser.cpp @@ -133,6 +133,7 @@ struct Token : ilist_node { } } +namespace llvm { template<> struct ilist_sentinel_traits { Token *createSentinel() const { @@ -163,6 +164,7 @@ struct ilist_node_traits { BumpPtrAllocator Alloc; }; +} typedef ilist TokenQueueT; @@ -1564,8 +1566,6 @@ Node::Node(unsigned int Type, OwningPtr &D, StringRef A) SourceRange = SMRange(Start, Start); } -Node::~Node() {} - Token &Node::peekNext() { return Doc->peekNext(); }