Skip to content

Commit 6b20001

Browse files
committed
[𝘀𝗽𝗿] changes introduced through rebase
Created using spr 1.3.4 [skip ci]
1 parent e696bc4 commit 6b20001

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

llvm/include/llvm/Support/YAMLTraits.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,6 @@ class IO {
819819
virtual NodeKind getNodeKind() = 0;
820820

821821
virtual void setError(const Twine &) = 0;
822-
virtual std::error_code error() = 0;
823822
virtual void setAllowUnknownKeys(bool Allow);
824823

825824
template <typename T>
@@ -1449,7 +1448,7 @@ class Input : public IO {
14491448
~Input() override;
14501449

14511450
// Check if there was an syntax or semantic error during parsing.
1452-
std::error_code error() override;
1451+
std::error_code error();
14531452

14541453
private:
14551454
bool outputting() const override;
@@ -1632,7 +1631,6 @@ class Output : public IO {
16321631
void scalarTag(std::string &) override;
16331632
NodeKind getNodeKind() override;
16341633
void setError(const Twine &message) override;
1635-
std::error_code error() override;
16361634
bool canElideEmptySequence() override;
16371635

16381636
// These are only used by operator<<. They could be private

llvm/lib/Support/YAMLTraits.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,8 +750,6 @@ void Output::scalarTag(std::string &Tag) {
750750
void Output::setError(const Twine &message) {
751751
}
752752

753-
std::error_code Output::error() { return {}; }
754-
755753
bool Output::canElideEmptySequence() {
756754
// Normally, with an optional key/value where the value is an empty sequence,
757755
// the whole key/value can be not written. But, that produces wrong yaml

0 commit comments

Comments
 (0)