Merge pull request #262 from ChrisKitching/frontendaction

[HIPIFY] Mostly fix preprocessor-or-template induced issues
2017-11-27 17:30:11 +03:00
parent 77de4b96cf 642af94492
commit b25d199111
11 changed files with 812 additions and 862 deletions
@@ -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;