summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaelyn Uhrain <rikka@google.com>2012-04-05 23:06:17 +0000
committerKaelyn Uhrain <rikka@google.com>2012-04-05 23:06:17 +0000
commitcb5b585ccadb1468cb93926f6927ea9119be4ea2 (patch)
treeecb3662664562de99acba289d83725f85bdec34e
parentc1f0d5b8736c69557567de86267ff61417d60779 (diff)
downloadbcm5719-llvm-cb5b585ccadb1468cb93926f6927ea9119be4ea2.tar.gz
bcm5719-llvm-cb5b585ccadb1468cb93926f6927ea9119be4ea2.zip
Fix the build breakage introduced by r154131.
The empty 1-argument operator delete is for the benefit of the destructor. A couple of spot checks of running yaml-bench under valgrind against a few of the files under test/YAMLParser did not reveal any leaks introduced by this change. llvm-svn: 154137
-rw-r--r--llvm/include/llvm/Support/YAMLParser.h22
1 files changed, 3 insertions, 19 deletions
diff --git a/llvm/include/llvm/Support/YAMLParser.h b/llvm/include/llvm/Support/YAMLParser.h
index 85ecc13d964..b24cacd3c32 100644
--- a/llvm/include/llvm/Support/YAMLParser.h
+++ b/llvm/include/llvm/Support/YAMLParser.h
@@ -149,7 +149,9 @@ protected:
OwningPtr<Document> &Doc;
SMRange SourceRange;
- virtual ~Node();
+ void operator delete(void *) throw() {}
+
+ virtual ~Node() {}
private:
unsigned int TypeID;
@@ -168,9 +170,6 @@ public:
static inline bool classof(const Node *N) {
return N->getType() == NK_Null;
}
-
-protected:
- virtual ~NullNode();
};
/// @brief A scalar node is an opaque datum that can be presented as a
@@ -205,9 +204,6 @@ public:
return N->getType() == NK_Scalar;
}
-protected:
- virtual ~ScalarNode();
-
private:
StringRef Value;
@@ -255,9 +251,6 @@ public:
return N->getType() == NK_KeyValue;
}
-protected:
- virtual ~KeyValueNode();
-
private:
Node *Key;
Node *Value;
@@ -374,9 +367,6 @@ public:
return N->getType() == NK_Mapping;
}
-protected:
- virtual ~MappingNode();
-
private:
MappingType Type;
bool IsAtBeginning;
@@ -440,9 +430,6 @@ public:
return N->getType() == NK_Sequence;
}
-protected:
- virtual ~SequenceNode();
-
private:
SequenceType SeqType;
bool IsAtBeginning;
@@ -468,9 +455,6 @@ public:
return N->getType() == NK_Alias;
}
-protected:
- virtual ~AliasNode();
-
private:
StringRef Name;
};
OpenPOWER on IntegriCloud