[Gnash-commit] gnash ChangeLog server/StringPredicates.h

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/03/10 00:38:51

Modified files:
        .              : ChangeLog 
        server         : StringPredicates.h 

Log message:
        Use std::lexicographical_compare instead of 
boost::ilexicographical_compare,
        because the latter is not available in boost 1.33.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5851&r2=1.5852
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StringPredicates.h?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5851
retrieving revision 1.5852
diff -u -b -r1.5851 -r1.5852
--- ChangeLog   9 Mar 2008 15:09:14 -0000       1.5851
+++ ChangeLog   10 Mar 2008 00:38:51 -0000      1.5852
@@ -1,3 +1,9 @@
+2008-03-09 Bastiaan Jacques <address@hidden>
+
+       * server/StringPredicates.h: Use std::lexicographical_compare instead
+       of boost::ilexicographical_compare, because the latter is not
+       available in boost 1.33.
+
 2008-03-09 Benjamin Wolsey <address@hidden>
 
        * server/gnash.h: add "interfaceEventCallback" callback for passing

Index: server/StringPredicates.h
===================================================================
RCS file: /sources/gnash/gnash/server/StringPredicates.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/StringPredicates.h   8 Mar 2008 00:04:19 -0000       1.11
+++ server/StringPredicates.h   10 Mar 2008 00:38:51 -0000      1.12
@@ -24,6 +24,8 @@
 #include "gnashconfig.h"
 #endif
 
+#include <algorithm>
+#include <boost/algorithm/string/compare.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
 namespace gnash {
@@ -33,7 +35,9 @@
 public:
        bool operator() (const std::string& a, const std::string& b) const
        {
-               return boost::ilexicographical_compare(a, b);
+               return std::lexicographical_compare(a.begin(), a.end(),
+                                                   b.begin(), b.end(),
+                                                   boost::is_iless());
        }
 };