[llvm-commits] CVS: reopt/lib/Mapping/getLLVMinfo.cpp

[Brian Gaeke]

Changes in directory reopt/lib/Mapping:

getLLVMinfo.cpp updated: 1.20 -> 1.21

---
Log message:

Eliminate using std::pair directive.


---
Diffs of the changes:  (+3 -4)

Index: reopt/lib/Mapping/getLLVMinfo.cpp
diff -u reopt/lib/Mapping/getLLVMinfo.cpp:1.20 reopt/lib/Mapping/getLLVMinfo.cpp:1.21
--- reopt/lib/Mapping/getLLVMinfo.cpp:1.20	Sat Sep 13 16:12:12 2003
+++ reopt/lib/Mapping/getLLVMinfo.cpp	Thu Oct 30 14:42:42 2003
@@ -13,7 +13,6 @@
 #include <cassert>
 #include <map>
 using std::map;
-using std::pair;
 using std::vector;
 
 // Global symbols added to the program by the opt -emitfuncs pass:
@@ -24,7 +23,7 @@
 extern unsigned char* FunctionBB[];
 extern unsigned char* FunctionLI[];
 
-static map<unsigned, pair<unsigned, unsigned> > BBmapF;
+static map<unsigned, std::pair<unsigned, unsigned> > BBmapF;
 //reverse of BBMAP
 static map<unsigned, BasicBlock *> BBmapReverse;
 static map<unsigned/*BB*/,map<unsigned/*LI*/,vector<unsigned>/*MI*/ > > MImapF; 
@@ -108,7 +107,7 @@
 /// (I think). It is a runtime error to call this function on a basic
 /// block which is not in the map.
 ///
-pair<uint64_t, uint64_t> getBasicBlockInfo(BasicBlock *BB){
+std::pair<uint64_t, uint64_t> getBasicBlockInfo(BasicBlock *BB){
   // Get pointer to the Module that contains BB.
   Module *M = BB->getParent()->getParent();
 
@@ -179,7 +178,7 @@
     for(Function::iterator BB = FI->begin(), BE = FI->end(); BB != BE; ++BB){
       uint64_t Faddr = (uint64_t)(intptr_t)llvmFunctionTable[funNo];
       BBmapReverse[Faddr + BBmapF[bbNo].first*4] = BB;
-      pair<unsigned, unsigned> bpr= BBmapF[bbNo];
+      std::pair<unsigned, unsigned> bpr= BBmapF[bbNo];
       BBMapFwd[BB] = std::make_pair(Faddr + bpr.first*4, 
 				    Faddr + (bpr.first + bpr.second -1)*4);
       bbNo++;