Misc. clang build warning fixes.
llvm-svn: 176879
diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp
index 0788257..e747f5b 100644
--- a/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -2307,7 +2307,7 @@
{
if (value_byte_size != value_data_extractor.GetByteSize())
{
- err.SetErrorStringWithFormat ("Size mismatch for %s: %llu versus %llu",
+ err.SetErrorStringWithFormat ("Size mismatch for %s: %" PRIu64 " versus %" PRIu64,
name.GetCString(),
(uint64_t)value_data_extractor.GetByteSize(),
(uint64_t)value_byte_size);
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
index 440d526..f4192b1 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
@@ -386,7 +386,7 @@
if (m_instr_info_ap.get() == NULL || m_reg_info_ap.get() == NULL || m_subtarget_info_ap.get() == NULL || m_asm_info_ap.get() == NULL)
{
- m_is_valid = NULL;
+ m_is_valid = false;
return;
}
diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
index 2e865c1..7735c76 100644
--- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
@@ -930,7 +930,7 @@
addr_t file_address = kernel_object_file->GetHeaderAddress().GetFileAddress();
if (m_load_address != LLDB_INVALID_ADDRESS && file_address != LLDB_INVALID_ADDRESS)
{
- s->Printf ("Kernel slid 0x%llx in memory.\n", m_load_address - file_address);
+ s->Printf ("Kernel slid 0x%" PRIx64 " in memory.\n", m_load_address - file_address);
}
}
if (m_module_sp->GetFileSpec().GetDirectory().IsEmpty())
diff --git a/lldb/source/Symbol/ClangASTImporter.cpp b/lldb/source/Symbol/ClangASTImporter.cpp
index 25dfbef..2c7de73 100644
--- a/lldb/source/Symbol/ClangASTImporter.cpp
+++ b/lldb/source/Symbol/ClangASTImporter.cpp
@@ -26,12 +26,12 @@
void ClangASTMetrics::DumpCounters (lldb::LogSP log, ClangASTMetrics::Counters &counters)
{
- log->Printf(" Number of visible Decl queries by name : %llu", counters.m_visible_query_count);
- log->Printf(" Number of lexical Decl queries : %llu", counters.m_lexical_query_count);
- log->Printf(" Number of imports initiated by LLDB : %llu", counters.m_lldb_import_count);
- log->Printf(" Number of imports conducted by Clang : %llu", counters.m_clang_import_count);
- log->Printf(" Number of Decls completed : %llu", counters.m_decls_completed_count);
- log->Printf(" Number of records laid out : %llu", counters.m_record_layout_count);
+ log->Printf(" Number of visible Decl queries by name : %" PRIu64, counters.m_visible_query_count);
+ log->Printf(" Number of lexical Decl queries : %" PRIu64, counters.m_lexical_query_count);
+ log->Printf(" Number of imports initiated by LLDB : %" PRIu64, counters.m_lldb_import_count);
+ log->Printf(" Number of imports conducted by Clang : %" PRIu64, counters.m_clang_import_count);
+ log->Printf(" Number of Decls completed : %" PRIu64, counters.m_decls_completed_count);
+ log->Printf(" Number of records laid out : %" PRIu64, counters.m_record_layout_count);
}
void ClangASTMetrics::DumpCounters (lldb::LogSP log)