Ticket #8789: scummvm_beos.patch

common/hashmap.h

@@ -86 +86 @@
 template <class Key, class Val, class HashFunc = Hash<Key>, class EqualFunc = EqualTo<Key> >
 class HashMap {
 private:
-#if defined (PALMOS_MODE)
+#if defined (PALMOS_MODE) || defined (__BEOS__)
 public:
 #endif
 
@@ -119 +119 @@
         /**
          * Simple HashMap iterator implementation.
          */
+        template <class NodeType>
         class Iterator {
-        protected:
-                typedef const HashMap hashmap_t;
-                friend class HashMap;
-
-                // Allow ConstIterator to read member vars, so that Iterators can be converted to ConstIterator
-                friend class HashMap::ConstIterator;
-
+                typedef const HashMap<Key, Val, HashFunc, EqualFunc> *hashmap_t;
+                friend class HashMap<Key, Val, HashFunc, EqualFunc>;
                 uint _idx;
-                hashmap_t *_hashmap;
-
+                hashmap_t _hashmap;
         protected:
-                Iterator(uint idx, hashmap_t *hashmap) : _idx(idx), _hashmap(hashmap) {}
+                Iterator(uint idx, hashmap_t hashmap) : _idx(idx), _hashmap(hashmap) {}
 
-                Node *deref() const {
+                NodeType *deref() const {
                         assert(_hashmap != 0);
-                        Node *node = _hashmap->_arr[_idx];
+                        NodeType *node = _hashmap->_arr[_idx];
                         assert(node != 0);
                         return node;
                 }
@@ -143 +138 @@
         public:
                 Iterator() : _idx(0), _hashmap(0) {}
 
-                Node &operator *() const { return *deref(); }
-                Node *operator->() const { return deref(); }
+                // HACK: to allow non const/const begin, end and find to work.
+                friend class Iterator<const NodeType>;
+                Iterator(const Iterator<Node> &iter) : _idx(iter._idx), _hashmap(iter._hashmap) {}
+
+                NodeType &operator *() const { return *deref(); }
+                NodeType *operator->() const { return deref(); }
 
                 bool operator ==(const Iterator &iter) const { return _idx == iter._idx && _hashmap == iter._hashmap; }
                 bool operator !=(const Iterator &iter) const { return !(*this == iter); }
@@ -167 +166 @@
                 }
         };
 
-        /**
-         * Simple HashMap const iterator implementation.
-         * This is almost completely identical to the normal iterator class, only
-         * with some const keywords added here and there, plus a conversion
-         * operator which makes it possible to transparently convert iterators to
-         * const iterators. 
-         * It is sadly not really possible to reduce this code duplication using
-         * template, unless one is willing to accept various warnings on certain
-         * compilers. Note that many (most? all?) implementations of the standard
-         * C++ library use a similar approach for their implementations.
-         */
-        class ConstIterator {
-        protected:
-                typedef const HashMap hashmap_t;
-                friend class HashMap;
-
-                uint _idx;
-                hashmap_t *_hashmap;
-
-        protected:
-                ConstIterator(uint idx, hashmap_t *hashmap) : _idx(idx), _hashmap(hashmap) {}
-
-                const Node *deref() const {
-                        assert(_hashmap != 0);
-                        const Node *node = _hashmap->_arr[_idx];
-                        assert(node != 0);
-                        return node;
-                }
-
-        public:
-                ConstIterator() : _idx(0), _hashmap(0) {}
-
-                // Converting a non-const iterator to a const one is allowed
-                ConstIterator(const Iterator &iter) : _idx(iter._idx), _hashmap(iter._hashmap) {}
-
-                const Node &operator *() const { return *deref(); }
-                const Node *operator->() const { return deref(); }
-
-                bool operator ==(const ConstIterator &iter) const { return _idx == iter._idx && _hashmap == iter._hashmap; }
-                bool operator !=(const ConstIterator &iter) const { return !(*this == iter); }
-
-                ConstIterator &operator ++() {
-                        assert(_hashmap);
-                        do {
-                                _idx++;
-                        } while (_idx < _hashmap->_arrsize && _hashmap->_arr[_idx] == 0);
-                        if (_idx >= _hashmap->_arrsize)
-                                _idx = (uint)-1;
-
-                        return *this;
-                }
 
-                ConstIterator operator ++(int) {
-                        ConstIterator old = *this;
-                        operator ++();
-                        return old;
-                }
-        };
 
 public:
-        typedef Iterator iterator;
-        typedef ConstIterator const_iterator;
+        typedef Iterator<Node> iterator;
+        typedef Iterator<const Node> const_iterator;
 
         HashMap();
         HashMap(const HM_t& map);

configure

@@ -955 +955 @@
 echo_n "Checking hosttype... "
 echo $_host_os
 case $_host_os in
-        linux* | uclinux* | openbsd* | freebsd* | netbsd* | bsd* | sunos* | hpux* | beos*)
+        linux* | uclinux* | openbsd* | freebsd* | netbsd* | bsd* | sunos* | hpux* )
                 DEFINES="$DEFINES -DUNIX"
                 ;;
+        beos*)
+                DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE -DSCUMMVM_USE_LONG_INT"
+                LIBS="$LIBS -lbind -lsocket"
+                ;;
         solaris*)
                 DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
                 ;;
@@ -1276 +1280 @@
 int main(void) { vorbis_packet_blocksize(0,0); return 0; }
 EOF
         cc_check $LDFLAGS $CXXFLAGS $OGG_CFLAGS $OGG_LIBS $VORBIS_CFLAGS $VORBIS_LIBS \
-                -lvorbisfile -lvorbis -logg -lm && _vorbis=yes
+                -lvorbisfile -lvorbis -logg  && _vorbis=yes
 fi
 if test "$_vorbis" = yes ; then
         _def_vorbis='#define USE_VORBIS'
@@ -1328 +1332 @@
 int main(void) { return FLAC__STREAM_SYNC_LEN >> 30; /* guaranteed to be 0 */ }
 EOF
         cc_check $LDFLAGS $CXXFLAGS $FLAC_CFLAGS $FLAC_LIBS $OGG_CFLAGS $OGG_LIBS \
-                -lFLAC -logg -lm && _flac=yes
+                -lFLAC -logg  && _flac=yes
 fi
 if test "$_flac" = yes ; then
         _def_flac='#define USE_FLAC'