Fix all the compile warnings that occur on Mac.
(Except the OpenGL deprecation warning and some warnings coming from Boost.Process.)
This commit is contained in:
@@ -458,7 +458,7 @@ bool load_party_v2(fs::path file_to_load, cUniverse& real_univ, bool manual){
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool save_party_const(const cUniverse& univ, bool save_as, fs::path dest_file = "") {
|
||||
static bool save_party_const(const cUniverse& univ, fs::path dest_file = "") {
|
||||
// Make sure it has the proper file extension
|
||||
if(dest_file.empty()){
|
||||
dest_file = univ.file;
|
||||
@@ -569,11 +569,11 @@ bool save_party(cUniverse& univ, bool save_as) {
|
||||
}
|
||||
// A file wasn't chosen
|
||||
if(univ.file.empty()) return false;
|
||||
return save_party_const(univ, save_as);
|
||||
return save_party_const(univ);
|
||||
}
|
||||
|
||||
bool save_party_force(cUniverse& univ, fs::path file) {
|
||||
return save_party_const(univ, false, file);
|
||||
return save_party_const(univ, file);
|
||||
}
|
||||
|
||||
static bool compare_mtime(std::pair<fs::path, std::time_t> a, std::pair<fs::path, std::time_t> b) {
|
||||
@@ -591,4 +591,4 @@ std::vector<std::pair<fs::path, std::time_t>> sorted_file_mtimes(fs::path dir, s
|
||||
|
||||
std::sort(files.begin(), files.end(), compare_mtime);
|
||||
return files;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user