[Gnash-commit] gnash ChangeLog server/array.h server/dlist.cpp...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/03/05 11:38:41

Modified files:
        .              : ChangeLog 
        server         : array.h dlist.cpp URLAccessManager.cpp 

Log message:
        More proper namespacing. Fixes build with GCC 4.3.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5807&r2=1.5808
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.h?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5807
retrieving revision 1.5808
diff -u -b -r1.5807 -r1.5808
--- ChangeLog   5 Mar 2008 11:14:11 -0000       1.5807
+++ ChangeLog   5 Mar 2008 11:38:40 -0000       1.5808
@@ -1,5 +1,10 @@
 2008-03-04 Bastiaan Jacques <address@hidden>
 
+       * server/array.h server/dlist.cpp server/URLAccessManager.cpp: More
+       proper namespacing. Fixes build with GCC 4.3.
+
+2008-03-04 Bastiaan Jacques <address@hidden>
+
        * server/asobj/xmlnode.cpp: Add a direct include and proper
        namespacing for GCC 4.3.
 

Index: server/array.h
===================================================================
RCS file: /sources/gnash/gnash/server/array.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/array.h      7 Feb 2008 11:12:57 -0000       1.42
+++ server/array.h      5 Mar 2008 11:38:40 -0000       1.43
@@ -280,7 +280,7 @@
 
                nelem.sort(avc);
 
-               if (adjacent_find(nelem.begin(), nelem.end(), ave) != 
nelem.end() )
+               if (std::adjacent_find(nelem.begin(), nelem.end(), ave) != 
nelem.end() )
                        return as_value(0);
 
                elements.assign(nelem.begin(), nelem.end());
@@ -322,7 +322,7 @@
 
                std::sort(ielem.begin(), ielem.end(), avc);
 
-               if (adjacent_find(ielem.begin(), ielem.end(), ave) != 
ielem.end() )
+               if (std::adjacent_find(ielem.begin(), ielem.end(), ave) != 
ielem.end() )
                        return as_value(0);
 
                return get_indices(ielem);

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- server/dlist.cpp    19 Feb 2008 19:20:53 -0000      1.114
+++ server/dlist.cpp    5 Mar 2008 11:38:40 -0000       1.115
@@ -148,7 +148,7 @@
 {
   testInvariant();
 
-  container_type::iterator it = find_if(
+  container_type::iterator it = std::find_if(
       _charsByDepth.begin(),
       _charsByDepth.end(),
       NameEquals(name));
@@ -163,7 +163,7 @@
 {
   testInvariant();
 
-  container_type::iterator it = find_if(
+  container_type::iterator it = std::find_if(
       _charsByDepth.begin(),
       _charsByDepth.end(),
       NameEqualsNoCase(name));
@@ -196,7 +196,7 @@
   ch->set_ratio(ratio);
   ch->set_clip_depth(clip_depth);
 
-  container_type::iterator it = find_if(
+  container_type::iterator it = std::find_if(
       _charsByDepth.begin(), _charsByDepth.end(),
       DepthGreaterOrEqual(depth));
 
@@ -246,7 +246,7 @@
 {
   int depth = ch->get_depth();
 
-  container_type::iterator it = find_if(
+  container_type::iterator it = std::find_if(
       _charsByDepth.begin(), _charsByDepth.end(),
       DepthGreaterOrEqual(depth));
   if ( it == _charsByDepth.end() || (*it)->get_depth() != depth )
@@ -305,7 +305,7 @@
   //       I'm not sure what does this break. Udo: do you remember ? --strk;
   // ch->restart();
 
-  container_type::iterator it = find_if(
+  container_type::iterator it = std::find_if(
       _charsByDepth.begin(), _charsByDepth.end(),
       DepthGreaterOrEqual(depth));
 
@@ -454,7 +454,7 @@
   // TODO: would it be legal to call remove_display_object with a depth
   //       in the "removed" zone ?
   // TODO: optimize to take by-depth order into account
-  container_type::iterator it = find_if(
+  container_type::iterator it = std::find_if(
       _charsByDepth.begin(),
       _charsByDepth.end(),
       DepthEquals(depth));
@@ -513,10 +513,10 @@
   assert(srcdepth != newdepth);
 
   // TODO: optimize this scan by taking ch1 depth into account ?
-  container_type::iterator it1 = find(_charsByDepth.begin(), 
_charsByDepth.end(), ch1);
+  container_type::iterator it1 = std::find(_charsByDepth.begin(), 
_charsByDepth.end(), ch1);
 
   // upper bound ...
-  container_type::iterator it2 = find_if(_charsByDepth.begin(), 
_charsByDepth.end(),
+  container_type::iterator it2 = std::find_if(_charsByDepth.begin(), 
_charsByDepth.end(),
       DepthGreaterOrEqual(newdepth));
 
   if ( it1 == _charsByDepth.end() )
@@ -1033,7 +1033,7 @@
 
         if( chNew->isUnloaded() )
         {
-            iterator it = find_if(_charsByDepth.begin(), _charsByDepth.end(),
+            iterator it = std::find_if(_charsByDepth.begin(), 
_charsByDepth.end(),
                     DepthGreaterOrEqual(depthNew));
             
             _charsByDepth.insert(it, *itNew);
@@ -1078,7 +1078,7 @@
   ch->set_depth(newDepth);
 
   // TODO: optimize this by searching from the end(lowest depth).
-  container_type::iterator it = find_if(
+  container_type::iterator it = std::find_if(
       _charsByDepth.begin(), _charsByDepth.end(),
       DepthGreaterOrEqual(newDepth));
 

Index: server/URLAccessManager.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/URLAccessManager.cpp 19 Feb 2008 19:20:52 -0000      1.25
+++ server/URLAccessManager.cpp 5 Mar 2008 11:38:40 -0000       1.26
@@ -165,7 +165,7 @@
        if ( whitelist.size() )
        {
                // TODO: case-insensitive matching ? 
-               it = find(whitelist.begin(), whitelist.end(), host);
+               it = std::find(whitelist.begin(), whitelist.end(), host);
                if ( it != whitelist.end() ) {
                        log_security("Load from host %s granted (whitelisted).",
                                host.c_str());
@@ -182,7 +182,7 @@
 
        vector<string> blacklist = rcfile.getBlackList();
        // TODO: case-insensitive matching ? 
-       it = find(blacklist.begin(), blacklist.end(), host);
+       it = std::find(blacklist.begin(), blacklist.end(), host);
        if ( it != blacklist.end() )
        {
                log_security("Load from host %s forbidden (blacklisted).",