From 01e770a9e556c2b509cbcec83b000bbe9b98053f Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 22 May 2003 21:59:35 +0000 Subject: Add using declarations git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6305 91177308-0d34-0410-b5e6-96231b3b80d8 --- support/lib/Support/Annotation.cpp | 16 ++++++---------- support/lib/Support/NameMangling.cpp | 21 ++++++++++----------- support/lib/Support/Signals.cpp | 5 ++--- 3 files changed, 18 insertions(+), 24 deletions(-) (limited to 'support/lib') diff --git a/support/lib/Support/Annotation.cpp b/support/lib/Support/Annotation.cpp index 9f24607af7..9166240b82 100644 --- a/support/lib/Support/Annotation.cpp +++ b/support/lib/Support/Annotation.cpp @@ -6,12 +6,8 @@ #include #include "Support/Annotation.h" -using std::string; -using std::map; -using std::pair; -using std::make_pair; -typedef map IDMapType; +typedef std::map IDMapType; static unsigned IDCounter = 0; // Unique ID counter // Static member to ensure initialiation on demand. @@ -19,7 +15,7 @@ static IDMapType &getIDMap() { static IDMapType TheMap; return TheMap; } // On demand annotation creation support... typedef Annotation *(*AnnFactory)(AnnotationID, const Annotable *, void *); -typedef map > FactMapType; +typedef std::map > FactMapType; static FactMapType *TheFactMap = 0; static FactMapType &getFactMap() { @@ -38,7 +34,7 @@ static void eraseFromFactMap(unsigned ID) { } -AnnotationID AnnotationManager::getID(const string &Name) { // Name -> ID +AnnotationID AnnotationManager::getID(const std::string &Name) { // Name -> ID IDMapType::iterator I = getIDMap().find(Name); if (I == getIDMap().end()) { getIDMap()[Name] = IDCounter++; // Add a new element @@ -49,7 +45,7 @@ AnnotationID AnnotationManager::getID(const string &Name) { // Name -> ID // getID - Name -> ID + registration of a factory function for demand driven // annotation support. -AnnotationID AnnotationManager::getID(const string &Name, Factory Fact, +AnnotationID AnnotationManager::getID(const std::string &Name, Factory Fact, void *Data) { AnnotationID Result(getID(Name)); registerAnnotationFactory(Result, Fact, Data); @@ -60,7 +56,7 @@ AnnotationID AnnotationManager::getID(const string &Name, Factory Fact, // getName - This function is especially slow, but that's okay because it should // only be used for debugging. // -const string &AnnotationManager::getName(AnnotationID ID) { // ID -> Name +const std::string &AnnotationManager::getName(AnnotationID ID) { // ID -> Name IDMapType &TheMap = getIDMap(); for (IDMapType::iterator I = TheMap.begin(); ; ++I) { assert(I != TheMap.end() && "Annotation ID is unknown!"); @@ -77,7 +73,7 @@ void AnnotationManager::registerAnnotationFactory(AnnotationID ID, AnnFactory F, void *ExtraData) { if (F) - getFactMap()[ID.ID] = make_pair(F, ExtraData); + getFactMap()[ID.ID] = std::make_pair(F, ExtraData); else eraseFromFactMap(ID.ID); } diff --git a/support/lib/Support/NameMangling.cpp b/support/lib/Support/NameMangling.cpp index 7dc612b271..e2c0c46507 100644 --- a/support/lib/Support/NameMangling.cpp +++ b/support/lib/Support/NameMangling.cpp @@ -7,28 +7,27 @@ #include "llvm/Support/NameMangling.h" #include "llvm/DerivedTypes.h" #include "llvm/GlobalValue.h" -using std::string; // MangleTypeName - Implement a consistent name-mangling scheme for // a given type. // -string MangleTypeName(const Type *Ty) { - string mangledName; +std::string MangleTypeName(const Type *Ty) { + std::string mangledName; if (Ty->isPrimitiveType()) { - const string &longName = Ty->getDescription(); - return string(longName.c_str(), (longName.length() < 2) ? 1 : 2); + const std::string &longName = Ty->getDescription(); + return std::string(longName.c_str(), (longName.length() < 2) ? 1 : 2); } else if (const PointerType *PTy = dyn_cast(Ty)) { - mangledName = string("P_" + MangleTypeName(PTy->getElementType())); + mangledName = std::string("P_" + MangleTypeName(PTy->getElementType())); } else if (const StructType *STy = dyn_cast(Ty)) { - mangledName = string("S_"); + mangledName = std::string("S_"); for (unsigned i=0; i < STy->getNumContainedTypes(); ++i) mangledName += MangleTypeName(STy->getContainedType(i)); } else if (const ArrayType *ATy = dyn_cast(Ty)) { - mangledName = string("A_" +MangleTypeName(ATy->getElementType())); + mangledName = std::string("A_" +MangleTypeName(ATy->getElementType())); } else if (const FunctionType *FTy = dyn_cast(Ty)) { - mangledName = string("M_") + MangleTypeName(FTy->getReturnType()); + mangledName = std::string("M_") + MangleTypeName(FTy->getReturnType()); for (unsigned i = 1; i < FTy->getNumContainedTypes(); ++i) - mangledName += string(MangleTypeName(FTy->getContainedType(i))); + mangledName += std::string(MangleTypeName(FTy->getContainedType(i))); } return mangledName; @@ -38,7 +37,7 @@ string MangleTypeName(const Type *Ty) { // externally visible (i.e., global) objects. // privateName should be unique within the module. // -string MangleName(const string &privateName, const Value *V) { +std::string MangleName(const std::string &privateName, const Value *V) { // Lets drop the P_ before every global name since all globals are ptrs return privateName + "_" + MangleTypeName(isa(V) diff --git a/support/lib/Support/Signals.cpp b/support/lib/Support/Signals.cpp index 3b3468350d..38fb9ddb81 100644 --- a/support/lib/Support/Signals.cpp +++ b/support/lib/Support/Signals.cpp @@ -11,9 +11,8 @@ #include #include #include -using std::string; -static std::vector FilesToRemove; +static std::vector FilesToRemove; // IntSigs - Signals that may interrupt the program at any time. static const int IntSigs[] = { @@ -48,7 +47,7 @@ static void SignalHandler(int Sig) { static void RegisterHandler(int Signal) { signal(Signal, SignalHandler); } // RemoveFileOnSignal - The public API -void RemoveFileOnSignal(const string &Filename) { +void RemoveFileOnSignal(const std::string &Filename) { FilesToRemove.push_back(Filename); std::for_each(IntSigs, IntSigsEnd, RegisterHandler); -- cgit v1.2.3