aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-06-11 13:32:33 +0000
committerlloyd <[email protected]>2008-06-11 13:32:33 +0000
commit58d72571863987a0f4fc048b1f28619fa0ea798c (patch)
tree93902e105a302bedfc6c727c8c4852826f56a760
parent3ce3dce2ff22634ee250ce6de113d1fd455019a4 (diff)
Avoid -Wshadow warnings
-rw-r--r--include/secmem.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/secmem.h b/include/secmem.h
index 8ecfa5612..1835d5bf6 100644
--- a/include/secmem.h
+++ b/include/secmem.h
@@ -67,16 +67,16 @@ class MemoryRegion
~MemoryRegion() { deallocate(buf, allocated); }
protected:
MemoryRegion() { buf = 0; alloc = 0; used = allocated = 0; }
- MemoryRegion(const MemoryRegion<T>& copy)
+ MemoryRegion(const MemoryRegion<T>& other)
{
buf = 0;
used = allocated = 0;
- alloc = copy.alloc;
- set(copy.buf, copy.used);
+ alloc = other.alloc;
+ set(other.buf, other.used);
}
- void init(bool locking, u32bit size = 0)
- { alloc = Allocator::get(locking); create(size); }
+ void init(bool locking, u32bit length = 0)
+ { alloc = Allocator::get(locking); create(length); }
private:
T* allocate(u32bit n) const
{