diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-03-08 10:59:54 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-03-08 10:59:54 -0500 |
| commit | 3200ebc2ea5f6bb51130cbc69d6533144a9f4ddc (patch) | |
| tree | e234c061c28a95c35afbb35b80b89e3114ecdeb9 /deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp | |
| parent | 2e010c60ae006944ae20ab8b3445598471c9f1e8 (diff) | |
| parent | b57cb04afc1898c3b21ef3486709f0c0aa285433 (diff) | |
| download | zig-3200ebc2ea5f6bb51130cbc69d6533144a9f4ddc.tar.gz zig-3200ebc2ea5f6bb51130cbc69d6533144a9f4ddc.zip | |
Merge branch 'llvm6'
Zig now depends on LLVM 6.0.0.
The latest commit that depends on LLVM 5.0.1 is
2e010c60ae006944ae20ab8b3445598471c9f1e8.
Diffstat (limited to 'deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp')
| -rw-r--r-- | deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp b/deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp index 4c88eb1d14..59548684e6 100644 --- a/deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp +++ b/deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp @@ -280,7 +280,7 @@ template <> struct ScalarTraits<RefKind> { return StringRef("unknown reference kind"); } - static bool mustQuote(StringRef) { return false; } + static QuotingType mustQuote(StringRef) { return QuotingType::None; } }; template <> struct ScalarEnumerationTraits<lld::File::Kind> { @@ -495,7 +495,7 @@ template <> struct ScalarTraits<lld::DefinedAtom::Alignment> { return StringRef(); // returning empty string means success } - static bool mustQuote(StringRef) { return false; } + static QuotingType mustQuote(StringRef) { return QuotingType::None; } }; template <> struct ScalarEnumerationTraits<FileKinds> { @@ -552,7 +552,7 @@ template <> struct ScalarTraits<ImplicitHex8> { return StringRef(); // returning empty string means success } - static bool mustQuote(StringRef) { return false; } + static QuotingType mustQuote(StringRef) { return QuotingType::None; } }; // YAML conversion for std::vector<const lld::File*> |