Fixed build errors.
Merge branch 'master' of ssh://core.linn.co.uk/home/git/ohTopology
satisfy new clang compiler on Mac
Merge branch 'master' of core:/home/git/ohTopology