diff --git a/lemon/lp_base.h b/lemon/lp_base.h --- a/lemon/lp_base.h +++ b/lemon/lp_base.h @@ -1383,26 +1383,26 @@ template void colUpperBound(T &t, Value value) { return 0;} #else - template - typename enable_if::type - colUpperBound(T &t, Value value,dummy<0> = 0) { - for(typename T::iterator i=t.begin();i!=t.end();++i) { + template + typename enable_if::type + colUpperBound(T1 &t, Value value,dummy<0> = 0) { + for(typename T1::iterator i=t.begin();i!=t.end();++i) { colUpperBound(*i, value); } } - template - typename enable_if + typename enable_if::type - colUpperBound(T &t, Value value,dummy<1> = 1) { - for(typename T::iterator i=t.begin();i!=t.end();++i) { + colUpperBound(T1 &t, Value value,dummy<1> = 1) { + for(typename T1::iterator i=t.begin();i!=t.end();++i) { colUpperBound(i->second, value); } } - template - typename enable_if + typename enable_if::type - colUpperBound(T &t, Value value,dummy<2> = 2) { - for(typename T::MapIt i(t); i!=INVALID; ++i){ + colUpperBound(T1 &t, Value value,dummy<2> = 2) { + for(typename T1::MapIt i(t); i!=INVALID; ++i){ colUpperBound(*i, value); } } @@ -1432,24 +1432,24 @@ template void colBounds(T &t, Value lower, Value upper) { return 0;} #else - template - typename enable_if::type - colBounds(T &t, Value lower, Value upper,dummy<0> = 0) { - for(typename T::iterator i=t.begin();i!=t.end();++i) { + template + typename enable_if::type + colBounds(T2 &t, Value lower, Value upper,dummy<0> = 0) { + for(typename T2::iterator i=t.begin();i!=t.end();++i) { colBounds(*i, lower, upper); } } - template - typename enable_if::type - colBounds(T &t, Value lower, Value upper,dummy<1> = 1) { - for(typename T::iterator i=t.begin();i!=t.end();++i) { + template + typename enable_if::type + colBounds(T2 &t, Value lower, Value upper,dummy<1> = 1) { + for(typename T2::iterator i=t.begin();i!=t.end();++i) { colBounds(i->second, lower, upper); } } - template - typename enable_if::type - colBounds(T &t, Value lower, Value upper,dummy<2> = 2) { - for(typename T::MapIt i(t); i!=INVALID; ++i){ + template + typename enable_if::type + colBounds(T2 &t, Value lower, Value upper,dummy<2> = 2) { + for(typename T2::MapIt i(t); i!=INVALID; ++i){ colBounds(*i, lower, upper); } }