From 02b6fa904bf74fad6a5ffbfd0c30f1d64e0dc273 Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Tue, 16 Jun 2015 00:43:04 +0000 Subject: [PATCH] modules: Move ProfileKinds to an anonymous namespace Fix a build failure with `LLVM_ENABLE_MODULES` due to `ProfileData::instr` conflicting with a function `instr()` in ``. llvm-svn: 239793 --- llvm/tools/llvm-profdata/llvm-profdata.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/llvm/tools/llvm-profdata/llvm-profdata.cpp b/llvm/tools/llvm-profdata/llvm-profdata.cpp index 1bfdb18..6fb48d8 100644 --- a/llvm/tools/llvm-profdata/llvm-profdata.cpp +++ b/llvm/tools/llvm-profdata/llvm-profdata.cpp @@ -37,7 +37,9 @@ static void exitWithError(const Twine &Message, StringRef Whence = "") { ::exit(1); } +namespace { enum ProfileKinds { instr, sample }; +} static void mergeInstrProfile(const cl::list &Inputs, StringRef OutputFilename) { -- 2.7.4