diff options
| author | Jay Foad <jay.foad@gmail.com> | 2011-04-13 12:46:01 +0000 |
|---|---|---|
| committer | Jay Foad <jay.foad@gmail.com> | 2011-04-13 12:46:01 +0000 |
| commit | 3b422a12495af3322caf02477b13b46a40c14219 (patch) | |
| tree | 186ad20de266f67c3c812593bf2e22442d20b46d /llvm | |
| parent | 2c1c33552ddf4eb1cbf1859d11907699b8741609 (diff) | |
| download | bcm5719-llvm-3b422a12495af3322caf02477b13b46a40c14219.tar.gz bcm5719-llvm-3b422a12495af3322caf02477b13b46a40c14219.zip | |
Like the coding standards say, do not use "using namespace std".
llvm-svn: 129435
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/CodeGen/JITCodeEmitter.h | 2 | ||||
| -rw-r--r-- | llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/llvm/include/llvm/CodeGen/JITCodeEmitter.h b/llvm/include/llvm/CodeGen/JITCodeEmitter.h index fea85230515..54e70ba966d 100644 --- a/llvm/include/llvm/CodeGen/JITCodeEmitter.h +++ b/llvm/include/llvm/CodeGen/JITCodeEmitter.h @@ -23,8 +23,6 @@ #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/ADT/DenseMap.h" -using namespace std; - namespace llvm { class MachineBasicBlock; diff --git a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp index 3b4e7509d83..d046b8aea64 100644 --- a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp +++ b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp @@ -128,7 +128,7 @@ namespace { return GlobalToIndirectSymMap; } - pair<void *, Function *> LookupFunctionFromCallSite( + std::pair<void *, Function *> LookupFunctionFromCallSite( const MutexGuard &locked, void *CallSite) const { assert(locked.holds(TheJIT->lock)); @@ -646,7 +646,7 @@ void *JITResolver::JITCompilerFn(void *Stub) { // The address given to us for the stub may not be exactly right, it might // be a little bit after the stub. As such, use upper_bound to find it. - pair<void*, Function*> I = + std::pair<void*, Function*> I = JR->state.LookupFunctionFromCallSite(locked, Stub); F = I.second; ActualPtr = I.first; |

