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

[Bastiaan Jacques]

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

Modified files:
        .              : ChangeLog 
        server         : StringPredicates.h 

Log message:
        Make case insensitive compare work with old boost, take two.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5864&r2=1.5865
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StringPredicates.h?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5864
retrieving revision 1.5865
diff -u -b -r1.5864 -r1.5865
--- ChangeLog   10 Mar 2008 23:23:09 -0000      1.5864
+++ ChangeLog   10 Mar 2008 23:29:38 -0000      1.5865
@@ -1,3 +1,8 @@
+2008-03-10 Bastiaan Jacques <address@hidden>
+
+       * server/StringPredicates.h: Make case insensitive compare work with
+       old boost, take two.
+
 2008-03-10 Sandro Santilli <address@hidden>
 
        * server/vm/fn_call.h: add a 'super' member in the function call.

Index: server/StringPredicates.h
===================================================================
RCS file: /sources/gnash/gnash/server/StringPredicates.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/StringPredicates.h   10 Mar 2008 00:38:51 -0000      1.12
+++ server/StringPredicates.h   10 Mar 2008 23:29:38 -0000      1.13
@@ -37,8 +37,25 @@
        {
                return std::lexicographical_compare(a.begin(), a.end(),
                                                    b.begin(), b.end(),
-                                                   boost::is_iless());
+                                                   nocase_less());
        }
+private:
+
+       class nocase_less
+       {
+       public:
+               nocase_less(const std::locale& locale = std::locale())
+                       : _locale(locale)
+               {}
+
+               bool operator() (const char& a, const char& b) const
+               {
+                       return std::toupper<char>(a, _locale) <
+                              std::toupper<char>(b, _locale);
+               }
+       private:
+               const std::locale& _locale;
+       };
 };