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

1 files changed, 2 insertions, 2 deletions

diff --git a/staptree.h b/staptree.h
index 791b56f4..a654a7b4 100644
--- a/staptree.h
+++ b/staptree.h
@@ -630,17 +630,17 @@ struct probe_point
     std::string functor;
     literal* arg; // optional
     component ();
+    const token* tok; // points to component's functor
     component(std::string const & f, literal * a = NULL);
   };
   std::vector<component*> components;
-  const token* tok; // points to first component's functor
   bool optional;
   bool sufficient;
   expression* condition;
   void print (std::ostream& o) const;
   probe_point ();
   probe_point(const probe_point& pp);
-  probe_point(std::vector<component*> const & comps,const token * t);
+  probe_point(std::vector<component*> const & comps);
   std::string str();
 };