Update the header guards for clang-modernize.
llvm-svn: 189973
diff --git a/clang-tools-extra/clang-modernize/AddOverride/AddOverride.h b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.h
index 8c39775..d5d602e 100644
--- a/clang-tools-extra/clang-modernize/AddOverride/AddOverride.h
+++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverride.h
@@ -15,8 +15,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_ADD_OVERRIDE_H
-#define CPP11_MIGRATE_ADD_OVERRIDE_H
+#ifndef CLANG_MODERNIZE_ADD_OVERRIDE_H
+#define CLANG_MODERNIZE_ADD_OVERRIDE_H
#include "Core/Transform.h"
#include "llvm/Support/Compiler.h"
@@ -42,4 +42,4 @@
AddOverrideFixer *Fixer;
};
-#endif // CPP11_MIGRATE_ADD_OVERRIDE_H
+#endif // CLANG_MODERNIZE_ADD_OVERRIDE_H
diff --git a/clang-tools-extra/clang-modernize/AddOverride/AddOverrideActions.h b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideActions.h
index afcebef..bb59078 100644
--- a/clang-tools-extra/clang-modernize/AddOverride/AddOverrideActions.h
+++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideActions.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_ADD_OVERRIDE_ACTIONS_H
-#define CPP11_MIGRATE_ADD_OVERRIDE_ACTIONS_H
+#ifndef CLANG_MODERNIZE_ADD_OVERRIDE_ACTIONS_H
+#define CLANG_MODERNIZE_ADD_OVERRIDE_ACTIONS_H
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Tooling/Refactoring.h"
@@ -42,4 +42,4 @@
Transform &Owner;
};
-#endif // CPP11_MIGRATE_ADD_OVERRIDE_ACTIONS_H
+#endif // CLANG_MODERNIZE_ADD_OVERRIDE_ACTIONS_H
diff --git a/clang-tools-extra/clang-modernize/AddOverride/AddOverrideMatchers.h b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideMatchers.h
index 0a81e54..7f4332c 100644
--- a/clang-tools-extra/clang-modernize/AddOverride/AddOverrideMatchers.h
+++ b/clang-tools-extra/clang-modernize/AddOverride/AddOverrideMatchers.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_ADD_OVERRIDE_MATCHERS_H
-#define CPP11_MIGRATE_ADD_OVERRIDE_MATCHERS_H
+#ifndef CLANG_MODERNIZE_ADD_OVERRIDE_MATCHERS_H
+#define CLANG_MODERNIZE_ADD_OVERRIDE_MATCHERS_H
#include "clang/ASTMatchers/ASTMatchers.h"
@@ -25,4 +25,4 @@
/// candidates for adding the override attribute.
clang::ast_matchers::DeclarationMatcher makeCandidateForOverrideAttrMatcher();
-#endif // CPP11_MIGRATE_ADD_OVERRIDE_MATCHERS_H
+#endif // CLANG_MODERNIZE_ADD_OVERRIDE_MATCHERS_H
diff --git a/clang-tools-extra/clang-modernize/Core/CustomMatchers.h b/clang-tools-extra/clang-modernize/Core/CustomMatchers.h
index 9af0497..485a47c 100644
--- a/clang-tools-extra/clang-modernize/Core/CustomMatchers.h
+++ b/clang-tools-extra/clang-modernize/Core/CustomMatchers.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_CUSTOMMATCHERS_H
-#define CPP11_MIGRATE_CUSTOMMATCHERS_H
+#ifndef CLANG_MODERNIZE_CUSTOMMATCHERS_H
+#define CLANG_MODERNIZE_CUSTOMMATCHERS_H
#include "clang/ASTMatchers/ASTMatchers.h"
@@ -56,4 +56,4 @@
} // namespace ast_matchers
} // namespace clang
-#endif // CPP11_MIGRATE_CUSTOMMATCHERS_H
+#endif // CLANG_MODERNIZE_CUSTOMMATCHERS_H
diff --git a/clang-tools-extra/clang-modernize/Core/FileOverrides.h b/clang-tools-extra/clang-modernize/Core/FileOverrides.h
index 8ed2914..f1c43e3 100644
--- a/clang-tools-extra/clang-modernize/Core/FileOverrides.h
+++ b/clang-tools-extra/clang-modernize/Core/FileOverrides.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_FILE_OVERRIDES_H
-#define CPP11_MIGRATE_FILE_OVERRIDES_H
+#ifndef CLANG_MODERNIZE_FILE_OVERRIDES_H
+#define CLANG_MODERNIZE_FILE_OVERRIDES_H
#include "Core/Refactoring.h"
#include "clang-apply-replacements/Tooling/ApplyReplacements.h"
@@ -126,4 +126,4 @@
llvm::SmallVectorImpl<char> &Result,
llvm::SmallVectorImpl<char> &Error);
-#endif // CPP11_MIGRATE_FILE_OVERRIDES_H
+#endif // CLANG_MODERNIZE_FILE_OVERRIDES_H
diff --git a/clang-tools-extra/clang-modernize/Core/IncludeDirectives.h b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.h
index c1c5a7a..51627c5 100644
--- a/clang-tools-extra/clang-modernize/Core/IncludeDirectives.h
+++ b/clang-tools-extra/clang-modernize/Core/IncludeDirectives.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_INCLUDE_DIRECTIVES_H
-#define CPP11_MIGRATE_INCLUDE_DIRECTIVES_H
+#ifndef CLANG_MODERNIZE_INCLUDE_DIRECTIVES_H
+#define CLANG_MODERNIZE_INCLUDE_DIRECTIVES_H
#include "clang/Basic/SourceLocation.h"
#include "clang/Tooling/Refactoring.h"
@@ -138,4 +138,4 @@
HeaderToGuardMap HeaderToGuard;
};
-#endif // CPP11_MIGRATE_INCLUDE_DIRECTIVES_H
+#endif // CLANG_MODERNIZE_INCLUDE_DIRECTIVES_H
diff --git a/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.h b/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.h
index a5e73ef..3f31e1ee 100644
--- a/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.h
+++ b/clang-tools-extra/clang-modernize/Core/IncludeExcludeInfo.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_INCLUDEEXCLUDEINFO_H
-#define CPP11_MIGRATE_INCLUDEEXCLUDEINFO_H
+#ifndef CLANG_MODERNIZE_INCLUDEEXCLUDEINFO_H
+#define CLANG_MODERNIZE_INCLUDEEXCLUDEINFO_H
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/system_error.h"
@@ -53,4 +53,4 @@
std::vector<std::string> ExcludeList;
};
-#endif // CPP11_MIGRATE_INCLUDEEXCLUDEINFO_H
+#endif // CLANG_MODERNIZE_INCLUDEEXCLUDEINFO_H
diff --git a/clang-tools-extra/clang-modernize/Core/PerfSupport.h b/clang-tools-extra/clang-modernize/Core/PerfSupport.h
index 58ddded..19556e0 100644
--- a/clang-tools-extra/clang-modernize/Core/PerfSupport.h
+++ b/clang-tools-extra/clang-modernize/Core/PerfSupport.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_PERFSUPPORT_H
-#define CPP11_MIGRATE_PERFSUPPORT_H
+#ifndef CLANG_MODERNIZE_PERFSUPPORT_H
+#define CLANG_MODERNIZE_PERFSUPPORT_H
#include "Transform.h"
#include "llvm/ADT/StringRef.h"
@@ -54,4 +54,4 @@
/// Dump a SourcePerfData map to llvm::errs().
extern void dumpPerfData(const SourcePerfData &Data);
-#endif // CPP11_MIGRATE_PERFSUPPORT_H
+#endif // CLANG_MODERNIZE_PERFSUPPORT_H
diff --git a/clang-tools-extra/clang-modernize/Core/Refactoring.h b/clang-tools-extra/clang-modernize/Core/Refactoring.h
index a15634a..1b33005 100644
--- a/clang-tools-extra/clang-modernize/Core/Refactoring.h
+++ b/clang-tools-extra/clang-modernize/Core/Refactoring.h
@@ -14,8 +14,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_REPLACEMENTS_VEC_H
-#define CPP11_MIGRATE_REPLACEMENTS_VEC_H
+#ifndef CLANG_MODERNIZE_REPLACEMENTS_VEC_H
+#define CLANG_MODERNIZE_REPLACEMENTS_VEC_H
#include "clang/Tooling/Refactoring.h"
@@ -28,4 +28,4 @@
}
}
-#endif // CPP11_MIGRATE_REPLACEMENTS_VEC_H
+#endif // CLANG_MODERNIZE_REPLACEMENTS_VEC_H
diff --git a/clang-tools-extra/clang-modernize/Core/Reformatting.h b/clang-tools-extra/clang-modernize/Core/Reformatting.h
index 9a10171..a9c76df 100644
--- a/clang-tools-extra/clang-modernize/Core/Reformatting.h
+++ b/clang-tools-extra/clang-modernize/Core/Reformatting.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_REFORMATTING_H
-#define CPP11_MIGRATE_REFORMATTING_H
+#ifndef CLANG_MODERNIZE_REFORMATTING_H
+#define CLANG_MODERNIZE_REFORMATTING_H
#include "Core/Refactoring.h"
#include "clang/Format/Format.h"
@@ -57,4 +57,4 @@
clang::format::FormatStyle Style;
};
-#endif // CPP11_MIGRATE_REFORMATTING_H
+#endif // CLANG_MODERNIZE_REFORMATTING_H
diff --git a/clang-tools-extra/clang-modernize/Core/SyntaxCheck.h b/clang-tools-extra/clang-modernize/Core/SyntaxCheck.h
index 1651a7e..5087276 100644
--- a/clang-tools-extra/clang-modernize/Core/SyntaxCheck.h
+++ b/clang-tools-extra/clang-modernize/Core/SyntaxCheck.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_SYNTAX_CHECK_H
-#define CPP11_MIGRATE_SYNTAX_CHECK_H
+#ifndef CLANG_MODERNIZE_SYNTAX_CHECK_H
+#define CLANG_MODERNIZE_SYNTAX_CHECK_H
#include <string>
#include <vector>
@@ -35,4 +35,4 @@
const std::vector<std::string> &SourcePaths,
const FileOverrides &Overrides);
-#endif // CPP11_MIGRATE_SYNTAX_CHECK_H
+#endif // CLANG_MODERNIZE_SYNTAX_CHECK_H
diff --git a/clang-tools-extra/clang-modernize/Core/Transform.h b/clang-tools-extra/clang-modernize/Core/Transform.h
index 846bb8a..d0bcb6a 100644
--- a/clang-tools-extra/clang-modernize/Core/Transform.h
+++ b/clang-tools-extra/clang-modernize/Core/Transform.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_TRANSFORM_H
-#define CPP11_MIGRATE_TRANSFORM_H
+#ifndef CLANG_MODERNIZE_TRANSFORM_H
+#define CLANG_MODERNIZE_TRANSFORM_H
#include "Core/IncludeExcludeInfo.h"
#include "Core/Refactoring.h"
@@ -341,4 +341,4 @@
typedef llvm::Registry<TransformFactory> TransformFactoryRegistry;
-#endif // CPP11_MIGRATE_TRANSFORM_H
+#endif // CLANG_MODERNIZE_TRANSFORM_H
diff --git a/clang-tools-extra/clang-modernize/Core/Transforms.h b/clang-tools-extra/clang-modernize/Core/Transforms.h
index 1836940..8eba70d 100644
--- a/clang-tools-extra/clang-modernize/Core/Transforms.h
+++ b/clang-tools-extra/clang-modernize/Core/Transforms.h
@@ -14,8 +14,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_TRANSFORMS_H
-#define CPP11_MIGRATE_TRANSFORMS_H
+#ifndef CLANG_MODERNIZE_TRANSFORMS_H
+#define CLANG_MODERNIZE_TRANSFORMS_H
#include "llvm/Support/CommandLine.h"
#include "llvm/ADT/StringRef.h"
@@ -79,4 +79,4 @@
OptionMap Options;
};
-#endif // CPP11_MIGRATE_TRANSFORMS_H
+#endif // CLANG_MODERNIZE_TRANSFORMS_H
diff --git a/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h b/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h
index b72576b..f70f573 100644
--- a/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h
+++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopActions.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_LOOP_ACTIONS_H
-#define CPP11_MIGRATE_LOOP_ACTIONS_H
+#ifndef CLANG_MODERNIZE_LOOP_ACTIONS_H
+#define CLANG_MODERNIZE_LOOP_ACTIONS_H
#include "StmtAncestor.h"
#include "Core/Transform.h"
@@ -102,4 +102,4 @@
const clang::ForStmt *TheLoop);
};
-#endif // CPP11_MIGRATE_LOOP_ACTIONS_H
+#endif // CLANG_MODERNIZE_LOOP_ACTIONS_H
diff --git a/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h
index b45d955..5b0366b 100644
--- a/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h
+++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopConvert.h
@@ -14,8 +14,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_LOOP_CONVERT_H
-#define CPP11_MIGRATE_LOOP_CONVERT_H
+#ifndef CLANG_MODERNIZE_LOOP_CONVERT_H
+#define CLANG_MODERNIZE_LOOP_CONVERT_H
#include "Core/Transform.h"
#include "llvm/Support/Compiler.h" // For LLVM_OVERRIDE
@@ -33,4 +33,4 @@
const std::vector<std::string> &SourcePaths) LLVM_OVERRIDE;
};
-#endif // CPP11_MIGRATE_LOOP_CONVERT_H
+#endif // CLANG_MODERNIZE_LOOP_CONVERT_H
diff --git a/clang-tools-extra/clang-modernize/LoopConvert/LoopMatchers.h b/clang-tools-extra/clang-modernize/LoopConvert/LoopMatchers.h
index b0cd8a5..4d3b32b 100644
--- a/clang-tools-extra/clang-modernize/LoopConvert/LoopMatchers.h
+++ b/clang-tools-extra/clang-modernize/LoopConvert/LoopMatchers.h
@@ -16,8 +16,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_LOOP_MATCHERS_H
-#define CPP11_MIGRATE_LOOP_MATCHERS_H
+#ifndef CLANG_MODERNIZE_LOOP_MATCHERS_H
+#define CLANG_MODERNIZE_LOOP_MATCHERS_H
#include "clang/ASTMatchers/ASTMatchers.h"
@@ -39,4 +39,4 @@
clang::ast_matchers::StatementMatcher makeIteratorLoopMatcher();
clang::ast_matchers::StatementMatcher makePseudoArrayLoopMatcher();
-#endif // CPP11_MIGRATE_LOOP_MATCHERS_H
+#endif // CLANG_MODERNIZE_LOOP_MATCHERS_H
diff --git a/clang-tools-extra/clang-modernize/LoopConvert/StmtAncestor.h b/clang-tools-extra/clang-modernize/LoopConvert/StmtAncestor.h
index 2407909..89937af 100644
--- a/clang-tools-extra/clang-modernize/LoopConvert/StmtAncestor.h
+++ b/clang-tools-extra/clang-modernize/LoopConvert/StmtAncestor.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_STMT_ANCESTOR_H
-#define CPP11_MIGRATE_STMT_ANCESTOR_H
+#ifndef CLANG_MODERNIZE_STMT_ANCESTOR_H
+#define CLANG_MODERNIZE_STMT_ANCESTOR_H
#include "clang/AST/RecursiveASTVisitor.h"
@@ -198,4 +198,4 @@
bool VisitTypeLoc(clang::TypeLoc TL);
};
-#endif // CPP11_MIGRATE_STMT_ANCESTOR_H
+#endif // CLANG_MODERNIZE_STMT_ANCESTOR_H
diff --git a/clang-tools-extra/clang-modernize/LoopConvert/VariableNaming.h b/clang-tools-extra/clang-modernize/LoopConvert/VariableNaming.h
index 066ed1e..6a1154b 100644
--- a/clang-tools-extra/clang-modernize/LoopConvert/VariableNaming.h
+++ b/clang-tools-extra/clang-modernize/LoopConvert/VariableNaming.h
@@ -14,8 +14,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_VARIABLE_NAMING_H
-#define CPP11_MIGRATE_VARIABLE_NAMING_H
+#ifndef CLANG_MODERNIZE_VARIABLE_NAMING_H
+#define CLANG_MODERNIZE_VARIABLE_NAMING_H
#include "StmtAncestor.h"
#include "clang/AST/ASTContext.h"
@@ -56,4 +56,4 @@
bool declarationExists(llvm::StringRef Symbol);
};
-#endif // CPP11_MIGRATE_VARIABLE_NAMING_H
+#endif // CLANG_MODERNIZE_VARIABLE_NAMING_H
diff --git a/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h
index 6dad549..62a5c42 100644
--- a/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h
+++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValue.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_PASS_BY_VALUE_H
-#define CPP11_MIGRATE_PASS_BY_VALUE_H
+#ifndef CLANG_MODERNIZE_PASS_BY_VALUE_H
+#define CLANG_MODERNIZE_PASS_BY_VALUE_H
#include "Core/Transform.h"
#include "Core/IncludeDirectives.h"
@@ -71,4 +71,4 @@
ConstructorParamReplacer *Replacer;
};
-#endif // CPP11_MIGRATE_PASS_BY_VALUE_H
+#endif // CLANG_MODERNIZE_PASS_BY_VALUE_H
diff --git a/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.h b/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.h
index 5aeaae4..bd05c40 100644
--- a/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.h
+++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValueActions.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_PASS_BY_VALUE_ACTIONS_H
-#define CPP11_MIGRATE_PASS_BY_VALUE_ACTIONS_H
+#ifndef CLANG_MODERNIZE_PASS_BY_VALUE_ACTIONS_H
+#define CLANG_MODERNIZE_PASS_BY_VALUE_ACTIONS_H
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Tooling/Refactoring.h"
@@ -71,4 +71,4 @@
IncludeDirectives *IncludeManager;
};
-#endif // CPP11_MIGRATE_PASS_BY_VALUE_ACTIONS_H
+#endif // CLANG_MODERNIZE_PASS_BY_VALUE_ACTIONS_H
diff --git a/clang-tools-extra/clang-modernize/PassByValue/PassByValueMatchers.h b/clang-tools-extra/clang-modernize/PassByValue/PassByValueMatchers.h
index 8c2bade..f1f6714 100644
--- a/clang-tools-extra/clang-modernize/PassByValue/PassByValueMatchers.h
+++ b/clang-tools-extra/clang-modernize/PassByValue/PassByValueMatchers.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_REPLACE_AUTO_PTR_MATCHERS_H
-#define CPP11_MIGRATE_REPLACE_AUTO_PTR_MATCHERS_H
+#ifndef CLANG_MODERNIZE_REPLACE_AUTO_PTR_MATCHERS_H
+#define CLANG_MODERNIZE_REPLACE_AUTO_PTR_MATCHERS_H
#include "clang/ASTMatchers/ASTMatchers.h"
@@ -41,4 +41,4 @@
/// \endcode
clang::ast_matchers::DeclarationMatcher makePassByValueCtorParamMatcher();
-#endif // CPP11_MIGRATE_REPLACE_AUTO_PTR_MATCHERS_H
+#endif // CLANG_MODERNIZE_REPLACE_AUTO_PTR_MATCHERS_H
diff --git a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h
index c236c99..ced6770 100644
--- a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h
+++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtr.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_REPLACE_AUTO_PTR_H
-#define CPP11_MIGRATE_REPLACE_AUTO_PTR_H
+#ifndef CLANG_MODERNIZE_REPLACE_AUTO_PTR_H
+#define CLANG_MODERNIZE_REPLACE_AUTO_PTR_H
#include "Core/Transform.h"
#include "llvm/Support/Compiler.h"
@@ -52,4 +52,4 @@
const std::vector<std::string> &SourcePaths) LLVM_OVERRIDE;
};
-#endif // CPP11_MIGRATE_REPLACE_AUTO_PTR_H
+#endif // CLANG_MODERNIZE_REPLACE_AUTO_PTR_H
diff --git a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h
index fb80596..3b3866d 100644
--- a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h
+++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrActions.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_REPLACE_AUTO_PTR_ACTIONS_H
-#define CPP11_MIGRATE_REPLACE_AUTO_PTR_ACTIONS_H
+#ifndef CLANG_MODERNIZE_REPLACE_AUTO_PTR_ACTIONS_H
+#define CLANG_MODERNIZE_REPLACE_AUTO_PTR_ACTIONS_H
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Tooling/Refactoring.h"
@@ -96,4 +96,4 @@
Transform &Owner;
};
-#endif // CPP11_MIGRATE_REPLACE_AUTO_PTR_ACTIONS_H
+#endif // CLANG_MODERNIZE_REPLACE_AUTO_PTR_ACTIONS_H
diff --git a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrMatchers.h b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrMatchers.h
index 2a87d5b..938f3bd 100644
--- a/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrMatchers.h
+++ b/clang-tools-extra/clang-modernize/ReplaceAutoPtr/ReplaceAutoPtrMatchers.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_REPLACE_AUTO_PTR_MATCHERS_H
-#define CPP11_MIGRATE_REPLACE_AUTO_PTR_MATCHERS_H
+#ifndef CLANG_MODERNIZE_REPLACE_AUTO_PTR_MATCHERS_H
+#define CLANG_MODERNIZE_REPLACE_AUTO_PTR_MATCHERS_H
#include "clang/ASTMatchers/ASTMatchers.h"
@@ -61,4 +61,4 @@
/// \endcode
clang::ast_matchers::StatementMatcher makeTransferOwnershipExprMatcher();
-#endif // CPP11_MIGRATE_REPLACE_AUTO_PTR_MATCHERS_H
+#endif // CLANG_MODERNIZE_REPLACE_AUTO_PTR_MATCHERS_H
diff --git a/clang-tools-extra/clang-modernize/UseAuto/UseAuto.h b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.h
index 26b5e44..2293fd7 100644
--- a/clang-tools-extra/clang-modernize/UseAuto/UseAuto.h
+++ b/clang-tools-extra/clang-modernize/UseAuto/UseAuto.h
@@ -15,8 +15,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_USE_AUTO_H
-#define CPP11_MIGRATE_USE_AUTO_H
+#ifndef CLANG_MODERNIZE_USE_AUTO_H
+#define CLANG_MODERNIZE_USE_AUTO_H
#include "Core/Transform.h"
#include "llvm/Support/Compiler.h"
@@ -39,4 +39,4 @@
const std::vector<std::string> &SourcePaths) LLVM_OVERRIDE;
};
-#endif // CPP11_MIGRATE_USE_AUTO_H
+#endif // CLANG_MODERNIZE_USE_AUTO_H
diff --git a/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.h b/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.h
index 0ddb0e0..7cf8feb 100644
--- a/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.h
+++ b/clang-tools-extra/clang-modernize/UseAuto/UseAutoActions.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_USE_AUTO_ACTIONS_H
-#define CPP11_MIGRATE_USE_AUTO_ACTIONS_H
+#ifndef CLANG_MODERNIZE_USE_AUTO_ACTIONS_H
+#define CLANG_MODERNIZE_USE_AUTO_ACTIONS_H
#include "Core/Transform.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
@@ -53,4 +53,4 @@
Transform &Owner;
};
-#endif // CPP11_MIGRATE_USE_AUTO_ACTIONS_H
+#endif // CLANG_MODERNIZE_USE_AUTO_ACTIONS_H
diff --git a/clang-tools-extra/clang-modernize/UseAuto/UseAutoMatchers.h b/clang-tools-extra/clang-modernize/UseAuto/UseAutoMatchers.h
index 37bacee..eff0ec02 100644
--- a/clang-tools-extra/clang-modernize/UseAuto/UseAutoMatchers.h
+++ b/clang-tools-extra/clang-modernize/UseAuto/UseAutoMatchers.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_USE_AUTO_MATCHERS_H
-#define CPP11_MIGRATE_USE_AUTO_MATCHERS_H
+#ifndef CLANG_MODERNIZE_USE_AUTO_MATCHERS_H
+#define CLANG_MODERNIZE_USE_AUTO_MATCHERS_H
#include "clang/ASTMatchers/ASTMatchers.h"
@@ -31,4 +31,4 @@
/// initialized by a C++ new expression.
clang::ast_matchers::StatementMatcher makeDeclWithNewMatcher();
-#endif // CPP11_MIGRATE_USE_AUTO_MATCHERS_H
+#endif // CLANG_MODERNIZE_USE_AUTO_MATCHERS_H
diff --git a/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.h b/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.h
index 02da6b7..763fc87 100644
--- a/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.h
+++ b/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_NULLPTR_ACTIONS_H
-#define CPP11_MIGRATE_NULLPTR_ACTIONS_H
+#ifndef CLANG_MODERNIZE_NULLPTR_ACTIONS_H
+#define CLANG_MODERNIZE_NULLPTR_ACTIONS_H
#include "Core/Transform.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
@@ -38,4 +38,4 @@
Transform &Owner;
};
-#endif // CPP11_MIGRATE_NULLPTR_ACTIONS_H
+#endif // CLANG_MODERNIZE_NULLPTR_ACTIONS_H
diff --git a/clang-tools-extra/clang-modernize/UseNullptr/NullptrMatchers.h b/clang-tools-extra/clang-modernize/UseNullptr/NullptrMatchers.h
index b6b6868..2b01684 100644
--- a/clang-tools-extra/clang-modernize/UseNullptr/NullptrMatchers.h
+++ b/clang-tools-extra/clang-modernize/UseNullptr/NullptrMatchers.h
@@ -13,8 +13,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_USE_NULLPTR_MATCHERS_H
-#define CPP11_MIGRATE_USE_NULLPTR_MATCHERS_H
+#ifndef CLANG_MODERNIZE_USE_NULLPTR_MATCHERS_H
+#define CLANG_MODERNIZE_USE_NULLPTR_MATCHERS_H
#include "clang/ASTMatchers/ASTMatchers.h"
@@ -28,4 +28,4 @@
/// can be replaced instead of just the inner-most implicit cast.
clang::ast_matchers::StatementMatcher makeCastSequenceMatcher();
-#endif // CPP11_MIGRATE_USE_NULLPTR_MATCHERS_H
+#endif // CLANG_MODERNIZE_USE_NULLPTR_MATCHERS_H
diff --git a/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.h b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.h
index ed90f9a..dd93a1d 100644
--- a/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.h
+++ b/clang-tools-extra/clang-modernize/UseNullptr/UseNullptr.h
@@ -14,8 +14,8 @@
///
//===----------------------------------------------------------------------===//
-#ifndef CPP11_MIGRATE_USE_NULLPTR_H
-#define CPP11_MIGRATE_USE_NULLPTR_H
+#ifndef CLANG_MODERNIZE_USE_NULLPTR_H
+#define CLANG_MODERNIZE_USE_NULLPTR_H
#include "Core/Transform.h"
#include "llvm/Support/Compiler.h" // For LLVM_OVERRIDE
@@ -33,4 +33,4 @@
const std::vector<std::string> &SourcePaths) LLVM_OVERRIDE;
};
-#endif // CPP11_MIGRATE_USE_NULLPTR_H
+#endif // CLANG_MODERNIZE_USE_NULLPTR_H