diff options
| author | Virgile Bello <virgile.bello@gmail.com> | 2013-08-27 16:24:58 +0000 |
|---|---|---|
| committer | Virgile Bello <virgile.bello@gmail.com> | 2013-08-27 16:24:58 +0000 |
| commit | f02a3c599bf1974da857854d279622c6e2455868 (patch) | |
| tree | a80f9b13c3408b0c5e93c2d5aff3990f7e0e8feb | |
| parent | ee5f7b7438d58bdc95d0d8c1cb2c53e1cc818827 (diff) | |
| download | bcm5719-llvm-f02a3c599bf1974da857854d279622c6e2455868.tar.gz bcm5719-llvm-f02a3c599bf1974da857854d279622c6e2455868.zip | |
Use standard boolean operators.
llvm-svn: 189367
| -rw-r--r-- | lldb/source/DataFormatters/CXXFormatterFunctions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/source/DataFormatters/CXXFormatterFunctions.cpp b/lldb/source/DataFormatters/CXXFormatterFunctions.cpp index 43a935c35cc..e00413556cc 100644 --- a/lldb/source/DataFormatters/CXXFormatterFunctions.cpp +++ b/lldb/source/DataFormatters/CXXFormatterFunctions.cpp @@ -1003,11 +1003,11 @@ lldb_private::formatters::NSStringSummaryProvider (ValueObject& valobj, Stream& if (!has_null && has_explicit_length && !is_special) { lldb::addr_t explicit_length_offset = 2*ptr_size; - if (is_mutable and not is_inline) + if (is_mutable && !is_inline) explicit_length_offset = explicit_length_offset + ptr_size; // notInlineMutable.length; else if (is_inline) explicit_length = explicit_length + 0; // inline1.length; - else if (not is_inline and not is_mutable) + else if (!is_inline && !is_mutable) explicit_length_offset = explicit_length_offset + ptr_size; // notInlineImmutable1.length; else explicit_length_offset = 0; @@ -1039,7 +1039,7 @@ lldb_private::formatters::NSStringSummaryProvider (ValueObject& valobj, Stream& location = process_sp->ReadPointerFromMemory(location, error); if (error.Fail()) return false; - if (has_explicit_length and is_unicode) + if (has_explicit_length && is_unicode) { ReadUTFBufferAndDumpToStreamOptions<UTF16> options; options.SetConversionFunction(ConvertUTF16toUTF8); |

