[Scummvm-cvs-logs] SF.net SVN: scummvm: [21604] scummvm/trunk/common
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Tue Apr 4 14:33:03 CEST 2006
Revision: 21604
Author: anotherguest
Date: 2006-04-04 14:32:19 -0700 (Tue, 04 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21604&view=rev
Log Message:
-----------
Small updates to intiate variable and member visibility.
Modified Paths:
--------------
scummvm/trunk/common/config-manager.cpp
scummvm/trunk/common/hashmap.h
scummvm/trunk/engines/scumm/imuse/sysex_scumm.cpp
Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp 2006-04-04 21:18:58 UTC (rev 21603)
+++ scummvm/trunk/common/config-manager.cpp 2006-04-04 21:32:19 UTC (rev 21604)
@@ -502,8 +502,8 @@
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;
Modified: scummvm/trunk/common/hashmap.h
===================================================================
--- scummvm/trunk/common/hashmap.h 2006-04-04 21:18:58 UTC (rev 21603)
+++ scummvm/trunk/common/hashmap.h 2006-04-04 21:32:19 UTC (rev 21604)
@@ -98,6 +98,10 @@
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 @@
const BaseNode *deref() const {
assert(_hashmap != 0);
- BaseNode *node(_hashmap->_arr[_idx]);
+ BaseNode *node = _hashmap->_arr[_idx];
assert(node != 0);
return node;
}
Modified: scummvm/trunk/engines/scumm/imuse/sysex_scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/sysex_scumm.cpp 2006-04-04 21:18:58 UTC (rev 21603)
+++ scummvm/trunk/engines/scumm/imuse/sysex_scumm.cpp 2006-04-04 21:32:19 UTC (rev 21604)
@@ -45,7 +45,8 @@
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.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list