From f6ee46a6cd4bc514029ae1d71479c1343a72cec5 Mon Sep 17 00:00:00 2001
From: Jannis Linxweiler <linxweiler@irmb.tu-bs.de>
Date: Fri, 25 Oct 2019 11:18:35 +0200
Subject: [PATCH] fixes memory utility on Apple
---
VirtualFluidsCore/Utilities/MemoryUtil.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/VirtualFluidsCore/Utilities/MemoryUtil.h b/VirtualFluidsCore/Utilities/MemoryUtil.h
index 32913582d..c8306083b 100644
--- a/VirtualFluidsCore/Utilities/MemoryUtil.h
+++ b/VirtualFluidsCore/Utilities/MemoryUtil.h
@@ -142,8 +142,10 @@ namespace Utilities
PROCESS_MEMORY_COUNTERS pmc;
GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc));
SIZE_T physMemUsedByMe = pmc.WorkingSetSize;
- #elif defined(MEMORYUTIL_LINUX) || defined(MEMORYUTIL_APPLE)
+ #elif defined(MEMORYUTIL_LINUX)
long long physMemUsedByMe = (long long)getValue() * (long long)1024;
+ #elif defined(MEMORYUTIL_APPLE)
+ long long physMemUsedByMe = 0;
#elif defined(MEMORYUTIL_CYGWIN)
long long physMemUsedByMe = (long long)getValue() * (long long)1024;
#else
--
GitLab