Fixed a couple issues with gcc

This commit is contained in:
Steve Dudenhoeffer 2004-08-22 02:52:27 +00:00
parent 722cd23065
commit 51caf26399
3 changed files with 8 additions and 5 deletions

View File

@ -891,8 +891,10 @@ int CLangMngr::MergeDefinitionFile(const char *file)
if (pos > String::npos) if (pos > String::npos)
{ {
tmpEntry = new sKeyDef; tmpEntry = new sKeyDef;
String key = buf.substr(0, pos); String key;
String def = buf.substr(pos+1); key.assign(buf.substr(0, pos).c_str());
String def;
def.assign(buf.substr(pos+1).c_str());
key.trim(); key.trim();
key.toLower(); key.toLower();
int iKey = GetKeyEntry(key); int iKey = GetKeyEntry(key);
@ -909,7 +911,8 @@ int CLangMngr::MergeDefinitionFile(const char *file)
if (pos > String::npos) if (pos > String::npos)
{ {
tmpEntry = new sKeyDef; tmpEntry = new sKeyDef;
String key = buf.substr(0, pos); String key;
key.assign(buf.substr(0, pos).c_str());;
key.trim(); key.trim();
key.toLower(); key.toLower();
int iKey = GetKeyEntry(key); int iKey = GetKeyEntry(key);

View File

@ -359,7 +359,7 @@ public:
int at(int a) int at(int a)
{ {
if (at < 0 || at >= (int)cSize) if (a < 0 || a >= (int)cSize)
return -1; return -1;
return v[a]; return v[a];

View File

@ -51,7 +51,7 @@
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
#endif #endif
#if defined __LCC__ #if defined __LCC__ || defined __linux__
#include <wchar.h> /* for wcslen() */ #include <wchar.h> /* for wcslen() */
#endif #endif