Qualify dwarf namespace inside llvm namespace.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26409 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/Dwarf.h b/include/llvm/Support/Dwarf.h
index cfb8c6a9ab88f6b62fac8419f149f90c01aee159..56972e494e87e9526e8cecfa8665d091ca44a520 100644 (file)
--- a/include/llvm/Support/Dwarf.h
+++ b/include/llvm/Support/Dwarf.h
@@ -16,6 +16,8 @@
 #ifndef LLVM_SUPPORT_DWARF_H
 #define LLVM_SUPPORT_DWARF_H
 
+namespace llvm {
+
 namespace dwarf {
 
 //===----------------------------------------------------------------------===//
@@ -513,4 +515,6 @@ const char *CallFrameString(unsigned Encoding);
 
 } // End of namespace dwarf
 
+} // End of namespace llvm
+
 #endif

diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index 3f2883239934cf8a420e670a94022e7dbfb0ab37..d08e7779724af02e15863d3a75fcafd7ed2832ac 100644 (file)
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -26,7 +26,7 @@
 #include <iostream>
 
 using namespace llvm;
-using namespace dwarf;
+using namespace llvm::dwarf;
 
 static cl::opt<bool>
 DwarfVerbose("dwarf-verbose", cl::Hidden,

diff --git a/lib/Support/Dwarf.cpp b/lib/Support/Dwarf.cpp
index 9ab541fd640aeb19b4b857b1e50e203884a7116d..1f2eef4dfd8b7f73e49fe1c4159380469b3b38f6 100644 (file)
--- a/lib/Support/Dwarf.cpp
+++ b/lib/Support/Dwarf.cpp
@@ -15,6 +15,8 @@
 
 #include <cassert>
 
+namespace llvm {
+
 namespace dwarf {
 
 /// TagString - Return the string for the specified tag.
@@ -568,5 +570,6 @@ const char *CallFrameString(unsigned Encoding) {
   return "";
 }
 
-} // End of namespace llvm.
+} // End of namespace dwarf.
 
+} // End of namespace llvm.