Merge pull request #217 from ChrisKitching/cxx

[HIPIFY] Don't reject C++ > 11 language features

[ROCm/hip commit: 76975f5928]

projects/hip/hipify-clang/src/Cuda2Hip.cpp

@@ -4277,11 +4277,11 @@ int main(int argc, const char **argv) {
     addAllMatchers(Finder, &Callback);
 
     auto action = newFrontendActionFactory(&Finder, &PPCallbacks);
-    std::vector<const char*> compilationStages;
-    compilationStages.push_back("--cuda-host-only");
 
-    Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster(compilationStages[0], ArgumentInsertPosition::BEGIN));
-    Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("-std=c++11"));
+    Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("--cuda-host-only", ArgumentInsertPosition::BEGIN));
+
+    // Ensure at least c++11 is used.
+    Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("-std=c++11", ArgumentInsertPosition::BEGIN));
 #if defined(HIPIFY_CLANG_RES)
     Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("-resource-dir=" HIPIFY_CLANG_RES));
 #endif