diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-01-03 20:02:44 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-01-03 20:02:44 +0200 |
commit | 58dbc9d122b5274c8a67f0dc035efbb3943f7e5f (patch) | |
tree | d48ef6831c2e40f0ea09734ed7862c7f5620aa7b /contrib/epee/include/misc_log_ex.h | |
parent | Merge pull request #595 (diff) | |
parent | ARMv7 optimization flags are too aggressive (diff) | |
download | monero-58dbc9d122b5274c8a67f0dc035efbb3943f7e5f.tar.xz |
fixed conflicts
Diffstat (limited to 'contrib/epee/include/misc_log_ex.h')
-rw-r--r-- | contrib/epee/include/misc_log_ex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h index b4ba4b7e8..d1451ff12 100644 --- a/contrib/epee/include/misc_log_ex.h +++ b/contrib/epee/include/misc_log_ex.h @@ -419,7 +419,7 @@ namespace log_space std::string buf(buffer, buffer_len); for(size_t i = 0; i!= buf.size(); i++) { - if(buf[i] == 7 || buf[i] == -107) + if(buf[i] == 7 || (buf[i]&0xff) == 0x95) buf[i] = '^'; } |