[Gnash-commit] gnash ChangeLog testsuite/libbase/CurlStreamTes...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/09 15:24:20

Modified files:
        .              : ChangeLog 
        testsuite/libbase: CurlStreamTest.cpp NoSeekFileTest.cpp 

Log message:
                * testsuite/libbase/: CurlStreamTest.cpp, NoSeekFileTest.cpp:
                  fix build...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6866&r2=1.6867
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/CurlStreamTest.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/NoSeekFileTest.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6866
retrieving revision 1.6867
diff -u -b -r1.6866 -r1.6867
--- ChangeLog   9 Jun 2008 14:55:51 -0000       1.6866
+++ ChangeLog   9 Jun 2008 15:24:19 -0000       1.6867
@@ -1,5 +1,10 @@
 2008-06-09 Sandro Santilli <address@hidden>
 
+       * testsuite/libbase/: CurlStreamTest.cpp, NoSeekFileTest.cpp:
+         fix build...
+
+2008-06-09 Sandro Santilli <address@hidden>
+
        * server/parser/button_character_def.h: don't redefine UNUSED
 
 2008-06-09 Sandro Santilli <address@hidden>

Index: testsuite/libbase/CurlStreamTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/CurlStreamTest.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/libbase/CurlStreamTest.cpp        21 Jan 2008 23:26:50 -0000      
1.8
+++ testsuite/libbase/CurlStreamTest.cpp        9 Jun 2008 15:24:20 -0000       
1.9
@@ -36,14 +36,14 @@
 static void
 dump_curl(const char* url, ostream& os)
 {
-       std::auto_ptr<tu_file> reader;
+       std::auto_ptr<gnash::IOChannel> reader;
        if ( post )
        {
-               reader.reset( curl_adapter::make_stream(url, post) );
+               reader.reset( gnash::curl_adapter::make_stream(url, post) );
        }
        else
        {
-               reader.reset( curl_adapter::make_stream(url) );
+               reader.reset( gnash::curl_adapter::make_stream(url) );
        }
 
        assert(reader.get());

Index: testsuite/libbase/NoSeekFileTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/NoSeekFileTest.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/libbase/NoSeekFileTest.cpp        21 Jan 2008 23:26:50 -0000      
1.9
+++ testsuite/libbase/NoSeekFileTest.cpp        9 Jun 2008 15:24:20 -0000       
1.10
@@ -46,7 +46,7 @@
 TestState runtest;
 
 static void
-dump_buffer(char* label, char* buf, size_t size, ostream& os)
+dump_buffer(const char* label, char* buf, size_t size, ostream& os)
 {
        os << label << ":" << endl;
        for (size_t i=0; i<size; i++) {
@@ -57,7 +57,7 @@
 
 
 bool 
-compare_reads(tu_file* reader, int fd, char* first, char* second)
+compare_reads(gnash::IOChannel* reader, int fd, char* first, char* second)
 {
        char buf[CHUNK_SIZE];
        char buf2[CHUNK_SIZE];
@@ -135,7 +135,7 @@
 
        dup2(fd, 0);
 
-       tu_file* reader = noseek_fd_adapter::make_stream(0, cachename);
+       gnash::IOChannel* reader = gnash::noseek_fd_adapter::make_stream(0, 
cachename);
        assert(reader);
 
        compare_reads(reader, raw, "wrapped", "raw");