summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2019-02-26 13:21:07 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2019-02-26 16:31:20 +0100
commit29465ea9555a453ca733280955505de8bfcce935 (patch)
treed4c80eac4cdeff25390f5906b86a6f8801ca0915 /apt-pkg
parent30d563c7a7ac68a0d2c1e765a1a43687d406c0d5 (diff)
sptr: Remove deprecated smart pointer classes
Please use the standard C++ variants instead.
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/contrib/fileutl.cc1
-rw-r--r--apt-pkg/contrib/sptr.h74
2 files changed, 0 insertions, 75 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 0c0cb05ea..860739f68 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -25,7 +25,6 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/macros.h>
#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/sptr.h>
#include <apt-pkg/strutl.h>
#include <cstdio>
diff --git a/apt-pkg/contrib/sptr.h b/apt-pkg/contrib/sptr.h
deleted file mode 100644
index 77806d94d..000000000
--- a/apt-pkg/contrib/sptr.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- mode: cpp; mode: fold -*-
-// Description /*{{{*/
-/* ######################################################################
-
- Trivial non-ref counted 'smart pointer'
-
- This is really only good to eliminate
- {
- delete Foo;
- return;
- }
-
- Blocks from functions.
-
- I think G++ has become good enough that doing this won't have much
- code size implications.
-
- ##################################################################### */
- /*}}}*/
-#ifndef SMART_POINTER_H
-#define SMART_POINTER_H
-#include <apt-pkg/macros.h>
-
-template <class T>
-class APT_DEPRECATED_MSG("use std::unique_ptr instead") SPtr
-{
- public:
- T *Ptr;
-
- inline T *operator ->() {return Ptr;};
- inline T &operator *() {return *Ptr;};
- inline operator T *() {return Ptr;};
- inline operator void *() {return Ptr;};
- inline T *UnGuard() {T *Tmp = Ptr; Ptr = 0; return Tmp;};
- inline void operator =(T *N) {Ptr = N;};
- inline bool operator ==(T *lhs) const {return Ptr == lhs;};
- inline bool operator !=(T *lhs) const {return Ptr != lhs;};
- inline T*Get() {return Ptr;};
-
- inline SPtr(T *Ptr) : Ptr(Ptr) {};
- inline SPtr() : Ptr(0) {};
- inline ~SPtr() {delete Ptr;};
-};
-
-template <class T>
-class APT_DEPRECATED_MSG("use std::unique_ptr instead") SPtrArray
-{
- public:
- T *Ptr;
-
- //inline T &operator *() {return *Ptr;};
- inline operator T *() {return Ptr;};
- inline operator void *() {return Ptr;};
- inline T *UnGuard() {T *Tmp = Ptr; Ptr = 0; return Tmp;};
- //inline T &operator [](signed long I) {return Ptr[I];};
- inline void operator =(T *N) {Ptr = N;};
- inline bool operator ==(T *lhs) const {return Ptr == lhs;};
- inline bool operator !=(T *lhs) const {return Ptr != lhs;};
- inline T *Get() {return Ptr;};
-
- inline SPtrArray(T *Ptr) : Ptr(Ptr) {};
- inline SPtrArray() : Ptr(0) {};
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
- // gcc warns about this, but we can do nothing hereā€¦
-#endif
- inline ~SPtrArray() {delete [] Ptr;};
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
-};
-
-#endif