Mirror
/
upx
mirror of https://github.com/upx/upx.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

src: deprecate util/bptr.h

This commit is contained in:
Markus F.X.J. Oberhumer 2022-10-27 17:52:15 +02:00
parent af87f7f2bf
commit 7dd2cdea1e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pefile.cpp
View File

@ -39,7 +39,6 @@
// //
**************************************************************************/ **************************************************************************/
#include "util/bptr.h"
#if (WITH_SPAN >= 2) && 1 #if (WITH_SPAN >= 2) && 1
//#define IPTR(type, var) Span<type> var(ibuf, ibuf.getSize(), ibuf) //#define IPTR(type, var) Span<type> var(ibuf, ibuf.getSize(), ibuf)
//#define OPTR(type, var) Span<type> var(obuf, obuf.getSize(), obuf) //#define OPTR(type, var) Span<type> var(obuf, obuf.getSize(), obuf)
@ -49,6 +48,7 @@
#define IPTR_C(type, var, first) const Span<type> var(first, ibuf) #define IPTR_C(type, var, first) const Span<type> var(first, ibuf)
#define OPTR_C(type, var, first) const Span<type> var(first, obuf) #define OPTR_C(type, var, first) const Span<type> var(first, obuf)
#else #else
#include "util/bptr.h"
//#define IPTR(type, var) BoundedPtr<type> var(ibuf, ibuf.getSize()) //#define IPTR(type, var) BoundedPtr<type> var(ibuf, ibuf.getSize())
//#define OPTR(type, var) BoundedPtr<type> var(obuf, obuf.getSize()) //#define OPTR(type, var) BoundedPtr<type> var(obuf, obuf.getSize())
#define IPTR_I_D(type, var, disp) BoundedPtr<type> var(ibuf + (disp), ibuf.getSize() - (disp), ibuf + (disp)) #define IPTR_I_D(type, var, disp) BoundedPtr<type> var(ibuf + (disp), ibuf.getSize() - (disp), ibuf + (disp))

3
src/util/bptr.h
View File

@ -29,9 +29,10 @@
#ifndef UPX_BPTR_H__ #ifndef UPX_BPTR_H__
#define UPX_BPTR_H__ 1 #define UPX_BPTR_H__ 1
#error "this file is deprecated, please use xspan.h instead"
/************************************************************************* /*************************************************************************
// BoundedPtr // BoundedPtr
// (deprecated, use xspan.h instead)
**************************************************************************/ **************************************************************************/
template <class T> template <class T>