summaryrefslogtreecommitdiffstats
path: root/elaborate.h
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-11-03 16:22:36 -0500
committerDave Brolley <brolley@redhat.com>2009-11-03 16:22:36 -0500
commit899b66209b0146560f0efc33efe58a4be3577df3 (patch)
tree7b64764b917c359a99d0adcf6c68a2d73cd52be7 /elaborate.h
parentd4ad7984018ff769cbb662342be7e501632c0bea (diff)
parent89651893a8ec51ee4d77ddfd57019e350ad7b169 (diff)
downloadsystemtap-steved-899b66209b0146560f0efc33efe58a4be3577df3.tar.gz
systemtap-steved-899b66209b0146560f0efc33efe58a4be3577df3.tar.xz
systemtap-steved-899b66209b0146560f0efc33efe58a4be3577df3.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts: Makefile.in configure doc/Makefile.in doc/SystemTap_Tapset_Reference/Makefile.in grapher/Makefile.in testsuite/configure
Diffstat (limited to 'elaborate.h')
-rw-r--r--elaborate.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/elaborate.h b/elaborate.h
index bee71a50..fec62d59 100644
--- a/elaborate.h
+++ b/elaborate.h
@@ -37,7 +37,7 @@ public:
derived_probe* current_probe;
symresolution_info (systemtap_session& s);
- vardecl* find_var (const std::string& name, int arity);
+ vardecl* find_var (const std::string& name, int arity, const token *tok);
functiondecl* find_function (const std::string& name, unsigned arity);
void visit_block (block *s);