From 0f16be729dd58136d9791f6fc5d492f34bbbeeba Mon Sep 17 00:00:00 2001
From: fche <fche>
Date: Mon, 28 Jan 2008 20:59:25 +0000
Subject: update copyright years for recent checkins

---
 staptree.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'staptree.h')

diff --git a/staptree.h b/staptree.h
index 54194c7b..de5b3726 100644
--- a/staptree.h
+++ b/staptree.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// Copyright (C) 2005-2007 Red Hat Inc.
+// Copyright (C) 2005-2008 Red Hat Inc.
 // Copyright (C) 2006 Intel Corporation.
 //
 // This file is part of systemtap, and is free software.  You can
-- 
cgit 


From 2c5a19c6ba969d8fa30070e7579c1597a0e1c194 Mon Sep 17 00:00:00 2001
From: brolley <brolley>
Date: Wed, 13 Feb 2008 16:43:08 +0000
Subject: 2008-02-13  Dave Brolley  <brolley@redhat.com>

        PR5609
        * staptree.h (probe::collect_derivation_chain): Now takes vector<probe*>.
        (probe::get_alias): New virtual method.
        * elaborate.h (derived_probe::collect_derivation_chain): Now takes vector<probe*>.
        * staptree.cxx (probe::collect_derivation_chain): Now takes vector<probe*>. Don't
        cast 'this' to (derived_probe*).
        * elaborate.cxx (derived_probe::collect_derivation_chain): Now takes vector<probe*>.
        (alias_derived_probe::get_alias): New virtual method.
        (alias_derived_probe::alias): New member.
        (alias_expansion_builder::build): Call checkForRecursiveExpansion and emit a
        diagnostic if recursion is detected. Pass alias to constructor of
        alias_derived_probe.
        (alias_expansion_builder::checkForRecursiveExpansion): New method.
        * coveragedb.cxx: Pass vector<probe*> on all calls to collect_derivation_chain.
---
 staptree.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'staptree.h')

diff --git a/staptree.h b/staptree.h
index de5b3726..8235a535 100644
--- a/staptree.h
+++ b/staptree.h
@@ -595,7 +595,8 @@ struct probe
   probe ();
   void print (std::ostream& o) const;
   virtual void printsig (std::ostream &o) const;
-  virtual void collect_derivation_chain (std::vector<derived_probe*> &probes_list);
+  virtual void collect_derivation_chain (std::vector<probe*> &probes_list);
+  virtual const probe_alias *get_alias () const { return 0; }
   virtual probe* basest () { return this; }
   virtual ~probe() {}
   bool privileged;
-- 
cgit