Skip to content

Commit e5edf65

Browse files
committed
fix: conflicts
1 parent 0d012c9 commit e5edf65

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

parser/arg-parser.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,6 @@ void arg_parser::parse(
4949
raw_args.push_back(argv[i]);
5050
m_arg_array.push_back(argv[i]);
5151
}
52-
try_match_and_set_arg(raw_args, do_list);
53-
try_match_and_set_arg(raw_args, do_help);
54-
try_match_and_set_arg(raw_args, do_version);
55-
try_match_and_set_arg(raw_args, do_test);
56-
try_match_and_set_arg(raw_args, do_detect);
57-
try_match_and_set_arg(raw_args, do_sample);
58-
try_match_and_set_arg(raw_args, do_record);
59-
try_match_and_set_arg(raw_args, do_count);
6052

6153
if (raw_args.size() == 0)
6254
throw_invalid_arg(L"", L"warning: No arguments were found!");

parser/arg-parser.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,6 @@ enum COMMAND_CLASS {
5656
MAN,
5757
NO_COMMAND
5858
};
59-
static const std::set<COMMAND_CLASS> commands_with_events_and_metrics = {
60-
COMMAND_CLASS::STAT,
61-
COMMAND_CLASS::SAMPLE,
62-
COMMAND_CLASS::RECORD,
63-
COMMAND_CLASS::TIMELINE,
64-
COMMAND_CLASS::SPE
65-
};
6659

6760
class arg_parser_arg_command : public arg_parser_arg_opt {
6861
public:

0 commit comments

Comments
 (0)