summaryrefslogtreecommitdiffstats
path: root/tapsets.cxx
diff options
context:
space:
mode:
authorDavid Smith <dsmith@redhat.com>2008-04-10 15:04:25 -0500
committerDavid Smith <dsmith@redhat.com>2008-04-11 09:40:30 -0500
commit73b011b5be8500ba90309cbeab7a1c43f83c235e (patch)
tree94da246046e93008494e32571fc48b7252622a5b /tapsets.cxx
parent6d05e34f799ac14ccd7f0adab39986b8b6d89939 (diff)
parentec5d7273b73c56dacb4ac9b167186ff1ea964e63 (diff)
downloadsystemtap-steved-73b011b5be8500ba90309cbeab7a1c43f83c235e.tar.gz
systemtap-steved-73b011b5be8500ba90309cbeab7a1c43f83c235e.tar.xz
systemtap-steved-73b011b5be8500ba90309cbeab7a1c43f83c235e.zip
Merge branch 'master' into work
Conflicts: ChangeLog
Diffstat (limited to 'tapsets.cxx')
-rw-r--r--tapsets.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/tapsets.cxx b/tapsets.cxx
index c269ce05..a7f8034e 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2069,7 +2069,7 @@ private:
public:
void enroll (dwarf_derived_probe* probe);
- void emit_module_header (systemtap_session& ) { };
+ void emit_module_header (systemtap_session& s);
void emit_module_decls (systemtap_session& s);
void emit_module_init (systemtap_session& s);
void emit_module_exit (systemtap_session& s);
@@ -3929,7 +3929,7 @@ dwarf_derived_probe_group::enroll (dwarf_derived_probe* p)
void
-dwarf_derived_probe_group::emit_module_decls (systemtap_session& s)
+dwarf_derived_probe_group::emit_module_header (systemtap_session& s)
{
if (probes_by_module.empty()) return;
@@ -4271,7 +4271,7 @@ struct uprobe_derived_probe: public derived_probe
struct uprobe_derived_probe_group: public generic_dpg<uprobe_derived_probe>
{
public:
- void emit_module_header (systemtap_session& ) { };
+ void emit_module_header (systemtap_session& s);
void emit_module_decls (systemtap_session& s);
void emit_module_init (systemtap_session& s);
void emit_module_exit (systemtap_session& s);