dpkgpm: Convert ctime() call to ctime_r()

[apt.git] / apt-pkg / cacheset.h

diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index 95df55dcc5210999138872c5d83bb0993196f0ad..7c03ad97ae2759f7f7e7c030d5ebe83c1995508b 100644 (file)
--- 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(); }
        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
        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(); }
        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
        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