msvc fix

Conflicts:
	src/fn++.hpp