diff options
| -rw-r--r-- | common/config-manager.cpp | 4 | ||||
| -rw-r--r-- | common/hashmap.h | 6 | ||||
| -rw-r--r-- | engines/scumm/imuse/sysex_scumm.cpp | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/common/config-manager.cpp b/common/config-manager.cpp index db17b7e296..1c9089a025 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -502,8 +502,8 @@ void ConfigManager::renameGameDomain(const String &oldName, const String &newNam assert(isValidDomainName(newName)); // _gameDomains[newName].merge(_gameDomains[oldName]); - Domain &oldDom(_gameDomains[oldName]); - Domain &newDom(_gameDomains[newName]); + Domain &oldDom = _gameDomains[oldName]; + Domain &newDom = _gameDomains[newName]; Domain::const_iterator iter; for (iter = oldDom.begin(); iter != oldDom.end(); ++iter) newDom[iter->_key] = iter->_value; diff --git a/common/hashmap.h b/common/hashmap.h index 3b1477b7a2..98f883d24a 100644 --- a/common/hashmap.h +++ b/common/hashmap.h @@ -98,6 +98,10 @@ uint nextTableSize(uint x); template <class Key, class Val, class HashFunc = Hash<Key>, class EqualFunc = EqualTo<Key> > class HashMap { private: +#if defined (_WIN32_WCE) || defined (_MSC_VER) || defined (__SYMBIAN32__) +//FIXME evc4, msvc6,msvc7 & GCC 2.9x doesn't like it as private member +public: +#endif // data structure used by HashMap internally to keep // track of what's mapped to what. struct BaseNode { @@ -131,7 +135,7 @@ public: const BaseNode *deref() const { assert(_hashmap != 0); - BaseNode *node(_hashmap->_arr[_idx]); + BaseNode *node = _hashmap->_arr[_idx]; assert(node != 0); return node; } diff --git a/engines/scumm/imuse/sysex_scumm.cpp b/engines/scumm/imuse/sysex_scumm.cpp index 4d51cc4fba..7a79278eb0 100644 --- a/engines/scumm/imuse/sysex_scumm.cpp +++ b/engines/scumm/imuse/sysex_scumm.cpp @@ -45,7 +45,8 @@ void sysexHandler_Scumm (Player *player, const byte *msg, uint16 len) { IMuseInternal *se = player->_se; const byte *p = msg; - switch (byte code = *p++) { + byte code = 0; + switch (code = *p++) { case 0: // Allocate new part. // There are 17 bytes of useful information here. |