From e6c09bb9afaa0eabdbac060d1152049f73d18967 Mon Sep 17 00:00:00 2001
From: Evgeny Mankov <Evgeniy.Mankov@amd.com>
Date: Mon, 14 Jan 2019 21:19:34 +0300
Subject: [PATCH] [HIPIFY] rename variables as requested in review

---
 hipify-clang/src/ArgParse.cpp | 4 ++--
 hipify-clang/src/ArgParse.h   | 4 ++--
 hipify-clang/src/main.cpp     | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hipify-clang/src/ArgParse.cpp b/hipify-clang/src/ArgParse.cpp
index e81ada1ddc..3cc372adab 100644
--- a/hipify-clang/src/ArgParse.cpp
+++ b/hipify-clang/src/ArgParse.cpp
@@ -89,14 +89,14 @@ cl::opt<bool> DashDash("-",
   cl::value_desc("--"),
   cl::cat(ToolTemplateCategory));
 
-cl::list<std::string> I("I",
+cl::list<std::string> IncludeDirs("I",
   cl::desc("Add directory to include search path"),
   cl::value_desc("directory"),
   cl::ZeroOrMore,
   cl::Prefix,
   cl::cat(ToolTemplateCategory));
 
-cl::list<std::string> D("D",
+cl::list<std::string> MacroNames("D",
   cl::desc("Define <macro> to <value> or 1 if <value> omitted"),
   cl::value_desc("macro>=<value"),
   cl::ZeroOrMore,
diff --git a/hipify-clang/src/ArgParse.h b/hipify-clang/src/ArgParse.h
index 0cb11f1baf..d4e666c968 100644
--- a/hipify-clang/src/ArgParse.h
+++ b/hipify-clang/src/ArgParse.h
@@ -33,8 +33,8 @@ extern cl::opt<std::string> OutputFilename;
 extern cl::opt<std::string> OutputDir;
 extern cl::opt<std::string> TemporaryDir;
 extern cl::opt<std::string> CudaPath;
-extern cl::list<std::string> I;
-extern cl::list<std::string> D;
+extern cl::list<std::string> IncludeDirs;
+extern cl::list<std::string> MacroNames;
 extern cl::opt<bool> Inplace;
 extern cl::opt<bool> SaveTemps;
 extern cl::opt<bool> NoBackup;
diff --git a/hipify-clang/src/main.cpp b/hipify-clang/src/main.cpp
index db6c803c27..d0fcc17e66 100644
--- a/hipify-clang/src/main.cpp
+++ b/hipify-clang/src/main.cpp
@@ -199,14 +199,14 @@ int main(int argc, const char **argv) {
 #if defined(HIPIFY_CLANG_RES)
     Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-resource-dir=" HIPIFY_CLANG_RES));
 #endif
-    if (!D.empty()) {
-      for (std::string s : D) {
+    if (!MacroNames.empty()) {
+      for (std::string s : MacroNames) {
         Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-D", ct::ArgumentInsertPosition::END));
         Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster(s.c_str(), ct::ArgumentInsertPosition::END));
       }
     }
-    if (!I.empty()) {
-      for (std::string s : I) {
+    if (!IncludeDirs.empty()) {
+      for (std::string s : IncludeDirs) {
         Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-I", ct::ArgumentInsertPosition::END));
         Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster(s.c_str(), ct::ArgumentInsertPosition::END));
       }