Make DCPoMatic compatible with ICU >= 75

ICU >= 75 uses c++17 features and therefore requires compilation with
-std=c++17. However, this causes some namespace issues in
src/wx/file_picker_ctrl.cc and
src/wx/film_name_location_dialog.cc
between boost::optional, boost::filesystem and the corresponding
names from the std lib.

The patch fixes this namespace issues and adds a version check in
wscript to enable compilation with c++17, if icu >= 75 is detected.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc
index 7aa0bfb40..82978dad6 100644
--- a/src/wx/file_picker_ctrl.cc
+++ b/src/wx/file_picker_ctrl.cc
@@ -43,8 +43,8 @@ FilePickerCtrl::FilePickerCtrl(
 	bool open,
 	bool warn_overwrite,
 	std::string initial_path_key,
-	optional<std::string> initial_filename,
-	optional<filesystem::path> override_path
+	boost::optional<std::string> initial_filename,
+	boost::optional<boost::filesystem::path> override_path
 	)
 	: wxPanel (parent)
 	, _prompt (prompt)
@@ -72,7 +72,7 @@ FilePickerCtrl::FilePickerCtrl(
 
 
 void
-FilePickerCtrl::set_filename(optional<string> filename)
+FilePickerCtrl::set_filename(boost::optional<string> filename)
 {
 	if (filename) {
 		_file->SetLabel(std_to_wx(*filename));
@@ -83,7 +83,7 @@ FilePickerCtrl::set_filename(optional<string> filename)
 
 
 void
-FilePickerCtrl::set_path(optional<boost::filesystem::path> path)
+FilePickerCtrl::set_path(boost::optional<boost::filesystem::path> path)
 {
 	_path = path;