[Gnash-commit] /srv/bzr/gnash/trunk r12035: Fix for ambigousity on AMF

[Markus Gothe]

------------------------------------------------------------
revno: 12035
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Sat 2010-03-13 14:10:42 +0100
message:
  Fix for ambigousity on AMF
modified:
  cygnal/cgi-bin/echo/echo.cpp
  cygnal/cgi-bin/oflaDemo/oflaDemo.cpp

=== modified file 'cygnal/cgi-bin/echo/echo.cpp'
--- a/cygnal/cgi-bin/echo/echo.cpp      2010-01-25 18:52:20 +0000
+++ b/cygnal/cgi-bin/echo/echo.cpp      2010-03-13 13:10:42 +0000
@@ -222,7 +222,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
 
-    AMF amf;
+    amf::AMF amf;
     vector<boost::shared_ptr<amf::Element > > headers;
 
     // The first element is the name of the test, 'echo'

=== modified file 'cygnal/cgi-bin/oflaDemo/oflaDemo.cpp'
--- a/cygnal/cgi-bin/oflaDemo/oflaDemo.cpp      2010-01-01 20:41:28 +0000
+++ b/cygnal/cgi-bin/oflaDemo/oflaDemo.cpp      2010-03-13 13:10:42 +0000
@@ -392,7 +392,7 @@
     GNASH_REPORT_FUNCTION;
 
     demoService demo;
-    AMF amf;
+    amf::AMF amf;
     vector<boost::shared_ptr<amf::Element > > headers;
 
     boost::shared_ptr<amf::Element> el1 = amf.extractAMF(ptr, ptr+size);