Rename nocopy to noncopyable.

This commit is contained in:
Markus F.X.J. Oberhumer
2007-11-07 23:13:20 +01:00
parent 07baed1581
commit 0d8e16d5c8
3 changed files with 14 additions and 12 deletions
+6 -4
View File
@@ -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) #define ByteArray(var, size) Array(unsigned char, var, size)
struct nocopy struct noncopyable
{ {
inline nocopy() {} protected:
inline noncopyable() {}
inline ~noncopyable() {}
private: private:
nocopy(const nocopy &); // undefined noncopyable(const noncopyable &); // undefined
nocopy& operator=(const nocopy &); // undefined const noncopyable& operator=(const noncopyable &); // undefined
}; };
+4 -4
View File
@@ -34,7 +34,7 @@
// ElfLinker // ElfLinker
**************************************************************************/ **************************************************************************/
class ElfLinker : private nocopy class ElfLinker : private noncopyable
{ {
friend class Packer; friend class Packer;
public: public:
@@ -110,7 +110,7 @@ protected:
}; };
struct ElfLinker::Section : private nocopy struct ElfLinker::Section : private noncopyable
{ {
char *name; char *name;
void *input; void *input;
@@ -125,7 +125,7 @@ struct ElfLinker::Section : private nocopy
}; };
struct ElfLinker::Symbol : private nocopy struct ElfLinker::Symbol : private noncopyable
{ {
char *name; char *name;
Section *section; Section *section;
@@ -136,7 +136,7 @@ struct ElfLinker::Symbol : private nocopy
}; };
struct ElfLinker::Relocation : private nocopy struct ElfLinker::Relocation : private noncopyable
{ {
const Section *section; const Section *section;
unsigned offset; unsigned offset;
+4 -4
View File
@@ -229,7 +229,7 @@ protected:
RT_MANIFEST, RT_LAST RT_MANIFEST, RT_LAST
}; };
class Interval : private nocopy class Interval : private noncopyable
{ {
unsigned capacity; unsigned capacity;
void *base; void *base;
@@ -257,7 +257,7 @@ protected:
static int __acc_cdecl_qsort compare(const void *p1,const void *p2); static int __acc_cdecl_qsort compare(const void *p1,const void *p2);
}; };
class Reloc : private nocopy class Reloc : private noncopyable
{ {
upx_byte *start; upx_byte *start;
unsigned size; unsigned size;
@@ -280,7 +280,7 @@ protected:
void finish(upx_byte *&p,unsigned &size); void finish(upx_byte *&p,unsigned &size);
}; };
class Resource : private nocopy class Resource : private noncopyable
{ {
struct res_dir_entry; struct res_dir_entry;
struct res_dir; struct res_dir;
@@ -331,7 +331,7 @@ protected:
*/ */
}; };
class Export : private nocopy class Export : private noncopyable
{ {
struct export_dir_t struct export_dir_t
{ {