diff options
author | David Kalnischkies <david@kalnischkies.de> | 2017-12-13 23:54:38 +0100 |
---|---|---|
committer | David Kalnischkies <david@kalnischkies.de> | 2017-12-13 23:54:38 +0100 |
commit | 99813a2eaa7c0cce1d7d8c811827733ed66458de (patch) | |
tree | 61fe422eeca8c5bd5cb2de6060f11e71343d4602 /apt-pkg/acquire-item.cc | |
parent | d30b30ad1e1ce434df84e15e2573c43ac152f9e3 (diff) | |
parent | 0b5e329a8ba2461ccb7017d3adfc972f9dccd830 (diff) |
Merge branch 'feature/happy-gcc'
Fixing various real and imagined bugs reported by gcc warnings
Diffstat (limited to 'apt-pkg/acquire-item.cc')
-rw-r--r-- | apt-pkg/acquire-item.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index b13bd203b..b3eb75d16 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -971,7 +971,9 @@ bool pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState const void pkgAcquire::Item::SetActiveSubprocess(const std::string &subprocess)/*{{{*/ { ActiveSubprocess = subprocess; - APT_IGNORE_DEPRECATED(Mode = ActiveSubprocess.c_str();) + APT_IGNORE_DEPRECATED_PUSH + Mode = ActiveSubprocess.c_str(); + APT_IGNORE_DEPRECATED_POP } /*}}}*/ // Acquire::Item::ReportMirrorFailure /*{{{*/ |