Update calc.cpp

using branch tejashree.
files merged