Ticket #7525: br1602879-gcc295.diff

scummvm/common/str.cpp

@@ -45 +45 @@
 }
 
 String::String(const char *str, uint32 len)
-: _len(0), _str(_storage), _storage() {
+: _len(0), _str(_storage) {
 
+        _storage[0] = 0;
         if (str && *str) {
                 const uint32 tmp = strlen(str);
                 assert(len <= tmp);

scummvm/common/str.h

@@ -96 +96 @@
         static const char *emptyString;
 #endif
 
-        String() : _len(0), _str(_storage), _storage() {}
+        String() : _len(0), _str(_storage) { _storage[0] = 0; }
         String(const char *str, uint32 len = 0);
         String(const String &str);
         virtual ~String();

scummvm/common/hashmap.h

@@ -84 +84 @@
 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__) || defined (PALMOS_MODE) || defined (__MINT__)
+#if defined (_WIN32_WCE) || defined (_MSC_VER) || defined (__SYMBIAN32__) || defined (PALMOS_MODE) || defined (__MINT__) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 95))
 //FIXME evc4, msvc6,msvc7 & GCC 2.9x doesn't like it as private member
 public:
 #endif

scummvm/engines/saga/actor.cpp

@@ -1080 +1080 @@
         int i;
         ActorData *actor;
         int width, height, height2;
-        Point posPoint;
 
         if (_activeSpeech.playing) {
                 _activeSpeech.playingTime -= msec;