finegrainify namespacification

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

diff --git a/tools/analyze/GraphPrinters.cpp b/tools/analyze/GraphPrinters.cpp
index 6d2750f5e2eb2931b9683e1e5863c4fb8aab08a3..fc74c480cf2fb26970a3775399490eeb5d6b8c6b 100644 (file)
--- a/tools/analyze/GraphPrinters.cpp
+++ b/tools/analyze/GraphPrinters.cpp
@@ -19,8 +19,7 @@
 #include "llvm/Value.h"
 #include "llvm/Analysis/CallGraph.h"
 #include <fstream>
-
-namespace llvm {
+using namespace llvm;
 
 template<typename GraphType>
 static void WriteGraphToFile(std::ostream &O, const std::string &GraphName,
@@ -41,19 +40,21 @@ static void WriteGraphToFile(std::ostream &O, const std::string &GraphName,
 //                              Call Graph Printer
 //===----------------------------------------------------------------------===//
 
-template<>
-struct DOTGraphTraits<CallGraph*> : public DefaultDOTGraphTraits {
-  static std::string getGraphName(CallGraph *F) {
-    return "Call Graph";
-  }
-
-  static std::string getNodeLabel(CallGraphNode *Node, CallGraph *Graph) {
-    if (Node->getFunction())
-      return ((Value*)Node->getFunction())->getName();
-    else
-      return "Indirect call node";
-  }
-};
+namespace llvm {
+  template<>
+  struct DOTGraphTraits<CallGraph*> : public DefaultDOTGraphTraits {
+    static std::string getGraphName(CallGraph *F) {
+      return "Call Graph";
+    }
+    
+    static std::string getNodeLabel(CallGraphNode *Node, CallGraph *Graph) {
+      if (Node->getFunction())
+        return ((Value*)Node->getFunction())->getName();
+      else
+        return "Indirect call node";
+    }
+  };
+}
 
 
 namespace {
@@ -74,5 +75,3 @@ namespace {
   RegisterAnalysis<CallGraphPrinter> P2("print-callgraph",
                                         "Print Call Graph to 'dot' file");
 };
-
-} // End llvm namespace

diff --git a/tools/opt/GraphPrinters.cpp b/tools/opt/GraphPrinters.cpp
index 6d2750f5e2eb2931b9683e1e5863c4fb8aab08a3..fc74c480cf2fb26970a3775399490eeb5d6b8c6b 100644 (file)
--- a/tools/opt/GraphPrinters.cpp
+++ b/tools/opt/GraphPrinters.cpp
@@ -19,8 +19,7 @@
 #include "llvm/Value.h"
 #include "llvm/Analysis/CallGraph.h"
 #include <fstream>
-
-namespace llvm {
+using namespace llvm;
 
 template<typename GraphType>
 static void WriteGraphToFile(std::ostream &O, const std::string &GraphName,
@@ -41,19 +40,21 @@ static void WriteGraphToFile(std::ostream &O, const std::string &GraphName,
 //                              Call Graph Printer
 //===----------------------------------------------------------------------===//
 
-template<>
-struct DOTGraphTraits<CallGraph*> : public DefaultDOTGraphTraits {
-  static std::string getGraphName(CallGraph *F) {
-    return "Call Graph";
-  }
-
-  static std::string getNodeLabel(CallGraphNode *Node, CallGraph *Graph) {
-    if (Node->getFunction())
-      return ((Value*)Node->getFunction())->getName();
-    else
-      return "Indirect call node";
-  }
-};
+namespace llvm {
+  template<>
+  struct DOTGraphTraits<CallGraph*> : public DefaultDOTGraphTraits {
+    static std::string getGraphName(CallGraph *F) {
+      return "Call Graph";
+    }
+    
+    static std::string getNodeLabel(CallGraphNode *Node, CallGraph *Graph) {
+      if (Node->getFunction())
+        return ((Value*)Node->getFunction())->getName();
+      else
+        return "Indirect call node";
+    }
+  };
+}
 
 
 namespace {
@@ -74,5 +75,3 @@ namespace {
   RegisterAnalysis<CallGraphPrinter> P2("print-callgraph",
                                         "Print Call Graph to 'dot' file");
 };
-
-} // End llvm namespace