aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lenharth <andrewl@lenharth.org>2006-05-31 20:18:28 +0000
committerAndrew Lenharth <andrewl@lenharth.org>2006-05-31 20:18:28 +0000
commit37e8bde1415e16cf0950feb82460b5d7728e4676 (patch)
tree89c9755c825bb22066a904d064bfc8060b97418f
parentf48ec61fbd9c823c103ff8a5d035dd89c7cecb8a (diff)
downloadexternal_llvm-37e8bde1415e16cf0950feb82460b5d7728e4676.zip
external_llvm-37e8bde1415e16cf0950feb82460b5d7728e4676.tar.gz
external_llvm-37e8bde1415e16cf0950feb82460b5d7728e4676.tar.bz2
Fix build breakage on alpha, without causing it on x86. as a bonus, all platforms can invent the same number of unique names now
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28596 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/ADT/StringExtras.h15
-rw-r--r--include/llvm/SymbolTable.h2
-rw-r--r--include/llvm/TypeSymbolTable.h2
-rw-r--r--include/llvm/ValueSymbolTable.h2
4 files changed, 5 insertions, 16 deletions
diff --git a/include/llvm/ADT/StringExtras.h b/include/llvm/ADT/StringExtras.h
index 375b655..e66fc69 100644
--- a/include/llvm/ADT/StringExtras.h
+++ b/include/llvm/ADT/StringExtras.h
@@ -55,11 +55,7 @@ static inline std::string utostr(uint64_t X, bool isNeg = false) {
return std::string(BufPtr);
}
-static inline std::string utostr(unsigned long X, bool isNeg = false) {
- return utostr(static_cast<uint64_t>(X), isNeg);
-}
-
-static inline std::string utostr(unsigned X, bool isNeg = false) {
+static inline std::string utostr(uint32_t X, bool isNeg = false) {
char Buffer[20];
char *BufPtr = Buffer+19;
@@ -83,14 +79,7 @@ static inline std::string itostr(int64_t X) {
return utostr(static_cast<uint64_t>(X));
}
-static inline std::string itostr(long X) {
- if (X < 0)
- return utostr(static_cast<uint64_t>(-X), true);
- else
- return utostr(static_cast<uint64_t>(X));
-}
-
-static inline std::string itostr(int X) {
+static inline std::string itostr(int32_t X) {
if (X < 0)
return utostr(static_cast<unsigned>(-X), true);
else
diff --git a/include/llvm/SymbolTable.h b/include/llvm/SymbolTable.h
index 04f0096..5083243 100644
--- a/include/llvm/SymbolTable.h
+++ b/include/llvm/SymbolTable.h
@@ -292,7 +292,7 @@ private:
/// This value is used to retain the last unique value used
/// by getUniqueName to generate unique names.
- mutable unsigned long LastUnique;
+ mutable uint64_t LastUnique;
/// @}
diff --git a/include/llvm/TypeSymbolTable.h b/include/llvm/TypeSymbolTable.h
index a31525b..8a49456 100644
--- a/include/llvm/TypeSymbolTable.h
+++ b/include/llvm/TypeSymbolTable.h
@@ -138,7 +138,7 @@ private:
/// @{
private:
TypeMap tmap; ///< This is the mapping of names to types.
- mutable unsigned long LastUnique; ///< Counter for tracking unique names
+ mutable uint64_t LastUnique; ///< Counter for tracking unique names
/// @}
diff --git a/include/llvm/ValueSymbolTable.h b/include/llvm/ValueSymbolTable.h
index df3fe18..34fa28b 100644
--- a/include/llvm/ValueSymbolTable.h
+++ b/include/llvm/ValueSymbolTable.h
@@ -127,7 +127,7 @@ public:
/// @{
private:
ValueMap vmap; ///< The map that holds the symbol table.
- mutable unsigned long LastUnique; ///< Counter for tracking unique names
+ mutable uint64_t LastUnique; ///< Counter for tracking unique names
/// @}