Changed template parameter list of discrete function! Now uses local function instead of local function iterator, which was never used nor implemented in derived classes DFAdapt and DiscFuncArray

[[Imported from SVN: r1572]]