[llvm-commits] CVS: llvm/lib/Support/Annotation.cpp NameMangling.cpp Signals.cpp
Chris Lattner
lattner at cs.uiuc.edu
Thu May 22 17:00:01 PDT 2003
Changes in directory llvm/lib/Support:
Annotation.cpp updated: 1.8 -> 1.9
NameMangling.cpp updated: 1.5 -> 1.6
Signals.cpp updated: 1.3 -> 1.4
---
Log message:
Add using declarations
---
Diffs of the changes:
Index: llvm/lib/Support/Annotation.cpp
diff -u llvm/lib/Support/Annotation.cpp:1.8 llvm/lib/Support/Annotation.cpp:1.9
--- llvm/lib/Support/Annotation.cpp:1.8 Tue Jan 14 15:26:46 2003
+++ llvm/lib/Support/Annotation.cpp Thu May 22 16:59:35 2003
@@ -6,12 +6,8 @@
#include <map>
#include "Support/Annotation.h"
-using std::string;
-using std::map;
-using std::pair;
-using std::make_pair;
-typedef map<const string, unsigned> IDMapType;
+typedef std::map<const std::string, unsigned> IDMapType;
static unsigned IDCounter = 0; // Unique ID counter
// Static member to ensure initialiation on demand.
@@ -19,7 +15,7 @@
// On demand annotation creation support...
typedef Annotation *(*AnnFactory)(AnnotationID, const Annotable *, void *);
-typedef map<unsigned, pair<AnnFactory,void*> > FactMapType;
+typedef std::map<unsigned, std::pair<AnnFactory,void*> > FactMapType;
static FactMapType *TheFactMap = 0;
static FactMapType &getFactMap() {
@@ -38,7 +34,7 @@
}
-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 @@
// 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 @@
// 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 @@
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);
}
Index: llvm/lib/Support/NameMangling.cpp
diff -u llvm/lib/Support/NameMangling.cpp:1.5 llvm/lib/Support/NameMangling.cpp:1.6
--- llvm/lib/Support/NameMangling.cpp:1.5 Wed Jun 5 12:55:27 2002
+++ llvm/lib/Support/NameMangling.cpp Thu May 22 16:59:35 2003
@@ -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<PointerType>(Ty)) {
- mangledName = string("P_" + MangleTypeName(PTy->getElementType()));
+ mangledName = std::string("P_" + MangleTypeName(PTy->getElementType()));
} else if (const StructType *STy = dyn_cast<StructType>(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<ArrayType>(Ty)) {
- mangledName = string("A_" +MangleTypeName(ATy->getElementType()));
+ mangledName = std::string("A_" +MangleTypeName(ATy->getElementType()));
} else if (const FunctionType *FTy = dyn_cast<FunctionType>(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 @@
// 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<GlobalValue>(V)
Index: llvm/lib/Support/Signals.cpp
diff -u llvm/lib/Support/Signals.cpp:1.3 llvm/lib/Support/Signals.cpp:1.4
--- llvm/lib/Support/Signals.cpp:1.3 Fri Sep 13 09:57:24 2002
+++ llvm/lib/Support/Signals.cpp Thu May 22 16:59:35 2003
@@ -11,9 +11,8 @@
#include <cstdlib>
#include <cstdio>
#include <signal.h>
-using std::string;
-static std::vector<string> FilesToRemove;
+static std::vector<std::string> FilesToRemove;
// IntSigs - Signals that may interrupt the program at any time.
static const int IntSigs[] = {
@@ -48,7 +47,7 @@
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);
More information about the llvm-commits
mailing list