[Scummvm-cvs-logs] CVS: scummvm/common config-manager.cpp,1.43,1.44 config-manager.h,1.28,1.29 str.cpp,1.39,1.40 str.h,1.30,1.31

Eugene Sandulenko sev at users.sourceforge.net
Sat Nov 26 18:37:04 CET 2005


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20957/common

Modified Files:
	config-manager.cpp config-manager.h str.cpp str.h 
Log Message:
Patch #1341626: "New GP32 port"


Index: config-manager.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- config-manager.cpp	31 Oct 2005 01:50:51 -0000	1.43
+++ config-manager.cpp	27 Nov 2005 02:35:57 -0000	1.44
@@ -62,7 +62,7 @@
 
 namespace Common {
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 
 const String ConfigManager::kApplicationDomain("scummvm");
 const String ConfigManager::kTransientDomain("__TRANSIENT");
@@ -514,7 +514,7 @@
 
 const String &ConfigManager::Domain::get(const String &key) const {
 	Node *node = findNode(_root, key);
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 	return node ? node->_value : String::emptyString;
 #else
 	return node ? node->_value : ConfMan._emptyString;

Index: config-manager.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-manager.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- config-manager.h	18 Oct 2005 01:30:17 -0000	1.28
+++ config-manager.h	27 Nov 2005 02:35:57 -0000	1.29
@@ -67,7 +67,7 @@
 
 	typedef Map<String, Domain, IgnoreCaseComparator> DomainMap;
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 	/** The name of the application domain (normally 'scummvm'). */
 	static const String kApplicationDomain;
 

Index: str.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- str.cpp	18 Oct 2005 01:30:17 -0000	1.39
+++ str.cpp	27 Nov 2005 02:35:57 -0000	1.40
@@ -25,7 +25,7 @@
 
 namespace Common {
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 const String String::emptyString;
 #else
 const char *String::emptyString = "";

Index: str.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- str.h	18 Oct 2005 01:30:17 -0000	1.30
+++ str.h	27 Nov 2005 02:35:57 -0000	1.31
@@ -37,7 +37,7 @@
 	int 	_capacity;
 
 public:
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 	static const String emptyString;
 #else
 	static const char *emptyString;





More information about the Scummvm-git-logs mailing list