projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable warnings around all wx includes.
[dcpomatic.git]
/
src
/
wx
/
player_stress_tester.cc
diff --git
a/src/wx/player_stress_tester.cc
b/src/wx/player_stress_tester.cc
index 726db2a70b9144578ed6c1acee37e6ba5049c4c1..0b5889c37a294bc117465b9bb8f8c9ea1be0f4b0 100644
(file)
--- a/
src/wx/player_stress_tester.cc
+++ b/
src/wx/player_stress_tester.cc
@@
-18,27
+18,33
@@
*/
*/
-#include "player_stress_tester.h"
+
#include "controls.h"
#include "controls.h"
+#include "player_stress_tester.h"
+#include "lib/warnings.h"
#include <dcp/raw_convert.h>
#include <dcp/util.h>
#include <dcp/raw_convert.h>
#include <dcp/util.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/
foreach
.hpp>
-#include <
boost/bind.hpp
>
+#include <boost/
bind/bind
.hpp>
+#include <
iostream
>
#include <string>
#include <vector>
#include <string>
#include <vector>
-#include <iostream>
+
+using std::cout;
using std::string;
using std::vector;
using std::string;
using std::vector;
-using std::cout;
using dcp::raw_convert;
using boost::optional;
using dcp::raw_convert;
using boost::optional;
+
/* Interval to check for things to do with the stress script (in milliseconds) */
#define CHECK_INTERVAL 20
/* Interval to check for things to do with the stress script (in milliseconds) */
#define CHECK_INTERVAL 20
+
Command::Command (string line)
: type (NONE)
, int_param (0)
Command::Command (string line)
: type (NONE)
, int_param (0)
@@
-99,7
+105,7
@@
PlayerStressTester::load_script (boost::filesystem::path file)
vector<string> lines;
string const script = dcp::file_to_string(file);
boost::split (lines, script, boost::is_any_of("\n"));
vector<string> lines;
string const script = dcp::file_to_string(file);
boost::split (lines, script, boost::is_any_of("\n"));
-
BOOST_FOREACH (string i,
lines) {
+
for (auto i:
lines) {
_commands.push_back (Command(i));
}
_current_command = _commands.begin();
_commands.push_back (Command(i));
}
_current_command = _commands.begin();