Merge pull request #262 from ChrisKitching/frontendaction

[HIPIFY] Mostly fix preprocessor-or-template induced issues

[ROCm/hip commit: aa05b3d84e]

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

@@ -2684,7 +2684,6 @@ const std::map<llvm::StringRef, hipCounter>& CUDA_RENAMES_MAP() {
 
     // First run, so compute the union map.
     ret = CUDA_IDENTIFIER_MAP;
-    ret.insert(CUDA_INCLUDE_MAP.begin(), CUDA_INCLUDE_MAP.end());
     ret.insert(CUDA_TYPE_NAME_MAP.begin(), CUDA_TYPE_NAME_MAP.end());
 
     return ret;