summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/CompilerInstance.cpp
diff options
context:
space:
mode:
authorDylan Noblesmith <nobled@dreamwidth.org>2012-02-05 02:13:05 +0000
committerDylan Noblesmith <nobled@dreamwidth.org>2012-02-05 02:13:05 +0000
commit2c1dd2716a07a173773ac2ba04b5f2da73a1fc6c (patch)
tree261bc83804f76189617bffb8aa419bba7f9232ac /clang/lib/Frontend/CompilerInstance.cpp
parente27789991d575c2e6662961f2a57b2f5c3e8a9e3 (diff)
downloadbcm5719-llvm-2c1dd2716a07a173773ac2ba04b5f2da73a1fc6c.tar.gz
bcm5719-llvm-2c1dd2716a07a173773ac2ba04b5f2da73a1fc6c.zip
Basic: import SmallString<> into clang namespace
(I was going to fix the TODO about DenseMap too, but that would break self-host right now. See PR11922.) llvm-svn: 149799
Diffstat (limited to 'clang/lib/Frontend/CompilerInstance.cpp')
-rw-r--r--clang/lib/Frontend/CompilerInstance.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp
index a3669d798ae..1a6876c4adc 100644
--- a/clang/lib/Frontend/CompilerInstance.cpp
+++ b/clang/lib/Frontend/CompilerInstance.cpp
@@ -264,7 +264,7 @@ void CompilerInstance::createPreprocessor() {
// Set up the module path, including the hash for the
// module-creation options.
- llvm::SmallString<256> SpecificModuleCache(
+ SmallString<256> SpecificModuleCache(
getHeaderSearchOpts().ModuleCachePath);
if (!getHeaderSearchOpts().DisableModuleHash)
llvm::sys::path::append(SpecificModuleCache,
@@ -445,7 +445,7 @@ void CompilerInstance::clearOutputFiles(bool EraseFiles) {
bool existed;
llvm::sys::fs::remove(it->TempFilename, existed);
} else {
- llvm::SmallString<128> NewOutFile(it->Filename);
+ SmallString<128> NewOutFile(it->Filename);
// If '-working-directory' was passed, the output filename should be
// relative to that.
@@ -536,7 +536,7 @@ CompilerInstance::createOutputFile(StringRef OutputPath,
if ((llvm::sys::fs::exists(OutPath.str(), Exists) || !Exists) ||
(OutPath.isRegularFile() && OutPath.canWrite())) {
// Create a temporary file.
- llvm::SmallString<128> TempPath;
+ SmallString<128> TempPath;
TempPath = OutFile;
TempPath += "-%%%%%%%%";
int fd;
@@ -761,7 +761,7 @@ static void compileModule(CompilerInstance &ImportingInstance,
InputKind IK = getSourceInputKindFromOptions(*Invocation->getLangOpts());
// Get or create the module map that we'll use to build this module.
- llvm::SmallString<128> TempModuleMapFileName;
+ SmallString<128> TempModuleMapFileName;
if (const FileEntry *ModuleMapFile
= ModMap.getContainingModuleMapFile(Module)) {
// Use the module map where this module resides.
@@ -890,7 +890,7 @@ Module *CompilerInstance::loadModule(SourceLocation ImportLoc,
SmallVectorImpl<std::string>::iterator Pos
= std::find(ModuleBuildPath.begin(), ModuleBuildPath.end(), ModuleName);
if (Pos != ModuleBuildPath.end()) {
- llvm::SmallString<256> CyclePath;
+ SmallString<256> CyclePath;
for (; Pos != ModuleBuildPath.end(); ++Pos) {
CyclePath += *Pos;
CyclePath += " -> ";
OpenPOWER on IntegriCloud