aboutsummaryrefslogtreecommitdiff
path: root/src/sat.cc
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-04-11 01:07:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-11 01:07:58 +0000
commitc57b2ee389b53f945eccc4e019f90205a65007eb (patch)
treeb5381fda0b53dd45d295a0fd52d4f7cda1b0e180 /src/sat.cc
parentf00a48c77bcf483b5265183403bebe1843edb149 (diff)
parent5d78aca286ef15a9cddaaddb0ec4d944f4605af6 (diff)
downloadstressapptest-c57b2ee389b53f945eccc4e019f90205a65007eb.tar.gz
Merge "Upgrade to stressapptest v1.0.9." am: a27d5f2bda am: 4ac7a2a986 am: bdd51fde76 am: 5d78aca286
Change-Id: I3700b1d5a392cf8200b65bdbee1645ebeeec7a42
Diffstat (limited to 'src/sat.cc')
-rw-r--r--src/sat.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sat.cc b/src/sat.cc
index 927ba54..0528bf2 100644
--- a/src/sat.cc
+++ b/src/sat.cc
@@ -680,7 +680,7 @@ Sat::Sat() {
strict_ = 1;
warm_ = 0;
run_on_anything_ = 0;
- use_logfile_ = 0;
+ use_logfile_ = false;
logfile_ = 0;
log_timestamps_ = true;
// Detect 32/64 bit binary.
@@ -1015,7 +1015,7 @@ bool Sat::ParseArgs(int argc, char **argv) {
// Set logfile flag.
if (strcmp(logfilename_, ""))
- use_logfile_ = 1;
+ use_logfile_ = true;
// Checks valid page length.
if (page_length_ &&
!(page_length_ & (page_length_ - 1)) &&
@@ -1430,7 +1430,7 @@ void Sat::InitializeThreads() {
reinterpret_cast<void**>(&num),
line_size, line_size * needed_lines * cc_cacheline_count_);
#else
- num = reinterpret_cast<char*>(memalign(
+ num = reinterpret_cast<int*>(memalign(
line_size, line_size * needed_lines * cc_cacheline_count_));
int err_result = (num == 0);
#endif