[Gnash-commit] /srv/bzr/gnash/trunk r9652: fix std::min() as suggested by Bastiaan. TODO: Fix Debugger.cpp

[Markus Gothe]

------------------------------------------------------------
revno: 9652
committer: Markus Gothe <address@hidden>
branch nick: gnash
timestamp: Sun 2008-08-31 01:04:56 +0200
message:
  fix std::min() as suggested by Bastiaan. TODO: Fix Debugger.cpp
modified:
  libcore/as_environment.h
  libcore/vm/SafeStack.h

=== modified file 'libcore/as_environment.h'
--- a/libcore/as_environment.h  2008-08-30 22:02:56 +0000
+++ b/libcore/as_environment.h  2008-08-30 23:04:56 +0000
@@ -141,7 +141,7 @@
        {
                // in case count > stack size, just drop all, forget about
                // exceptions...
-               _stack.drop(std::min(count, 
static_cast<size_t>(_stack.size())));
+               _stack.drop(std::min(count, _stack.size()));
                //size_t ssize = m_stack.size();
                //assert ( ssize >= count );
                //m_stack.resize(ssize - count);

=== modified file 'libcore/vm/SafeStack.h'
--- a/libcore/vm/SafeStack.h    2008-08-28 22:12:35 +0000
+++ b/libcore/vm/SafeStack.h    2008-08-30 23:04:56 +0000
@@ -108,7 +108,7 @@
        { return mDownstop; }
 
        /// Alias for getDownstop()
-       unsigned int size() const { return mEnd - mDownstop - 1; /*mEnd is one 
past end*/ }
+       size_t size() const { return mEnd - mDownstop - 1; /*mEnd is one past 
end*/ }
 
        /// Is the stack empty to us? (Check totalSize() != for actually empty)
        bool empty() const { return size() == 0; }