diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/minisat/System.cc | 6 | ||||
| -rw-r--r-- | libs/minisat/UPDATE.sh | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libs/minisat/System.cc b/libs/minisat/System.cc index 59e65fb56..df4155af3 100644 --- a/libs/minisat/System.cc +++ b/libs/minisat/System.cc @@ -79,7 +79,7 @@ double Minisat::memUsed() { struct rusage ru; getrusage(RUSAGE_SELF, &ru); return (double)ru.ru_maxrss / 1024; } -double Minisat::memUsedPeak(bool strictlyPeak) { (void) strictlyPeak; return memUsed(); } +double Minisat::memUsedPeak(bool) { return memUsed(); } #elif defined(__APPLE__) @@ -89,11 +89,11 @@ double Minisat::memUsed() { malloc_statistics_t t; malloc_zone_statistics(NULL, &t); return (double)t.max_size_in_use / (1024*1024); } -double Minisat::memUsedPeak(bool strictlyPeak) { (void) strictlyPeak; return memUsed(); } +double Minisat::memUsedPeak(bool) { return memUsed(); } #else double Minisat::memUsed() { return 0; } -double Minisat::memUsedPeak(bool strictlyPeak) { (void) strictlyPeak; return 0; } +double Minisat::memUsedPeak(bool) { return 0; } #endif diff --git a/libs/minisat/UPDATE.sh b/libs/minisat/UPDATE.sh index 88fcf759a..539ee23f8 100644 --- a/libs/minisat/UPDATE.sh +++ b/libs/minisat/UPDATE.sh @@ -7,6 +7,7 @@ mv minisat_upstream/LICENSE minisat_upstream/minisat/*/*.{h,cc} . rm -rf minisat_upstream sed -i -e 's,^#include *"minisat/[^/]\+,#include "libs/minisat,' *.cc *.h -sed -i -e 's/PRIi64/ & /' Options.h +sed -i -e 's/Minisat::memUsedPeak()/Minisat::memUsedPeak(bool)/' System.cc +sed -i -e 's/PRI[iu]64/ & /' Options.h Solver.cc sed -i -e '1 i #define __STDC_LIMIT_MACROS' *.cc sed -i -e '1 i #define __STDC_FORMAT_MACROS' *.cc |