From 2368d54c079972ab59253b0fa8a26efcad0811b1 Mon Sep 17 00:00:00 2001 From: Frederic Riss Date: Fri, 29 May 2015 18:14:55 +0000 Subject: [PATCH] YAML traits need to be in the llvm::yaml namespace. Hope this fixes the bits, eg: http://lab.llvm.org:8011/builders/clang-hexagon-elf/builds/27147 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238586 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Support/YAMLIOTest.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/unittests/Support/YAMLIOTest.cpp b/unittests/Support/YAMLIOTest.cpp index f519516aa68..e7affa1698d 100644 --- a/unittests/Support/YAMLIOTest.cpp +++ b/unittests/Support/YAMLIOTest.cpp @@ -2081,6 +2081,12 @@ struct FlowMap { : str1(str1), str2(str2), str3(str3) {} }; +struct FlowSeq { + llvm::StringRef str; + FlowSeq(llvm::StringRef S) : str(S) {} + FlowSeq() = default; +}; + namespace llvm { namespace yaml { template <> @@ -2093,14 +2099,6 @@ namespace yaml { static const bool flow = true; }; -} -} - -struct FlowSeq { - llvm::StringRef str; - FlowSeq(llvm::StringRef S) : str(S) {} - FlowSeq() = default; -}; template <> struct ScalarTraits { @@ -2114,6 +2112,8 @@ struct ScalarTraits { static bool mustQuote(StringRef S) { return false; } }; +} +} LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(FlowSeq) -- 2.34.1