Merge pull request #1049 from emankov/master

[HIPIFY][fix][#204] Suppress warning message: #pragma once in main file

hipamd/hipify-clang/src/LLVMCompat.cpp

@@ -110,4 +110,12 @@ std::error_code real_path(const Twine &path, SmallVectorImpl<char> &output,
 #endif
 }
 
+bool pragma_once_outside_header() {
+#if LLVM_VERSION_MAJOR < 4
+  return false;
+#else
+  return true;
+#endif
+}
+
 } // namespace llcompat

hipamd/hipify-clang/src/LLVMCompat.h

@@ -81,4 +81,6 @@ void EnterPreprocessorTokenStream(clang::Preprocessor& _pp,
 std::error_code real_path(const Twine &path, SmallVectorImpl<char> &output,
                           bool expand_tilde = false);
 
+bool pragma_once_outside_header();
+
 } // namespace llcompat

hipamd/hipify-clang/src/main.cpp

@@ -222,6 +222,9 @@ int main(int argc, const char **argv) {
 #if defined(HIPIFY_CLANG_RES)
     Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-resource-dir=" HIPIFY_CLANG_RES));
 #endif
+    if (llcompat::pragma_once_outside_header()) {
+      Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-Wno-pragma-once-outside-header", ct::ArgumentInsertPosition::BEGIN));
+    }
     if (!MacroNames.empty()) {
       for (std::string s : MacroNames) {
         Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-D", ct::ArgumentInsertPosition::END));