diff options
Diffstat (limited to 'source/DataFormatters/TypeSummary.cpp')
-rw-r--r-- | source/DataFormatters/TypeSummary.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/source/DataFormatters/TypeSummary.cpp b/source/DataFormatters/TypeSummary.cpp index 4c75b4b87d03..e5d80174c3cc 100644 --- a/source/DataFormatters/TypeSummary.cpp +++ b/source/DataFormatters/TypeSummary.cpp @@ -69,7 +69,7 @@ StringSummaryFormat::FormatObject (ValueObject *valobj, if (IsOneLiner()) { ValueObjectPrinter printer(valobj,&s,DumpValueObjectOptions()); - printer.PrintChildrenOneLiner(HideNames()); + printer.PrintChildrenOneLiner(HideNames(valobj)); retval.assign(s.GetData()); return true; } @@ -95,12 +95,12 @@ StringSummaryFormat::GetDescription () sstr.Printf ("`%s`%s%s%s%s%s%s%s", m_format.c_str(), Cascades() ? "" : " (not cascading)", - !DoesPrintChildren() ? "" : " (show children)", - !DoesPrintValue() ? " (hide value)" : "", + !DoesPrintChildren(nullptr) ? "" : " (show children)", + !DoesPrintValue(nullptr) ? " (hide value)" : "", IsOneLiner() ? " (one-line printout)" : "", SkipsPointers() ? " (skip pointers)" : "", SkipsReferences() ? " (skip references)" : "", - HideNames() ? " (hide member names)" : ""); + HideNames(nullptr) ? " (hide member names)" : ""); return sstr.GetString(); } @@ -129,14 +129,15 @@ std::string CXXFunctionSummaryFormat::GetDescription () { StreamString sstr; - sstr.Printf ("`%s (%p) `%s%s%s%s%s%s%s", m_description.c_str(),m_impl, + sstr.Printf ("`%s (%p) `%s%s%s%s%s%s%s", m_description.c_str(), + static_cast<void*>(&m_impl), Cascades() ? "" : " (not cascading)", - !DoesPrintChildren() ? "" : " (show children)", - !DoesPrintValue() ? " (hide value)" : "", + !DoesPrintChildren(nullptr) ? "" : " (show children)", + !DoesPrintValue(nullptr) ? " (hide value)" : "", IsOneLiner() ? " (one-line printout)" : "", SkipsPointers() ? " (skip pointers)" : "", SkipsReferences() ? " (skip references)" : "", - HideNames() ? " (hide member names)" : ""); + HideNames(nullptr) ? " (hide member names)" : ""); return sstr.GetString(); } @@ -198,12 +199,12 @@ ScriptSummaryFormat::GetDescription () { StreamString sstr; sstr.Printf ("%s%s%s%s%s%s%s\n%s", Cascades() ? "" : " (not cascading)", - !DoesPrintChildren() ? "" : " (show children)", - !DoesPrintValue() ? " (hide value)" : "", + !DoesPrintChildren(nullptr) ? "" : " (show children)", + !DoesPrintValue(nullptr) ? " (hide value)" : "", IsOneLiner() ? " (one-line printout)" : "", SkipsPointers() ? " (skip pointers)" : "", SkipsReferences() ? " (skip references)" : "", - HideNames() ? " (hide member names)" : "", + HideNames(nullptr) ? " (hide member names)" : "", m_python_script.c_str()); return sstr.GetString(); |