Merge branch 'master' of git://sources.redhat.com/git/systemtap

Conflicts:

	cache.cxx

1 files changed, 1 insertions, 2 deletions

diff --git a/dwflpp.h b/dwflpp.h
index 20bcc0d0..3cada4f8 100644
--- a/dwflpp.h
+++ b/dwflpp.h
@@ -333,9 +333,8 @@ private:
                                       struct location **tail,
                                       const target_symbol *e);
 
-  bool find_struct_member(const std::string& member,
+  bool find_struct_member(const target_symbol::component& c,
                           Dwarf_Die *parentdie,
-                          const target_symbol *e,
                           Dwarf_Die *memberdie,
                           std::vector<Dwarf_Attribute>& locs);