[Gnash-commit] gnash ChangeLog testsuite/check.h

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/14 22:01:29

Modified files:
        .              : ChangeLog 
        testsuite      : check.h 

Log message:
                * testsuite/check.h: force literal string to std::string 
conversion in
                  check_equals and xcheck_equals (fixes compiler warnings from 
gcc >=
                  4.1.x)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4606&r2=1.4607
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/check.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4606
retrieving revision 1.4607
diff -u -b -r1.4606 -r1.4607
--- ChangeLog   14 Oct 2007 21:38:10 -0000      1.4606
+++ ChangeLog   14 Oct 2007 22:01:29 -0000      1.4607
@@ -1,5 +1,8 @@
 2007-10-14 Sandro Santilli <address@hidden>
 
+       * testsuite/check.h: force literal string to std::string conversion in
+         check_equals and xcheck_equals (fixes compiler warnings from gcc >=
+         4.1.x)
        * server/as_environment.cpp (get_variable_raw, set_variable_raw): don't
          explicitly look in locals for SWF6 and higher, as locals should 
already
          be in the scope chain; look in scope chain *before* locals in the

Index: testsuite/check.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/check.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/check.h   24 Dec 2006 15:32:59 -0000      1.7
+++ testsuite/check.h   14 Oct 2007 22:01:29 -0000      1.8
@@ -36,7 +36,7 @@
 #define check_equals_label(label, expr, expected) \
        { \
                std::stringstream ss; \
-               if ( label != "" ) ss << label << ": "; \
+               if ( ! label.empty() ) ss << label << ": "; \
                if ( expr == expected ) \
                { \
                        ss << #expr << " == " << expected; \
@@ -71,9 +71,9 @@
                } \
        }
 
-#define check_equals(expr, expected) check_equals_label("", expr, expected)
+#define check_equals(expr, expected) check_equals_label(std::string(), expr, 
expected)
 
-#define xcheck_equals(expr, expected) xcheck_equals_label("", expr, expected)
+#define xcheck_equals(expr, expected) xcheck_equals_label(std::string(), expr, 
expected)
 
 #define check(expr) \
        { \