dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r13619) -Codechange: use 'const char *' instead of std::string for blitter and driver names

Browse Source 
Removes indirect dependency on <string> for 20 files, reduces binary size by 16kB
This commit is contained in:
smatz
2008-06-24 09:15:45 +00:00
parent 40d5242f91
commit 96d880ea9e
3 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/driver.cpp
View File

@@ -156,7 +156,9 @@ void DriverFactoryBase::RegisterDriver(const char *name, Driver::Type type, int
strecpy(buf, GetDriverTypeName(type), lastof(buf));
strecpy(buf + 5, name, lastof(buf));
std::pair<Drivers::iterator, bool> P = GetDrivers().insert(Drivers::value_type(buf, this));
const char *longname = strdup(buf);
std::pair<Drivers::iterator, bool> P = GetDrivers().insert(Drivers::value_type(longname, this));
assert(P.second);
}
@@ -194,7 +196,14 @@ DriverFactoryBase::~DriverFactoryBase() {
strecpy(buf, GetDriverTypeName(type), lastof(buf));
strecpy(buf + 5, this->name, lastof(buf));
GetDrivers().erase(buf);
Drivers::iterator it = GetDrivers().find(buf);
assert(it != GetDrivers().end());
const char *longname = (*it).first;
GetDrivers().erase(it);
free((void *)longname);
if (GetDrivers().empty()) delete &GetDrivers();
free(this->name);
free((void *)this->name);
}