[Gnash-commit] gnash ChangeLog server/asobj/Global.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/06 14:48:37

Modified files:
        .              : ChangeLog 
        server/asobj   : Global.cpp 

Log message:
        cast istringstream to bool as a way to detect errors,
        tellg() == -1 was ambiguos.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5822&r2=1.5823
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.94&r2=1.95

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5822
retrieving revision 1.5823
diff -u -b -r1.5822 -r1.5823
--- ChangeLog   6 Mar 2008 14:47:09 -0000       1.5822
+++ ChangeLog   6 Mar 2008 14:48:36 -0000       1.5823
@@ -1,5 +1,7 @@
 2008-03-06 Sandro Santilli <address@hidden>
 
+       * server/asobj/Global.cpp: cast istringstream to bool as a way
+         to detect errors, tellg() == -1 was ambiguos.
        * testsuite/actionscript.all/String.as: fix expected results
          (could not handle to find a working comparison for multibyte
          chars in swf5).

Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- server/asobj/Global.cpp     6 Mar 2008 13:13:12 -0000       1.94
+++ server/asobj/Global.cpp     6 Mar 2008 14:48:36 -0000       1.95
@@ -177,9 +177,8 @@
     
     std::istringstream s(fn.arg(0).to_string());
     
-    s >> result;
-    
-    if (s.tellg() == -1) {
+    if ( ! (s >> result)  )
+    {
         rv.set_nan();
         return rv;
     }