From 414c80644bcf7da613a463f9611fa5a3a7605910 Mon Sep 17 00:00:00 2001
From: Aaron En Ye Shi <enye.shi@gmail.com>
Date: Fri, 21 May 2021 15:52:07 +0000
Subject: [PATCH] SWDEV-283266 - Workaround RTC macro in vector types

Temporarily disable __HIPCC_RTC__ in hip_vector_types.h
while the upstream clang headers are outdated on mainline.
Once upstream patch has landed in mainline, revert this
change. This is a workaround for hiprtc testing.

Change-Id: Ib2cf6023b71431bbfbe3c699076caa4f90f7170c
---
 hipamd/include/hip/amd_detail/hip_vector_types.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hipamd/include/hip/amd_detail/hip_vector_types.h b/hipamd/include/hip/amd_detail/hip_vector_types.h
index 72a828aaf2..c102750531 100644
--- a/hipamd/include/hip/amd_detail/hip_vector_types.h
+++ b/hipamd/include/hip/amd_detail/hip_vector_types.h
@@ -44,11 +44,12 @@ THE SOFTWARE.
     #endif
 
 #if defined(__cplusplus)
-#if !defined(__HIPCC_RTC__)
+// FIXME: Temporarily enable C++ headers while mainline headers is outdated.
+//#if !defined(__HIPCC_RTC__)
     #include <array>
     #include <iosfwd>
     #include <type_traits>
-#endif // !defined(__HIPCC_RTC__)
+//#endif // !defined(__HIPCC_RTC__)
 
     namespace hip_impl {
         template<typename, typename, unsigned int> struct Scalar_accessor;