Merge remote-tracking branch 'origin/testing_intel_atom'

TimDowker · May 23, 2015 · 440f142 · 440f142
2 parents 3964ab6 + ca7cb62
commit 440f142
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/FileManager.cpp b/FileManager.cpp
@@ -24,6 +24,7 @@
 #include "Settings.h"
 #include <sstream>
 #include <vector>
+#include <cstdlib>
 #include <math.h>
 
 using namespace std;

diff --git a/FolderSetting.cpp b/FolderSetting.cpp
@@ -21,6 +21,7 @@
 #include "UserInterface.h"
 #include <sys/stat.h>
 #include <string.h>
+#include <cstdlib>
 
 FolderSetting::FolderSetting(UserInterface ui, string name, string description, 
                            string settings_change_prompt, string default_param)

diff --git a/StartMode.cpp b/StartMode.cpp
@@ -25,7 +25,8 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <iostream>
+#include <cstdlib>
+#include <string.h>
 
 StartMode::StartMode(UserInterface& ui, VectorSourceManager& man,
                      FileManager& fileman, AnalyzeMedia& analyze,