From 13ec72a12aaf5bc717082fd70ebd388bac64ecaf Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 21 Oct 2002 13:31:48 +0000 Subject: [PATCH] Remove some unneccesary 'using' directives git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4246 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/DataStructure/DataStructure.cpp | 2 +- lib/Analysis/DataStructure/TopDownClosure.cpp | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp index b75d8dc8a46..d40be448113 100644 --- a/lib/Analysis/DataStructure/DataStructure.cpp +++ b/lib/Analysis/DataStructure/DataStructure.cpp @@ -386,7 +386,7 @@ DSGraph::DSGraph(const DSGraph &G) : Func(G.Func) { DSGraph::~DSGraph() { FunctionCalls.clear(); ValueMap.clear(); - RetNode = 0; + RetNode.setNode(0); #ifndef NDEBUG // Drop all intra-node references, so that assertions don't fail... diff --git a/lib/Analysis/DataStructure/TopDownClosure.cpp b/lib/Analysis/DataStructure/TopDownClosure.cpp index 7db811dbca9..e8a720eb663 100644 --- a/lib/Analysis/DataStructure/TopDownClosure.cpp +++ b/lib/Analysis/DataStructure/TopDownClosure.cpp @@ -12,8 +12,6 @@ #include "llvm/Module.h" #include "llvm/DerivedTypes.h" #include "Support/Statistic.h" -using std::map; -using std::vector; static RegisterAnalysis Y("tddatastructure", "Top-down Data Structure Analysis Closure"); @@ -22,7 +20,7 @@ Y("tddatastructure", "Top-down Data Structure Analysis Closure"); // our memory... here... // void TDDataStructures::releaseMemory() { - for (map::iterator I = DSInfo.begin(), + for (std::map::iterator I = DSInfo.begin(), E = DSInfo.end(); I != E; ++I) delete I->second; @@ -86,7 +84,7 @@ DSGraph &TDDataStructures::calculateGraph(Function &F) { DSGraph &BUGraph = BU.getDSGraph(F); Graph = new DSGraph(BUGraph); - const vector *CallSitesP = BU.getCallSites(F); + const std::vector *CallSitesP = BU.getCallSites(F); if (CallSitesP == 0) { DEBUG(std::cerr << " [TD] No callers for: " << F.getName() << "\n"); return *Graph; // If no call sites, the graph is the same as the BU graph! @@ -96,7 +94,7 @@ DSGraph &TDDataStructures::calculateGraph(Function &F) { // graph. // DEBUG(std::cerr << " [TD] Inlining callers for: " << F.getName() << "\n"); - const vector &CallSites = *CallSitesP; + const std::vector &CallSites = *CallSitesP; for (unsigned c = 0, ce = CallSites.size(); c != ce; ++c) { const DSCallSite &CallSite = CallSites[c]; // Copy Function &Caller = CallSite.getCaller(); -- 2.34.1