Fix a g++ error with --enable-shell-use-argv
Merge https://github.com/actorquedeveloper/torque