diff options
| author | Dave Brolley <brolley@redhat.com> | 2008-08-29 16:10:01 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2008-08-29 16:10:01 -0400 |
| commit | 0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c (patch) | |
| tree | add6c27ae60763af4c4a1aa90db7f65e465759e3 /staptree.h | |
| parent | d1f2fc72bf8506d0ac166cddb07576c7c4a1fea6 (diff) | |
| parent | 8d142c018986acb256a08c1232f4f5ff0ee063df (diff) | |
| download | systemtap-steved-0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c.tar.gz systemtap-steved-0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c.tar.xz systemtap-steved-0cbf1fef13d340b4a6d01fe7242a6d0c098e8d6c.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
ChangeLog
Diffstat (limited to 'staptree.h')
| -rw-r--r-- | staptree.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -346,7 +346,7 @@ struct print_format: public expression static std::string components_to_string(std::vector<format_component> const & components); static std::vector<format_component> string_to_components(std::string const & str); - static bool parse_print(const std::string &name, bool &stream, + static bool parse_print(const std::string &name, bool &stream, bool &format, bool &delim, bool &newline, bool &_char); void print (std::ostream& o) const; |