Automatically enabling the Cocoa formatter categories for command-line LLDB. Previously, the categories were filled in but disabled by default. Tweaking test cases appropriately to keep working and do the right thing

llvm-svn: 155605

1 files changed, 5 insertions, 5 deletions

diff --git a/lldb/source/Core/FormatManager.cpp b/lldb/source/Core/FormatManager.cpp
index 45762434423..ae9aa28aa95 100644
--- a/lldb/source/Core/FormatManager.cpp
+++ b/lldb/source/Core/FormatManager.cpp
@@ -597,13 +597,13 @@ FormatManager::FormatManager() :
 #endif
     
     EnableCategory(m_objc_category_name,CategoryMap::Last);
-    //EnableCategory(m_corefoundation_category_name,CategoryMap::Last);
-    //EnableCategory(m_appkit_category_name,CategoryMap::Last);
-    //EnableCategory(m_coreservices_category_name,CategoryMap::Last);
-    //EnableCategory(m_coregraphics_category_name,CategoryMap::Last);
+    EnableCategory(m_corefoundation_category_name,CategoryMap::Last);
+    EnableCategory(m_appkit_category_name,CategoryMap::Last);
+    EnableCategory(m_coreservices_category_name,CategoryMap::Last);
+    EnableCategory(m_coregraphics_category_name,CategoryMap::Last);
     EnableCategory(m_gnu_cpp_category_name,CategoryMap::Last);
     EnableCategory(m_libcxx_category_name,CategoryMap::Last);
-    //EnableCategory(m_vectortypes_category_name,CategoryMap::Last);
+    EnableCategory(m_vectortypes_category_name,CategoryMap::Last);
     EnableCategory(m_system_category_name,CategoryMap::Last);
 }