Fix warning about using namespace std before std defined
Merge branch 'clang-warnings'