3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-23 19:47:52 +00:00

Merge branch 'master' into polysat

This commit is contained in:
Jakob Rath 2022-08-04 08:53:34 +02:00
commit d7f0181c46
41 changed files with 38 additions and 1490 deletions

View file

@ -19,7 +19,7 @@
--*/
#include <limits>
#if _LINUX_
#ifndef _WINDOWS
#include <dirent.h>
#endif
#include <algorithm>
@ -1735,7 +1735,7 @@ void random_test() {
}
}
#if _LINUX_
#ifndef _WINDOWS
void fill_file_names(vector<std::string> &file_names, std::set<std::string> & minimums) {
char *home_dir = getenv("HOME");
if (home_dir == nullptr) {
@ -1885,7 +1885,7 @@ void test_out_dir(std::string out_dir) {
void find_dir_and_file_name(std::string a, std::string & dir, std::string& fn) {
// todo: make it system independent
size_t last_slash_pos = a.find_last_of("/");
size_t last_slash_pos = a.find_last_of('/');
if (last_slash_pos >= a.size()) {
std::cout << "cannot find file name in " << a << std::endl;
throw;
@ -4072,7 +4072,7 @@ void test_lp_local(int argn, char**argv) {
}
if (args_parser.option_is_used("--solve_some_mps")) {
#if _LINUX_
#ifndef _WINDOWS
solve_some_mps(args_parser);
#endif
ret = 0;