[MC] Move AsmMacroMaxNestingDepth inside llvm:: after D72680

diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp
index 240828f..ce90c21 100644 (file)
--- a/llvm/lib/MC/MCParser/AsmParser.cpp
+++ b/llvm/lib/MC/MCParser/AsmParser.cpp
@@ -74,8 +74,6 @@ using namespace llvm;
 
 MCAsmParserSemaCallback::~MCAsmParserSemaCallback() = default;
 
-extern cl::opt<unsigned> AsmMacroMaxNestingDepth;
-
 namespace {
 
 /// Helper types for tracking macro definitions.
@@ -753,6 +751,8 @@ public:
 
 namespace llvm {
 
+extern cl::opt<unsigned> AsmMacroMaxNestingDepth;
+
 extern MCAsmParserExtension *createDarwinAsmParser();
 extern MCAsmParserExtension *createELFAsmParser();
 extern MCAsmParserExtension *createCOFFAsmParser();

diff --git a/llvm/lib/MC/MCParser/MCAsmParser.cpp b/llvm/lib/MC/MCParser/MCAsmParser.cpp
index 7fc1dbf..bfeba31 100644 (file)
--- a/llvm/lib/MC/MCParser/MCAsmParser.cpp
+++ b/llvm/lib/MC/MCParser/MCAsmParser.cpp
@@ -21,9 +21,11 @@
 
 using namespace llvm;
 
+namespace llvm {
 cl::opt<unsigned> AsmMacroMaxNestingDepth(
     "asm-macro-max-nesting-depth", cl::init(20), cl::Hidden,
     cl::desc("The maximum nesting depth allowed for assembly macros."));
+}
 
 MCAsmParser::MCAsmParser() = default;
 

diff --git a/llvm/lib/MC/MCParser/MasmParser.cpp b/llvm/lib/MC/MCParser/MasmParser.cpp
index 372538c..595d1f7 100644 (file)
--- a/llvm/lib/MC/MCParser/MasmParser.cpp
+++ b/llvm/lib/MC/MCParser/MasmParser.cpp
@@ -75,8 +75,6 @@
 
 using namespace llvm;
 
-extern cl::opt<unsigned> AsmMacroMaxNestingDepth;
-
 namespace {
 
 /// Helper types for tracking macro definitions.
@@ -1082,6 +1080,8 @@ private:
 
 namespace llvm {
 
+extern cl::opt<unsigned> AsmMacroMaxNestingDepth;
+
 extern MCAsmParserExtension *createCOFFMasmParser();
 
 } // end namespace llvm