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

diff --git a/include/llvm/Support/YAMLParser.h b/include/llvm/Support/YAMLParser.h
index 27d039164c16e880fbb23dbe5f04780cb9b5da4d..c5a51abb051809e4a41eb15cae3008695edd87cf 100644 (file)
--- a/include/llvm/Support/YAMLParser.h
+++ b/include/llvm/Support/YAMLParser.h
@@ -113,7 +113,6 @@ public:
   };
 
   Node(unsigned int Type, OwningPtr<Document>&, 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<char> &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<class T>
-typename enable_if_c<std::numeric_limits<T>::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 3e302d0eb1b928dceb7ed777e058e56d1c58215d..475c2e5af4f51246c782ce2ccd29fca182514a36 100644 (file)
--- a/lib/Support/YAMLParser.cpp
+++ b/lib/Support/YAMLParser.cpp
@@ -133,6 +133,7 @@ struct Token : ilist_node<Token> {
 }
 }
 
+namespace llvm {
 template<>
 struct ilist_sentinel_traits<Token> {
   Token *createSentinel() const {
@@ -163,6 +164,7 @@ struct ilist_node_traits<Token> {
 
   BumpPtrAllocator Alloc;
 };
+}
 
 typedef ilist<Token> TokenQueueT;
 
@@ -1564,8 +1566,6 @@ Node::Node(unsigned int Type, OwningPtr<Document> &D, StringRef A)
   SourceRange = SMRange(Start, Start);
 }
 
-Node::~Node() {}
-
 Token &Node::peekNext() {
   return Doc->peekNext();
 }