[Scummvm-cvs-logs] CVS: scummvm/common str.cpp,1.37,1.38 str.h,1.28,1.29

[Chris Apers]

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

Modified Files:
	str.cpp str.h 
Log Message:
PalmOS: cannot use global objects in ARM

Index: str.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- str.cpp	30 Jul 2005 21:10:58 -0000	1.37
+++ str.cpp	8 Oct 2005 19:07:18 -0000	1.38
@@ -25,11 +25,17 @@
 
 namespace Common {
 
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
 const String String::emptyString;
+#else
+const char *String::emptyString = "";
+#endif
 
 String::String(const char *str, int len)
  : _str(0), _len(0) {
+
 	_refCount = new int(1);
+
 	if (str && len != 0) {
 		if (len > 0)
 			_capacity = _len = len;
@@ -46,6 +52,7 @@
 
 String::String(const String &str)
  : _str(0), _len(0) {
+
 	++(*str._refCount);
 
 	_refCount = str._refCount;

Index: str.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- str.h	30 Jul 2005 21:10:58 -0000	1.28
+++ str.h	8 Oct 2005 19:07:18 -0000	1.29
@@ -37,7 +37,11 @@
 	int 	_capacity;
 
 public:
+#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
 	static const String emptyString;
+#else
+	static const char *emptyString;
+#endif
 
 	String() : _str(0), _len(0), _capacity(0) { _refCount = new int(1); }
 	String(const char *str, int len = -1);