Merge pull request #50 from mpoquet/master

[simgrid.git] / src / xbt / memory_map.cpp

diff --git a/src/xbt/memory_map.cpp b/src/xbt/memory_map.cpp
index 0fc10cb..7d2888b 100644 (file)
--- a/src/xbt/memory_map.cpp
+++ b/src/xbt/memory_map.cpp
@@ -9,7 +9,9 @@
 #include <cstring>
 
 #include <sys/types.h>
-#include <sys/mman.h>
+#ifdef __linux__
+# include <sys/mman.h>
+#endif
 
 #include <xbt/sysdep.h>
 #include <xbt/base.h>
@@ -165,7 +167,7 @@ XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
 
   std::free(line);
   std::fclose(fp);
-  return std::move(ret);
+  return ret;
 #else
   /* On FreeBSD, kinfo_getvmmap() could be used but mmap() support is disabled
      anyway. */