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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/05/19 21:45:03

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

Log message:
        Fix for broken compilers

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3281&r2=1.3282
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3281
retrieving revision 1.3282
diff -u -b -r1.3281 -r1.3282
--- ChangeLog   19 May 2007 21:18:34 -0000      1.3281
+++ ChangeLog   19 May 2007 21:45:02 -0000      1.3282
@@ -1,3 +1,8 @@
+2007-05-19 Markus Gothe <address@hidden>
+
+       * server/asobj/NetStream.cpp: Got rid of make_pair in favor of
+         std::pair<>();
+
 2007-05-19 Tomas Groth Christensen <address@hidden>
 
        * libbase/tu_timer.cpp: Fixed a compiler warning.
@@ -5,6 +10,7 @@
          loops works. We now use condition variables to pause the decoding 
          loop. We now disconnect from the soundhandler when pausing.
 
+>>>>>>> 1.3281
 2007-05-18 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/: Makefile.am, loop_test2.c, loop_test3.c:

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/asobj/NetStream.cpp  16 May 2007 18:22:32 -0000      1.48
+++ server/asobj/NetStream.cpp  19 May 2007 21:45:03 -0000      1.49
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.48 2007/05/16 18:22:32 tgc Exp $ */
+/* $Id: NetStream.cpp,v 1.49 2007/05/19 21:45:03 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -563,31 +563,31 @@
        {
        
                case bufferEmpty:
-                       return make_pair("NetStream.Buffer.Empty", "status");
+                       return std::pair<const char*, const 
char*>("NetStream.Buffer.Empty", "status");
 
                case bufferFull:
-                       return make_pair("NetStream.Buffer.Full", "status");
+                       return std::pair<const char*, const 
char*>("NetStream.Buffer.Full", "status");
 
                case bufferFlush:
-                       return make_pair("NetStream.Buffer.Flush", "status");
+                       return std::pair<const char*, const 
char*>("NetStream.Buffer.Flush", "status");
 
                case playStart:
-                       return make_pair("NetStream.Play.Start", "status");
+                       return std::pair<const char*, const 
char*>("NetStream.Play.Start", "status");
 
                case playStop:
-                       return make_pair("NetStream.Play.Stop", "status");
+                       return std::pair<const char*, const 
char*>("NetStream.Play.Stop", "status");
 
                case seekNotify:
-                       return make_pair("NetStream.Seek.Notify", "status");
+                       return std::pair<const char*, const 
char*>("NetStream.Seek.Notify", "status");
 
                case streamNotFound:
-                       return make_pair("NetStream.Play.StreamNotFound", 
"error");
+                       return std::pair<const char*, const 
char*>("NetStream.Play.StreamNotFound", "error");
 
                case invalidTime:
-                       return make_pair("NetStream.Seek.InvalidTime", "error");
+                       return std::pair<const char*, const 
char*>("NetStream.Seek.InvalidTime", "error");
 
                default:
-                       return make_pair("","");
+                       return std::pair<const char*, const char*>("","");
        }
 }