Merge remote-tracking branch 'origin/develop' into osxtravis

2016-02-17 10:07:13 +01:00 · 2016-02-17 10:07:13 +01:00 · 5a5b7ce5ff
commit 5a5b7ce5ff
parent c3e0c47c46 b8fdd2e941
1 changed files with 1 additions and 0 deletions
--- a/src/cpp-utils/system/get_total_memory.cpp
+++ b/src/cpp-utils/system/get_total_memory.cpp
@ -2,6 +2,7 @@
 #include <sys/sysctl.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <stdexcept>

 namespace cpputils{
    namespace system {