vendor/lldb/lldb-trunk-r351319

1 files changed, 7 insertions, 11 deletions

diff --git a/source/DataFormatters/FormatManager.cpp b/source/DataFormatters/FormatManager.cpp
index bafee1799b80..da03c64b0f8c 100644
--- a/source/DataFormatters/FormatManager.cpp
+++ b/source/DataFormatters/FormatManager.cpp
@@ -11,10 +11,6 @@
 
 #include "llvm/ADT/STLExtras.h"
 
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
 
 #include "lldb/Core/Debugger.h"
 #include "lldb/DataFormatters/FormattersHelpers.h"
@@ -297,7 +293,7 @@ FormatManager::GetFormatForType(lldb::TypeNameSpecifierImplSP type_sp) {
   uint32_t prio_category = UINT32_MAX;
   for (uint32_t category_id = 0; category_id < num_categories; category_id++) {
     category_sp = GetCategoryAtIndex(category_id);
-    if (category_sp->IsEnabled() == false)
+    if (!category_sp->IsEnabled())
       continue;
     lldb::TypeFormatImplSP format_current_sp =
         category_sp->GetFormatForType(type_sp);
@@ -321,7 +317,7 @@ FormatManager::GetSummaryForType(lldb::TypeNameSpecifierImplSP type_sp) {
   uint32_t prio_category = UINT32_MAX;
   for (uint32_t category_id = 0; category_id < num_categories; category_id++) {
     category_sp = GetCategoryAtIndex(category_id);
-    if (category_sp->IsEnabled() == false)
+    if (!category_sp->IsEnabled())
       continue;
     lldb::TypeSummaryImplSP summary_current_sp =
         category_sp->GetSummaryForType(type_sp);
@@ -345,7 +341,7 @@ FormatManager::GetFilterForType(lldb::TypeNameSpecifierImplSP type_sp) {
   uint32_t prio_category = UINT32_MAX;
   for (uint32_t category_id = 0; category_id < num_categories; category_id++) {
     category_sp = GetCategoryAtIndex(category_id);
-    if (category_sp->IsEnabled() == false)
+    if (!category_sp->IsEnabled())
       continue;
     lldb::TypeFilterImplSP filter_current_sp(
         (TypeFilterImpl *)category_sp->GetFilterForType(type_sp).get());
@@ -370,7 +366,7 @@ FormatManager::GetSyntheticForType(lldb::TypeNameSpecifierImplSP type_sp) {
   uint32_t prio_category = UINT32_MAX;
   for (uint32_t category_id = 0; category_id < num_categories; category_id++) {
     category_sp = GetCategoryAtIndex(category_id);
-    if (category_sp->IsEnabled() == false)
+    if (!category_sp->IsEnabled())
       continue;
     lldb::ScriptedSyntheticChildrenSP synth_current_sp(
         (ScriptedSyntheticChildren *)category_sp->GetSyntheticForType(type_sp)
@@ -410,7 +406,7 @@ FormatManager::GetValidatorForType(lldb::TypeNameSpecifierImplSP type_sp) {
   uint32_t prio_category = UINT32_MAX;
   for (uint32_t category_id = 0; category_id < num_categories; category_id++) {
     category_sp = GetCategoryAtIndex(category_id);
-    if (category_sp->IsEnabled() == false)
+    if (!category_sp->IsEnabled())
       continue;
     lldb::TypeValidatorImplSP validator_current_sp(
         category_sp->GetValidatorForType(type_sp).get());
@@ -483,7 +479,7 @@ lldb::Format FormatManager::GetSingleItemFormat(lldb::Format vector_format) {
 bool FormatManager::ShouldPrintAsOneLiner(ValueObject &valobj) {
   // if settings say no oneline whatsoever
   if (valobj.GetTargetSP().get() &&
-      valobj.GetTargetSP()->GetDebugger().GetAutoOneLineSummaries() == false)
+      !valobj.GetTargetSP()->GetDebugger().GetAutoOneLineSummaries())
     return false; // then don't oneline
 
   // if this object has a summary, then ask the summary
@@ -539,7 +535,7 @@ bool FormatManager::ShouldPrintAsOneLiner(ValueObject &valobj) {
       if (!synth_sp)
         return false;
       // but if we only have them to provide a value, keep going
-      if (synth_sp->MightHaveChildren() == false &&
+      if (!synth_sp->MightHaveChildren() &&
           synth_sp->DoesProvideSyntheticValue())
         is_synth_val = true;
       else