[Gnash-commit] gnash ChangeLog libbase/Makefile.am libbase/tu_...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/02 14:54:33

Modified files:
        .              : ChangeLog 
        libbase        : Makefile.am tu_file.h utility.h 
        libmedia       : AudioDecoderSimple.cpp 
        server/asobj   : Global.cpp string.cpp 
        server/vm      : action.cpp 
Removed files:
        libbase        : tu_swap.h 

Log message:
        Drop tu_swap.h

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5055&r2=1.5056
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.h?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_swap.h?cvsroot=gnash&r1=1.9&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderSimple.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5055
retrieving revision 1.5056
diff -u -b -r1.5055 -r1.5056
--- ChangeLog   2 Dec 2007 09:15:54 -0000       1.5055
+++ ChangeLog   2 Dec 2007 14:54:32 -0000       1.5056
@@ -1,3 +1,10 @@
+2007-12-02 Sandro Santilli <address@hidden>
+
+       * libbase/: Makefile.am, tu_file.h, utility.h,
+         libmedia/AudioDecoderSimple.cpp, server/asobj/:
+         Global.cpp, string.cpp, server/vm/action.cpp:
+         Drop tu_swap.h
+
 2007-12-01 Sandro Santilli <address@hidden>
 
        * server/vm/fn_call.h: add isInstantiation() method to distinguish

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- libbase/Makefile.am 1 Dec 2007 23:42:39 -0000       1.91
+++ libbase/Makefile.am 2 Dec 2007 14:54:32 -0000       1.92
@@ -135,7 +135,6 @@
        tu_math.h \
        tu_opengl_includes.h \
        tu_random.h \
-       tu_swap.h \
        tu_timer.h \
        WallClockTimer.h \
        tu_types.h \

Index: libbase/tu_file.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- libbase/tu_file.h   21 Sep 2007 13:40:31 -0000      1.17
+++ libbase/tu_file.h   2 Dec 2007 14:54:33 -0000       1.18
@@ -13,7 +13,6 @@
 #include "tu_config.h"
 #include <cstdio>
 #include "tu_types.h"
-#include "tu_swap.h"
 #include "utility.h"
 
 class membuf;

Index: libbase/utility.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- libbase/utility.h   2 Sep 2007 00:08:58 -0000       1.35
+++ libbase/utility.h   2 Dec 2007 14:54:33 -0000       1.36
@@ -22,14 +22,14 @@
 #define UTILITY_H
 
 #include "tu_config.h"
-#include "tu_math.h"
-#include "tu_types.h"
-#include "tu_swap.h"
+//#include "tu_math.h"
+//#include "tu_types.h"
 
 #include <cassert>
 #include <cctype>
 #include <string>
 #include <typeinfo>
+#include <cmath>
 
 #if defined(__GNUC__) && __GNUC__ > 2
 #  include <cxxabi.h>
@@ -87,6 +87,12 @@
 #define M_PI 3.141592654
 #endif // M_PI
 
+#ifndef HAVE_ISFINITE
+# ifndef isfinite 
+#  define isfinite finite
+# endif 
+#endif 
+
 //
 // some misc handy math functions
 //

Index: libmedia/AudioDecoderSimple.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderSimple.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libmedia/AudioDecoderSimple.cpp     24 Nov 2007 17:21:42 -0000      1.7
+++ libmedia/AudioDecoderSimple.cpp     2 Dec 2007 14:54:33 -0000       1.8
@@ -17,14 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: AudioDecoderSimple.cpp,v 1.7 2007/11/24 17:21:42 strk Exp $
-
-#include <boost/scoped_array.hpp>
+// $Id: AudioDecoderSimple.cpp,v 1.8 2007/12/02 14:54:33 strk Exp $
 
 #include "AudioDecoderSimple.h"
 #include "utility.h"
 #include "BitsReader.h"
 
+#include <boost/scoped_array.hpp>
+#include <algorithm> // for std::swap
+
 namespace gnash {
 namespace media {
 
@@ -373,7 +374,7 @@
                                        assert(inputSize & 1 == 0);
                                        for (unsigned i = 0; i < inputSize; 
i+=2)
                                        {
-                                               swap(&decodedData[i], 
&decodedData[i+1]);
+                                               std::swap(decodedData[i], 
decodedData[i+1]);
                                        }
                                        break;
                        default:        // Impossible

Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- server/asobj/Global.cpp     20 Nov 2007 12:04:55 -0000      1.77
+++ server/asobj/Global.cpp     2 Dec 2007 14:54:33 -0000       1.78
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: Global.cpp,v 1.77 2007/11/20 12:04:55 cmusick Exp $ */
+/* $Id: Global.cpp,v 1.78 2007/12/02 14:54:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -125,7 +125,7 @@
 {
     ASSERT_FN_ARGS_IS_1
 
-    return as_value( isfinite(fn.arg(0).to_number()) );
+    return as_value( (bool)isfinite(fn.arg(0).to_number()) );
 }
 
 /// \brief Encode a string to URL-encoded format

Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/asobj/string.cpp     2 Dec 2007 09:15:54 -0000       1.44
+++ server/asobj/string.cpp     2 Dec 2007 14:54:33 -0000       1.45
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: string.cpp,v 1.44 2007/12/02 09:15:54 strk Exp $ */
+/* $Id: string.cpp,v 1.45 2007/12/02 14:54:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,6 +36,7 @@
 #include "namedStrings.h"
 
 #include <boost/algorithm/string/case_conv.hpp>
+#include <algorithm>
 
 #define ENSURE_FN_ARGS(min, max, rv)                                    \
     if (fn.nargs < min) {                                               \
@@ -203,7 +204,7 @@
 
         if (end < start) {
             // Swap start and end like substring
-            swap(&start, &end);
+            std::swap(start, end);
         }
 
         start = valid_index(str, start);
@@ -400,7 +401,7 @@
                 IF_VERBOSE_ASCODING_ERRORS(
                     log_aserror(_("string.slice() called with end < start"));
                 )
-                swap(&end, &start);
+                std::swap(end, start);
             }
 
             end -= start;

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/vm/action.cpp        20 Sep 2007 20:33:07 -0000      1.28
+++ server/vm/action.cpp        2 Dec 2007 14:54:33 -0000       1.29
@@ -50,6 +50,7 @@
 
 #include <typeinfo>
 #include <string>
+#include <algorithm>
 
 using namespace gnash;
 using namespace SWF;
@@ -282,7 +283,7 @@
            int i1 = starting_index + nargs - i;
            assert(i0 < i1);
 
-           swap(&(env->bottom(i0)), &(env->bottom(i1)));
+           std::swap(env->bottom(i0), env->bottom(i1));
        }
 
     // Do the call.

Index: libbase/tu_swap.h
===================================================================
RCS file: libbase/tu_swap.h
diff -N libbase/tu_swap.h
--- libbase/tu_swap.h   25 Apr 2007 11:54:28 -0000      1.9
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-// tu_swap.h   -- Ignacio Castaño, Thatcher Ulrich 2003
-
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
-
-// Basic swapping stuff
-
-#ifndef TU_SWAP_H
-#define TU_SWAP_H
-
-#include "tu_config.h"
-//#include "tu_types.h"
-
-template<class T>
-void   swap(T* a, T* b)
-// Convenient swap function.
-{
-       T       temp(*a);
-       *a = *b;
-       *b = temp;
-}
-
-#endif // TU_SWAP_H
-
-// Local Variables:
-// mode: C++
-// c-basic-offset: 8 
-// tab-width: 8
-// indent-tabs-mode: t
-// End: