From bceec7f9a805f9a4735e9cd04cd0f8920cebb412 Mon Sep 17 00:00:00 2001 From: Matt Beaumont-Gay Date: Tue, 29 Mar 2011 22:25:36 +0000 Subject: [PATCH] Quiet a gcc warning about changed name lookup rules llvm-svn: 128497 --- llvm/cmake/modules/LLVMLibDeps.cmake | 2 +- llvm/utils/TableGen/ClangSACheckersEmitter.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/cmake/modules/LLVMLibDeps.cmake b/llvm/cmake/modules/LLVMLibDeps.cmake index 1996ceceb759..68769d669699 100644 --- a/llvm/cmake/modules/LLVMLibDeps.cmake +++ b/llvm/cmake/modules/LLVMLibDeps.cmake @@ -33,7 +33,7 @@ set(MSVC_LIB_DEPS_LLVMMBlazeCodeGen LLVMAsmPrinter LLVMCodeGen LLVMCore LLVMMBla set(MSVC_LIB_DEPS_LLVMMBlazeDisassembler LLVMMBlazeCodeGen LLVMMBlazeInfo LLVMMC LLVMSupport) set(MSVC_LIB_DEPS_LLVMMBlazeInfo LLVMMC LLVMSupport) set(MSVC_LIB_DEPS_LLVMMC LLVMSupport) -set(MSVC_LIB_DEPS_LLVMMCDisassembler LLVMARMAsmParser LLVMARMCodeGen LLVMARMDisassembler LLVMARMInfo LLVMAlphaCodeGen LLVMAlphaInfo LLVMBlackfinCodeGen LLVMBlackfinInfo LLVMCBackend LLVMCBackendInfo LLVMCellSPUCodeGen LLVMCellSPUInfo LLVMCppBackend LLVMCppBackendInfo LLVMMBlazeAsmParser LLVMMBlazeCodeGen LLVMMBlazeDisassembler LLVMMBlazeInfo LLVMMC LLVMMCParser LLVMMSP430CodeGen LLVMMSP430Info LLVMMipsCodeGen LLVMMipsInfo LLVMPTXCodeGen LLVMPTXInfo LLVMPowerPCCodeGen LLVMPowerPCInfo LLVMSparcCodeGen LLVMSparcInfo LLVMSupport LLVMSystemZCodeGen LLVMSystemZInfo LLVMX86AsmParser LLVMX86CodeGen LLVMX86Disassembler LLVMX86Info LLVMXCoreCodeGen LLVMXCoreInfo) +set(MSVC_LIB_DEPS_LLVMMCDisassembler LLVMARMAsmParser LLVMARMCodeGen LLVMARMDisassembler LLVMARMInfo LLVMAlphaCodeGen LLVMAlphaInfo LLVMBlackfinCodeGen LLVMBlackfinInfo LLVMCBackend LLVMCBackendInfo LLVMCellSPUCodeGen LLVMCellSPUInfo LLVMCppBackend LLVMCppBackendInfo LLVMMBlazeAsmParser LLVMMBlazeCodeGen LLVMMBlazeDisassembler LLVMMBlazeInfo LLVMMC LLVMMCParser LLVMMSP430CodeGen LLVMMSP430Info LLVMMipsCodeGen LLVMMipsInfo LLVMPTXCodeGen LLVMPTXInfo LLVMPowerPCCodeGen LLVMPowerPCInfo LLVMSparcCodeGen LLVMSparcInfo LLVMSupport LLVMSystemZCodeGen LLVMSystemZInfo LLVMTarget LLVMX86AsmParser LLVMX86CodeGen LLVMX86Disassembler LLVMX86Info LLVMXCoreCodeGen LLVMXCoreInfo) set(MSVC_LIB_DEPS_LLVMMCJIT LLVMCore LLVMExecutionEngine LLVMRuntimeDyld LLVMSupport LLVMTarget) set(MSVC_LIB_DEPS_LLVMMCParser LLVMMC LLVMSupport) set(MSVC_LIB_DEPS_LLVMMSP430AsmPrinter LLVMMC LLVMSupport) diff --git a/llvm/utils/TableGen/ClangSACheckersEmitter.cpp b/llvm/utils/TableGen/ClangSACheckersEmitter.cpp index 5eece5ad3873..1dd673501109 100644 --- a/llvm/utils/TableGen/ClangSACheckersEmitter.cpp +++ b/llvm/utils/TableGen/ClangSACheckersEmitter.cpp @@ -246,13 +246,13 @@ void ClangSACheckersEmitter::run(raw_ostream &OS) { llvm::DenseSet &checkers = I->second.Checkers; if (!checkers.empty()) { + OS << "static const short CheckerArray" << I->second.Index << "[] = { "; // Make the output order deterministic. std::map sorted; for (llvm::DenseSet::iterator I = checkers.begin(), E = checkers.end(); I != E; ++I) sorted[(*I)->getID()] = *I; - OS << "static const short CheckerArray" << I->second.Index << "[] = { "; for (std::map::iterator I = sorted.begin(), E = sorted.end(); I != E; ++I) OS << checkerRecIndexMap[I->second] << ", "; @@ -261,13 +261,13 @@ void ClangSACheckersEmitter::run(raw_ostream &OS) { llvm::DenseSet &subGroups = I->second.SubGroups; if (!subGroups.empty()) { + OS << "static const short SubPackageArray" << I->second.Index << "[] = { "; // Make the output order deterministic. std::map sorted; for (llvm::DenseSet::iterator I = subGroups.begin(), E = subGroups.end(); I != E; ++I) sorted[(*I)->getID()] = *I; - OS << "static const short SubPackageArray" << I->second.Index << "[] = { "; for (std::map::iterator I = sorted.begin(), E = sorted.end(); I != E; ++I) { OS << recordGroupMap[I->second]->Index << ", ";