1
0
Fork 0

(svn r18041) -Codechange: some coding style

release/1.0
rubidium 2009-11-11 20:43:06 +00:00
parent 8f9157b648
commit ac25ba62d2
1 changed files with 25 additions and 25 deletions

View File

@ -119,36 +119,36 @@ enum GRFExtendedLanguages {
* but according to a different lang.
*/
struct GRFText {
public:
static GRFText* New(byte langid, const char* text)
{
return new(strlen(text) + 1) GRFText(langid, text);
}
public:
static GRFText *New(byte langid, const char *text)
{
return new (strlen(text) + 1) GRFText(langid, text);
}
private:
GRFText(byte langid_, const char* text_) : next(NULL), langid(langid_)
{
strcpy(text, text_);
}
private:
GRFText(byte langid_, const char *text_) : next(NULL), langid(langid_)
{
strcpy(text, text_);
}
void *operator new(size_t size, size_t extra)
{
return ::operator new(size + extra);
}
void *operator new(size_t size, size_t extra)
{
return ::operator new(size + extra);
}
public:
/* dummy operator delete to silence VC8:
* 'void *GRFText::operator new(size_t,size_t)' : no matching operator delete found;
* memory will not be freed if initialization throws an exception */
void operator delete(void *p, size_t extra)
{
return ::operator delete(p);
}
/* dummy operator delete to silence VC8:
* 'void *GRFText::operator new(size_t,size_t)' : no matching operator delete found;
* memory will not be freed if initialization throws an exception */
void operator delete(void *p, size_t extra)
{
return ::operator delete(p);
}
public:
GRFText *next;
byte langid;
char text[];
public:
GRFText *next;
byte langid;
char text[];
};