[cfe-commits] r39334 - in /cfe/cfe/trunk: Lex/IdentifierTable.cpp Lex/Preprocessor.cpp include/clang/Basic/FileManager.h include/clang/Lex/HeaderSearch.h include/clang/Lex/IdentifierTable.h

[sabre at cs.uiuc.edu]

Author: sabre
Date: Wed Jul 11 11:43:15 2007
New Revision: 39334

URL: http://llvm.org/viewvc/llvm-project?rev=39334&view=rev
Log:
CStringMap -> StringMap.

Modified:
    cfe/cfe/trunk/Lex/IdentifierTable.cpp
    cfe/cfe/trunk/Lex/Preprocessor.cpp
    cfe/cfe/trunk/include/clang/Basic/FileManager.h
    cfe/cfe/trunk/include/clang/Lex/HeaderSearch.h
    cfe/cfe/trunk/include/clang/Lex/IdentifierTable.h

Modified: cfe/cfe/trunk/Lex/IdentifierTable.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Lex/IdentifierTable.cpp?rev=39334&r1=39333&r2=39334&view=diff

==============================================================================
--- cfe/cfe/trunk/Lex/IdentifierTable.cpp (original)
+++ cfe/cfe/trunk/Lex/IdentifierTable.cpp Wed Jul 11 11:43:15 2007
@@ -148,7 +148,7 @@
 // Stats Implementation
 //===----------------------------------------------------------------------===//
 
-class StatsVisitor : public CStringMapVisitor {
+class StatsVisitor : public StringMapVisitor {
   unsigned &IDLenTotal;
   unsigned &MaxIDLen;
 public:

Modified: cfe/cfe/trunk/Lex/Preprocessor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Lex/Preprocessor.cpp?rev=39334&r1=39333&r2=39334&view=diff

==============================================================================
--- cfe/cfe/trunk/Lex/Preprocessor.cpp (original)
+++ cfe/cfe/trunk/Lex/Preprocessor.cpp Wed Jul 11 11:43:15 2007
@@ -887,7 +887,7 @@
 }
 
 namespace {
-struct UnusedIdentifierReporter : public CStringMapVisitor {
+struct UnusedIdentifierReporter : public StringMapVisitor {
   Preprocessor &PP;
   UnusedIdentifierReporter(Preprocessor &pp) : PP(pp) {}
 

Modified: cfe/cfe/trunk/include/clang/Basic/FileManager.h
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/include/clang/Basic/FileManager.h?rev=39334&r1=39333&r2=39334&view=diff

==============================================================================
--- cfe/cfe/trunk/include/clang/Basic/FileManager.h (original)
+++ cfe/cfe/trunk/include/clang/Basic/FileManager.h Wed Jul 11 11:43:15 2007
@@ -14,7 +14,7 @@
 #ifndef LLVM_CLANG_FILEMANAGER_H
 #define LLVM_CLANG_FILEMANAGER_H
 
-#include "llvm/ADT/CStringMap.h"
+#include "llvm/ADT/StringMap.h"
 #include <map>
 #include <string>
 // FIXME: Enhance libsystem to support inode and other fields in stat.
@@ -71,8 +71,8 @@
   /// DirEntries/FileEntries - This is a cache of directory/file entries we have
   /// looked up.  The actual Entry is owned by UniqueFiles/UniqueDirs above.
   ///
-  CStringMap<DirectoryEntry*> DirEntries;
-  CStringMap<FileEntry*> FileEntries;
+  StringMap<DirectoryEntry*> DirEntries;
+  StringMap<FileEntry*> FileEntries;
   
   /// NextFileUID - Each FileEntry we create is assigned a unique ID #.
   ///

Modified: cfe/cfe/trunk/include/clang/Lex/HeaderSearch.h
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/include/clang/Lex/HeaderSearch.h?rev=39334&r1=39333&r2=39334&view=diff

==============================================================================
--- cfe/cfe/trunk/include/clang/Lex/HeaderSearch.h (original)
+++ cfe/cfe/trunk/include/clang/Lex/HeaderSearch.h Wed Jul 11 11:43:15 2007
@@ -15,7 +15,7 @@
 #define LLVM_CLANG_LEX_HEADERSEARCH_H
 
 #include "clang/Lex/DirectoryLookup.h"
-#include "llvm/ADT/CStringMap.h"
+#include "llvm/ADT/StringMap.h"
 #include <vector>
 
 namespace llvm {
@@ -71,7 +71,7 @@
 
   /// FrameworkMap - This is a collection mapping a framework or subframework
   /// name like "Carbon" to the Carbon.framework directory.
-  CStringMap<const DirectoryEntry *> FrameworkMap;
+  StringMap<const DirectoryEntry *> FrameworkMap;
 
   // Various statistics we track for performance analysis.
   unsigned NumIncluded;

Modified: cfe/cfe/trunk/include/clang/Lex/IdentifierTable.h
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/include/clang/Lex/IdentifierTable.h?rev=39334&r1=39333&r2=39334&view=diff

==============================================================================
--- cfe/cfe/trunk/include/clang/Lex/IdentifierTable.h (original)
+++ cfe/cfe/trunk/include/clang/Lex/IdentifierTable.h Wed Jul 11 11:43:15 2007
@@ -15,7 +15,7 @@
 #define LLVM_CLANG_LEX_IDENTIFIERTABLE_H
 
 #include "clang/Basic/TokenKinds.h"
-#include "llvm/ADT/CStringMap.h"
+#include "llvm/ADT/StringMap.h"
 #include <string> 
 
 namespace llvm {
@@ -132,7 +132,7 @@
 class IdentifierTable {
   // Shark shows that using MallocAllocator is *much* slower than using this
   // BumpPtrAllocator!
-  CStringMap<IdentifierInfo, BumpPtrAllocator> HashTable;
+  StringMap<IdentifierInfo, BumpPtrAllocator> HashTable;
 public:
   /// IdentifierTable ctor - Create the identifier table, populating it with
   /// info about the language keywords for the language specified by LangOpts.
@@ -155,7 +155,7 @@
   
   /// VisitIdentifiers - This method walks through all of the identifiers,
   /// invoking IV->VisitIdentifier for each of them.
-  void VisitIdentifiers(const CStringMapVisitor &IV) {
+  void VisitIdentifiers(const StringMapVisitor &IV) {
     HashTable.VisitEntries(IV);
   }