#include "debug.h"
#include "lyxlex.h"
-#include "support/lyxfunctional.h"
#include "support/filetools.h"
+#include <boost/bind.hpp>
+
using lyx::textclass_type;
using lyx::support::LibFileSearch;
using lyx::support::MakeDisplayPath;
+using boost::bind;
+
#ifndef CXX_GLOBAL_CSTD
using std::exit;
#endif
using std::endl;
+using std::equal_to;
using std::find_if;
using std::make_pair;
using std::sort;
{
ClassList::const_iterator cit =
find_if(classlist_.begin(), classlist_.end(),
- lyx::compare_memfun(&LyXTextClass::name, textclass));
+ bind(equal_to<string>(),
+ bind(&LyXTextClass::name, _1),
+ textclass));
+
return cit != classlist_.end() ?
make_pair(true, textclass_type(cit - classlist_.begin())) :
make_pair(false, textclass_type(0));
// used when sorting the textclass list.
-class less_textclass_avail_desc {
-public:
- int operator()(LyXTextClass const & tc1, LyXTextClass const & tc2) {
+struct less_textclass_avail_desc
+ : public std::binary_function<LyXTextClass, LyXTextClass, int>
+{
+ int operator()(LyXTextClass const & tc1,
+ LyXTextClass const & tc2) const
+ {
// Ordering criteria:
// 1. Availability of text class
// 2. Description (lexicographic)
return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) ||
- (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() &&
- tc1.description() < tc2.description());
+ (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() &&
+ tc1.description() < tc2.description());
}
};