Finally bite the bullet and make the major change: split the clang namespace

out of the llvm namespace.  This makes the clang namespace be a sibling of
llvm instead of being a child.

The good thing about this is that it makes many things unambiguous.  The
bad things is that many things in the llvm namespace (notably data structures
like smallvector) now require an llvm:: qualifier.  IMO, libsystem and libsupport
should be split out of llvm into their own namespace in the future, which will fix
this issue.

llvm-svn: 39659

1 files changed, 2 insertions, 3 deletions

diff --git a/clang/Basic/FileManager.cpp b/clang/Basic/FileManager.cpp
index be9d951a63d..9886e032b43 100644
--- a/clang/Basic/FileManager.cpp
+++ b/clang/Basic/FileManager.cpp
@@ -20,7 +20,6 @@
 #include "clang/Basic/FileManager.h"
 #include "llvm/ADT/SmallString.h"
 #include <iostream>
-using namespace llvm;
 using namespace clang;
 
 // FIXME: Enhance libsystem to support inode and other fields.
@@ -37,7 +36,7 @@ using namespace clang;
 const DirectoryEntry *FileManager::getDirectory(const char *NameStart,
                                                 const char *NameEnd) {
   ++NumDirLookups;
-  StringMapEntry<DirectoryEntry *> &NamedDirEnt =
+  llvm::StringMapEntry<DirectoryEntry *> &NamedDirEnt =
     DirEntries.GetOrCreateValue(NameStart, NameEnd);
   
   // See if there is already an entry in the map.
@@ -87,7 +86,7 @@ const FileEntry *FileManager::getFile(const char *NameStart,
   ++NumFileLookups;
   
   // See if there is already an entry in the map.
-  StringMapEntry<FileEntry *> &NamedFileEnt =
+  llvm::StringMapEntry<FileEntry *> &NamedFileEnt =
     FileEntries.GetOrCreateValue(NameStart, NameEnd);
 
   // See if there is already an entry in the map.