From b2eec2572ce1c8e79ac3a270161cc5d415169840 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 26 Feb 2020 13:56:45 +0100 Subject: Merge CommandLine::DispatchArg --- apt-pkg/contrib/cmndline.cc | 5 ----- apt-pkg/contrib/cmndline.h | 2 -- 2 files changed, 7 deletions(-) (limited to 'apt-pkg/contrib') diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 3b844edc2..b80543c91 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -381,11 +381,6 @@ bool CommandLine::DispatchArg(Dispatch const * const Map,bool NoMatch) } return false; -} -bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch) -{ - Dispatch const * const Map2 = Map; - return DispatchArg(Map2, NoMatch); } /*}}}*/ // CommandLine::SaveInConfig - for output later in a logfile or so /*{{{*/ diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index 66e0e16d8..28ea9119e 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -80,8 +80,6 @@ class CommandLine bool Parse(int argc,const char **argv); void ShowHelp(); unsigned int FileSize() const APT_PURE; - // FIXME: merge on next ABI break - bool DispatchArg(Dispatch *List,bool NoMatch = true); bool DispatchArg(Dispatch const * const List,bool NoMatch = true); static char const * GetCommand(Dispatch const * const Map, -- cgit v1.2.3