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
This commit is contained in:
José Matox 2007-07-24 22:50:46 +00:00
parent b3ace671d2
commit 54eeca1c0a

View File

@ -40,7 +40,6 @@
#include <algorithm> #include <algorithm>
#include <fstream> #include <fstream>
#include <locale>
using std::string; using std::string;
using std::vector; using std::vector;
@ -1108,22 +1107,10 @@ class Sorter
LanguagePair, bool> LanguagePair, bool>
{ {
public: public:
#if 1//defined(__GNUC__) && (!defined(USE_WCHAR_T) || __GNUC__ < 4)
bool operator()(LanguagePair const & lhs, bool operator()(LanguagePair const & lhs,
LanguagePair const & rhs) const { LanguagePair const & rhs) const {
return lhs.first < rhs.first; 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 } // namespace anon