Browse Source

sptr: Remove deprecated smart pointer classes

Please use the standard C++ variants instead.
tags/debian/1.9.0
Julian Andres Klode 2 years ago
parent
commit
29465ea955
5 changed files with 0 additions and 78 deletions
  1. +0
    -1
      apt-pkg/contrib/fileutl.cc
  2. +0
    -74
      apt-pkg/contrib/sptr.h
  3. +0
    -1
      apt-private/private-install.cc
  4. +0
    -1
      cmdline/apt-cache.cc
  5. +0
    -1
      cmdline/apt-get.cc

+ 0
- 1
apt-pkg/contrib/fileutl.cc View File

@@ -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>


+ 0
- 74
apt-pkg/contrib/sptr.h View File

@@ -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

+ 0
- 1
apt-private/private-install.cc View File

@@ -18,7 +18,6 @@
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/prettyprinters.h>
#include <apt-pkg/sptr.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/upgrade.h>



+ 0
- 1
cmdline/apt-cache.cc View File

@@ -33,7 +33,6 @@
#include <apt-pkg/policy.h>
#include <apt-pkg/progress.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/sptr.h>
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/tagfile.h>


+ 0
- 1
cmdline/apt-get.cc View File

@@ -49,7 +49,6 @@
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/progress.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/sptr.h>
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/upgrade.h>


Loading…
Cancel
Save