revert locale sorting since it gives problems with gcc 3.x (see bug 2738)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19198 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/controllers/frontend_helpers.cpp b/src/frontends/controllers/frontend_helpers.cpp
index 6af557035f8dfdfe2bc7bb7bc84a80b446fcb651..22d1048a80197cfa98255a59b8fc587a2fcd6793 100644 (file)
--- a/src/frontends/controllers/frontend_helpers.cpp
+++ b/src/frontends/controllers/frontend_helpers.cpp
@@ -40,7 +40,6 @@
 
 #include <algorithm>
 #include <fstream>
-#include <locale>
 
 using std::string;
 using std::vector;
@@ -1108,22 +1107,10 @@ class Sorter
                                      LanguagePair, bool>
 {
 public:
-#if 1//defined(__GNUC__) && (!defined(USE_WCHAR_T) || __GNUC__ < 4)
        bool operator()(LanguagePair const & lhs,
                        LanguagePair const & rhs) const {
                return lhs.first < rhs.first;
        }
-#else
-// this is supposed to fix bug 2738, but it is not stable yet
-// see http://bugzilla.lyx.org/show_bug.cgi?id=2738
-       Sorter() : loc_("") {};
-       bool operator()(LanguagePair const & lhs,
-                       LanguagePair const & rhs) const {
-               return loc_(lhs.first, rhs.first);
-       }
-private:
-       std::locale loc_;
-#endif
 };
 
 } // namespace anon