From 58d72571863987a0f4fc048b1f28619fa0ea798c Mon Sep 17 00:00:00 2001 From: lloyd Date: Wed, 11 Jun 2008 13:32:33 +0000 Subject: Avoid -Wshadow warnings --- include/secmem.h | 10 +++++----- 1 file 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& copy) + MemoryRegion(const MemoryRegion& 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 { -- cgit v1.2.3