Work around template argument deduction bug in GCC 9.2.0 (issue camer…

…on314#218)

Fixed VS2019 /W4 warnings with and without C++17 language suport (issue 

cameron314#211)

Fixed indentation following pull request

Missing semicolon