fix a couple of hard crashes, constify local variables, whitespace changes, some...

[lyx.git] / src / support / lyxfunctional.h

diff --git a/src/support/lyxfunctional.h b/src/support/lyxfunctional.h
index 6ac9ef25aca1dfbbbd730d417c9572287e31f9a8..262ca4e007120b44c8503635641e01e8e978671b 100644 (file)
--- a/src/support/lyxfunctional.h
+++ b/src/support/lyxfunctional.h
@@ -22,10 +22,10 @@ private:
 template<class C, class A>
 class void_class_fun_t {
 public:
-       class_fun_t(C & ct, void(C::*p)(A))
+       void_class_fun_t(C & ct, void(C::*p)(A))
                : c(ct), cmf(p) {}
        void operator()(A & a) const {
-               return (c.*cmf)(a);
+               (c.*cmf)(a);
        }
 private:
        C & c;
@@ -122,7 +122,7 @@ back_inserter_fun(Cont & cont, MemRet(Type::*p)())
 
 
 template <class Cont, class Type, class MemRet>
-back_insert_fun_iterator<Cont, Type, MemRet>
+const_back_insert_fun_iterator<Cont, Type, MemRet>
 back_inserter_fun(Cont & cont, MemRet(Type::*p)() const)
 {
        return const_back_insert_fun_iterator<Cont, Type, MemRet>(cont, p);