calc.cpp: minor changes to remove compiler warnings
Merge pull request #24 from FrodeSolheim/calc

calc.cpp: minor changes to remove compiler warnings