1 files changed, 19 insertions, 16 deletions
diff --git a/include/lldb/Symbol/SymbolVendor.h b/include/lldb/Symbol/SymbolVendor.h
index 248918a..1946171 100644
--- a/include/lldb/Symbol/SymbolVendor.h
+++ b/include/lldb/Symbol/SymbolVendor.h
@@ -15,9 +15,8 @@
 #include "lldb/lldb-private.h"
 #include "lldb/Core/ModuleChild.h"
 #include "lldb/Core/PluginInterface.h"
-#include "lldb/Symbol/ClangNamespaceDecl.h"
 #include "lldb/Symbol/TypeList.h"
-
+#include "lldb/Symbol/TypeMap.h"
 
 namespace lldb_private {
 
@@ -45,8 +44,7 @@ public:
     //------------------------------------------------------------------
     SymbolVendor(const lldb::ModuleSP &module_sp);
 
-    virtual
-    ~SymbolVendor();
+    ~SymbolVendor() override;
 
     void
     AddSymbolFileRepresentation(const lldb::ObjectFileSP &objfile_sp);
@@ -64,6 +62,9 @@ public:
     ParseCompileUnitLineTable (const SymbolContext& sc);
 
     virtual bool
+    ParseCompileUnitDebugMacros (const SymbolContext& sc);
+
+    virtual bool
     ParseCompileUnitSupportFiles (const SymbolContext& sc,
                                   FileSpecList& support_files);
     
@@ -97,7 +98,7 @@ public:
 
     virtual size_t
     FindGlobalVariables (const ConstString &name,
-                         const ClangNamespaceDecl *namespace_decl,
+                         const CompilerDeclContext *parent_decl_ctx,
                          bool append,
                          size_t max_matches,
                          VariableList& variables);
@@ -110,7 +111,7 @@ public:
 
     virtual size_t
     FindFunctions (const ConstString &name,
-                   const ClangNamespaceDecl *namespace_decl,
+                   const CompilerDeclContext *parent_decl_ctx,
                    uint32_t name_type_mask,
                    bool include_inlines,
                    bool append,
@@ -125,15 +126,18 @@ public:
     virtual size_t
     FindTypes (const SymbolContext& sc, 
                const ConstString &name,
-               const ClangNamespaceDecl *namespace_decl, 
+               const CompilerDeclContext *parent_decl_ctx, 
                bool append, 
                size_t max_matches,
-               TypeList& types);
+               TypeMap& types);
 
-    virtual ClangNamespaceDecl
+    virtual size_t
+    FindTypes (const std::vector<CompilerContext> &context, bool append, TypeMap& types);
+
+    virtual CompilerDeclContext
     FindNamespace (const SymbolContext& sc, 
                    const ConstString &name,
-                   const ClangNamespaceDecl *parent_namespace_decl);
+                   const CompilerDeclContext *parent_decl_ctx);
     
     virtual size_t
     GetNumCompileUnits();
@@ -189,11 +193,11 @@ public:
     //------------------------------------------------------------------
     // PluginInterface protocol
     //------------------------------------------------------------------
-    virtual ConstString
-    GetPluginName();
+    ConstString
+    GetPluginName() override;
 
-    virtual uint32_t
-    GetPluginVersion();
+    uint32_t
+    GetPluginVersion() override;
 
 protected:
     //------------------------------------------------------------------
@@ -215,7 +219,6 @@ private:
     DISALLOW_COPY_AND_ASSIGN (SymbolVendor);
 };
 
-
 } // namespace lldb_private
 
-#endif  // liblldb_SymbolVendor_h_
+#endif // liblldb_SymbolVendor_h_