diff options
| author | Julian Andres Klode <jak@debian.org> | 2015-08-17 18:33:22 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2015-08-17 18:33:22 +0200 |
| commit | 3dddcdf2432e78f37c74d8c76c2c519a8d935ab2 (patch) | |
| tree | b2591bf117bbe44bfef18e3f4c0c8e9663303e24 /apt-pkg/cacheset.h | |
| parent | 9f5f0e60f1d3c997c8c2e794dee122829bdf142d (diff) | |
Re-add support for G++ 4.8 and configure travis to use it
This makes tests work again!
Gbp-Dch: ignore
Diffstat (limited to 'apt-pkg/cacheset.h')
| -rw-r--r-- | apt-pkg/cacheset.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 95df55dcc..7c03ad97a 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -407,7 +407,7 @@ public: /*{{{*/ bool empty() const APT_OVERRIDE { return _cont.empty(); } void clear() APT_OVERRIDE { return _cont.clear(); } size_t size() const APT_OVERRIDE { return _cont.size(); } -#if __cplusplus >= 201103L +#if __GNUC__ >= 5 || (__GNUC_MINOR__ >= 9 && __GNUC__ >= 4) iterator erase( const_iterator pos ) { return iterator(_cont.erase(pos._iter)); } iterator erase( const_iterator first, const_iterator last ) { return iterator(_cont.erase(first._iter, last._iter)); } #else @@ -897,7 +897,7 @@ public: /*{{{*/ bool empty() const APT_OVERRIDE { return _cont.empty(); } void clear() APT_OVERRIDE { return _cont.clear(); } size_t size() const APT_OVERRIDE { return _cont.size(); } -#if __cplusplus >= 201103L +#if __GNUC__ >= 5 || (__GNUC_MINOR__ >= 9 && __GNUC__ >= 4) iterator erase( const_iterator pos ) { return iterator(_cont.erase(pos._iter)); } iterator erase( const_iterator first, const_iterator last ) { return iterator(_cont.erase(first._iter, last._iter)); } #else |