Replaced #ifdef with extra parenthesis to solve macro/comma problems
Merge branch 'develop' of github.com:boostorg/geometry into develop