From 9a777a3a8ed8f73cc9a256208ad3c52391eb5aae Mon Sep 17 00:00:00 2001
From: Jim Laskey <jlaskey@mac.com>
Date: Mon, 27 Feb 2006 22:37:23 +0000
Subject: [PATCH] Qualify dwarf namespace inside llvm namespace.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26409 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/Support/Dwarf.h | 4 ++++
 lib/CodeGen/DwarfWriter.cpp  | 2 +-
 lib/Support/Dwarf.cpp        | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/llvm/Support/Dwarf.h b/include/llvm/Support/Dwarf.h
index cfb8c6a9ab8..56972e494e8 100644
--- 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 3f288323993..d08e7779724 100644
--- 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 9ab541fd640..1f2eef4dfd8 100644
--- 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.