Rename nocopy to noncopyable.
This commit is contained in:
parent
07baed1581
commit
0d8e16d5c8
10
src/conf.h
10
src/conf.h
@ -379,12 +379,14 @@ inline unsigned UPX_MIN(unsigned a, unsigned b) { return a < b ? a : b; }
|
||||
|
||||
#define ByteArray(var, size) Array(unsigned char, var, size)
|
||||
|
||||
struct nocopy
|
||||
struct noncopyable
|
||||
{
|
||||
inline nocopy() {}
|
||||
protected:
|
||||
inline noncopyable() {}
|
||||
inline ~noncopyable() {}
|
||||
private:
|
||||
nocopy(const nocopy &); // undefined
|
||||
nocopy& operator=(const nocopy &); // undefined
|
||||
noncopyable(const noncopyable &); // undefined
|
||||
const noncopyable& operator=(const noncopyable &); // undefined
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
// ElfLinker
|
||||
**************************************************************************/
|
||||
|
||||
class ElfLinker : private nocopy
|
||||
class ElfLinker : private noncopyable
|
||||
{
|
||||
friend class Packer;
|
||||
public:
|
||||
@ -110,7 +110,7 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
struct ElfLinker::Section : private nocopy
|
||||
struct ElfLinker::Section : private noncopyable
|
||||
{
|
||||
char *name;
|
||||
void *input;
|
||||
@ -125,7 +125,7 @@ struct ElfLinker::Section : private nocopy
|
||||
};
|
||||
|
||||
|
||||
struct ElfLinker::Symbol : private nocopy
|
||||
struct ElfLinker::Symbol : private noncopyable
|
||||
{
|
||||
char *name;
|
||||
Section *section;
|
||||
@ -136,7 +136,7 @@ struct ElfLinker::Symbol : private nocopy
|
||||
};
|
||||
|
||||
|
||||
struct ElfLinker::Relocation : private nocopy
|
||||
struct ElfLinker::Relocation : private noncopyable
|
||||
{
|
||||
const Section *section;
|
||||
unsigned offset;
|
||||
|
||||
@ -229,7 +229,7 @@ protected:
|
||||
RT_MANIFEST, RT_LAST
|
||||
};
|
||||
|
||||
class Interval : private nocopy
|
||||
class Interval : private noncopyable
|
||||
{
|
||||
unsigned capacity;
|
||||
void *base;
|
||||
@ -257,7 +257,7 @@ protected:
|
||||
static int __acc_cdecl_qsort compare(const void *p1,const void *p2);
|
||||
};
|
||||
|
||||
class Reloc : private nocopy
|
||||
class Reloc : private noncopyable
|
||||
{
|
||||
upx_byte *start;
|
||||
unsigned size;
|
||||
@ -280,7 +280,7 @@ protected:
|
||||
void finish(upx_byte *&p,unsigned &size);
|
||||
};
|
||||
|
||||
class Resource : private nocopy
|
||||
class Resource : private noncopyable
|
||||
{
|
||||
struct res_dir_entry;
|
||||
struct res_dir;
|
||||
@ -331,7 +331,7 @@ protected:
|
||||
*/
|
||||
};
|
||||
|
||||
class Export : private nocopy
|
||||
class Export : private noncopyable
|
||||
{
|
||||
struct export_dir_t
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user