Revert "Fix for clang-3.4"

This reverts commit 22d8969fc16d4475aba6eb7ff2b04ff9542c6d3c.
Add clang++11 compiler switch
update