Re-fix square.h warning to avoid a compile error under MSVC