aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Linker/LinkModules.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2004-01-09 06:12:26 +0000
committerChris Lattner <sabre@nondot.org>2004-01-09 06:12:26 +0000
commitf7703df4968084c18c248c1feea9961c19a32e6a (patch)
tree5a3e4830177c09d61c4bf51e8d6ef6338d172196 /lib/Linker/LinkModules.cpp
parent21949d90881e89ab9c7b752f82f51577a1f0c095 (diff)
downloadexternal_llvm-f7703df4968084c18c248c1feea9961c19a32e6a.zip
external_llvm-f7703df4968084c18c248c1feea9961c19a32e6a.tar.gz
external_llvm-f7703df4968084c18c248c1feea9961c19a32e6a.tar.bz2
Finegrainify namespacification
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10727 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Linker/LinkModules.cpp')
-rw-r--r--lib/Linker/LinkModules.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index bdbdb7d..af430bd 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -23,8 +23,7 @@
#include "llvm/SymbolTable.h"
#include "llvm/iOther.h"
#include "llvm/Assembly/Writer.h"
-
-namespace llvm {
+using namespace llvm;
// Error - Simple wrapper function to conditionally assign to E and return true.
// This just makes error return conditions a little bit simpler...
@@ -842,7 +841,7 @@ static bool LinkAppendingVars(Module *M,
// the problem. Upon failure, the Dest module could be in a modified state, and
// shouldn't be relied on to be consistent.
//
-bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) {
+bool llvm::LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) {
if (Dest->getEndianness() == Module::AnyEndianness)
Dest->setEndianness(Src->getEndianness());
if (Dest->getPointerSize() == Module::AnyPointerSize)
@@ -909,4 +908,3 @@ bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) {
return false;
}
-} // End llvm namespace