Author: gclayton
Date: Thu Feb 9 12:21:04 2017
New Revision: 294603
URL: http://llvm.org/viewvc/llvm-project?rev=294603&view=rev
Log:
Fix build bots.
Modified:
lldb/trunk/include/lldb/Target/Memory.h
lldb/trunk/source/Target/Memory.cpp
Modified: lldb/trunk/include/lldb/Target/Memory.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Memory.h?rev=294603&r1=294602&r2=294603&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Memory.h (original)
+++ lldb/trunk/include/lldb/Target/Memory.h Thu Feb 9 12:21:04 2017
@@ -106,9 +106,8 @@ protected:
uint32_t CalculateChunksNeededForSize(uint32_t size) const {
return (size + m_chunk_size - 1) / m_chunk_size;
}
- typedef Range<lldb::addr_t, uint32_t> Range;
// Base address of this block of memory 4GB of chunk should be enough.
- Range m_range;
+ Range<lldb::addr_t, uint32_t> m_range;
// Permissions for this memory (logical OR of lldb::Permissions bits)
const uint32_t m_permissions;
// The size of chunks that the memory at m_addr is divied up into.
Modified: lldb/trunk/source/Target/Memory.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Memory.cpp?rev=294603&r1=294602&r2=294603&view=diff
==============================================================================
--- lldb/trunk/source/Target/Memory.cpp (original)
+++ lldb/trunk/source/Target/Memory.cpp Thu Feb 9 12:21:04 2017
@@ -269,7 +269,7 @@ lldb::addr_t AllocatedBlock::ReserveBloc
const size_t free_count = m_free_blocks.GetSize();
for (size_t i=0; i<free_count; ++i)
{
- Range &free_block = m_free_blocks.GetEntryRef(i);
+ auto &free_block = m_free_blocks.GetEntryRef(i);
const lldb::addr_t range_size = free_block.GetByteSize();
if (range_size >= size)
{
@@ -291,7 +291,7 @@ lldb::addr_t AllocatedBlock::ReserveBloc
else
{
// Make the new allocated range and add it to the allocated ranges.
- Range reserved_block(free_block);
+ Range<lldb::addr_t, uint32_t> reserved_block(free_block);
reserved_block.SetByteSize(block_size);
// Insert the reserved range and don't combine it with other blocks
// in the reserved blocks list.
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
