Mac OSX Launcher: A lot of bugfixes, refactoring and cleanup.

2018-09-20 02:38:44 +00:00
parent eb81cadac0
commit 3c0a8cf4ab
9 changed files with 95 additions and 177 deletions
--- a/launchers/macosx/include/strutil.hpp
+++ b/launchers/macosx/include/strutil.hpp
@@ -98,10 +98,10 @@ static inline std::string trim_copy(std::string s) {
    return s;
 }

-#ifdef CPP17
+#if __cplusplus > 201402L


-using std::experimental::optional;
+using std::optional;

 // Use CFStringRef instead of NSString*, otherwise disable ARC
 inline optional<CFStringRef> optionalString(bool val) {