From 54eeca1c0a2cef597d1a34337b84579483f8d4fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Matox?= Date: Tue, 24 Jul 2007 22:50:46 +0000 Subject: [PATCH] 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 --- src/frontends/controllers/frontend_helpers.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/frontends/controllers/frontend_helpers.cpp b/src/frontends/controllers/frontend_helpers.cpp index 6af557035f..22d1048a80 100644 --- a/src/frontends/controllers/frontend_helpers.cpp +++ b/src/frontends/controllers/frontend_helpers.cpp @@ -40,7 +40,6 @@ #include #include -#include 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 -- 2.39.2