diff options
author | Patrick Simianer <p@simianer.de> | 2014-01-28 15:35:31 +0100 |
---|---|---|
committer | Patrick Simianer <p@simianer.de> | 2014-01-28 15:35:31 +0100 |
commit | c83f665cb7efbbfb0fdfa12203b09ba60e365d25 (patch) | |
tree | d9132aaf35e696a52c5e09430ae2889b033cdacb /klm/util/mmap.cc | |
parent | 85088dc6e09d4e91038aea46e8d20b5c34053b5f (diff) | |
parent | 3e22fcc3569a2855f691be4e3ee81f644b926c04 (diff) |
resolv conflict in mira
Diffstat (limited to 'klm/util/mmap.cc')
-rw-r--r-- | klm/util/mmap.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/klm/util/mmap.cc b/klm/util/mmap.cc index 6f79f26f..cee6a970 100644 --- a/klm/util/mmap.cc +++ b/klm/util/mmap.cc @@ -90,7 +90,9 @@ void scoped_memory::call_realloc(std::size_t size) { if (!new_data) { reset(); } else { - reset(new_data, size, MALLOC_ALLOCATED); + data_ = new_data; + size_ = size; + source_ = MALLOC_ALLOCATED; } } |