From c62cff1ce78b88a0165b61c7de5a60bd3306ba77 Mon Sep 17 00:00:00 2001 From: KimLS Date: Tue, 24 Feb 2015 00:38:49 -0800 Subject: [PATCH] Fixed test again. --- common/memory_buffer.cpp | 4 ++++ tests/memory_buffer_test.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/memory_buffer.cpp b/common/memory_buffer.cpp index 0910289e2..4f47867d8 100644 --- a/common/memory_buffer.cpp +++ b/common/memory_buffer.cpp @@ -52,6 +52,10 @@ EQEmu::MemoryBuffer::MemoryBuffer(MemoryBuffer &&other) { } EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator=(const MemoryBuffer &other) { + if(this == &other) { + return *this; + } + if(buffer_) { delete[] buffer_; } diff --git a/tests/memory_buffer_test.h b/tests/memory_buffer_test.h index 9d6c0cec7..0da7d01be 100644 --- a/tests/memory_buffer_test.h +++ b/tests/memory_buffer_test.h @@ -458,7 +458,7 @@ private: mb2 = mb2; void *addr2 = (void*)mb2; - TEST_ASSERT(addr != addr2); + TEST_ASSERT(addr == addr2); mb2 = std::move(mb2); addr2 = (void*)mb2;