diff options
author | Matt Arsenault <Matthew.Arsenault@amd.com> | 2013-07-20 00:20:10 +0000 |
---|---|---|
committer | Matt Arsenault <Matthew.Arsenault@amd.com> | 2013-07-20 00:20:10 +0000 |
commit | ac9e819ca9ad93cfbcf0b7c5b0a7cbbd34cd9176 (patch) | |
tree | 49acd0c1eb309352a9b1ba8fa992f576fff7b5d0 /include/llvm | |
parent | 7b61a701932d850d2777fafda1fea5ec841d893b (diff) | |
download | llvm-ac9e819ca9ad93cfbcf0b7c5b0a7cbbd34cd9176.tar.gz llvm-ac9e819ca9ad93cfbcf0b7c5b0a7cbbd34cd9176.tar.bz2 llvm-ac9e819ca9ad93cfbcf0b7c5b0a7cbbd34cd9176.tar.xz |
Fix size_t -> uint warnings with MSVC 64-bit build
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186736 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm')
-rw-r--r-- | include/llvm/Support/CFG.h | 4 | ||||
-rw-r--r-- | include/llvm/Support/IntegersSubset.h | 6 | ||||
-rw-r--r-- | include/llvm/Support/SourceMgr.h | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/include/llvm/Support/CFG.h b/include/llvm/Support/CFG.h index 71a83e9bcb..74ec726092 100644 --- a/include/llvm/Support/CFG.h +++ b/include/llvm/Support/CFG.h @@ -328,7 +328,7 @@ template <> struct GraphTraits<Function*> : public GraphTraits<BasicBlock*> { typedef Function::iterator nodes_iterator; static nodes_iterator nodes_begin(Function *F) { return F->begin(); } static nodes_iterator nodes_end (Function *F) { return F->end(); } - static unsigned size (Function *F) { return F->size(); } + static size_t size (Function *F) { return F->size(); } }; template <> struct GraphTraits<const Function*> : public GraphTraits<const BasicBlock*> { @@ -338,7 +338,7 @@ template <> struct GraphTraits<const Function*> : typedef Function::const_iterator nodes_iterator; static nodes_iterator nodes_begin(const Function *F) { return F->begin(); } static nodes_iterator nodes_end (const Function *F) { return F->end(); } - static unsigned size (const Function *F) { return F->size(); } + static size_t size (const Function *F) { return F->size(); } }; diff --git a/include/llvm/Support/IntegersSubset.h b/include/llvm/Support/IntegersSubset.h index ce34d785d5..64b79ee083 100644 --- a/include/llvm/Support/IntegersSubset.h +++ b/include/llvm/Support/IntegersSubset.h @@ -361,7 +361,7 @@ public: FlatCollection.end(), CheckingVal) != FlatCollection.end(); - for (unsigned i = 0, e = getNumItems(); i < e; ++i) { + for (size_t i = 0, e = getNumItems(); i < e; ++i) { if (RangeLinks[i].first == RangeLinks[i].second) { if (*RangeLinks[i].first == CheckingVal) return true; @@ -382,7 +382,7 @@ public: } /// Return number of items (ranges) stored in set. - unsigned getNumItems() const { + size_t getNumItems() const { return RangeLinks.size(); } @@ -409,7 +409,7 @@ public: /// for range [<0>, <1>, <5>] the size will 3 unsigned getSize() const { APInt sz(((const APInt&)getItem(0).getLow()).getBitWidth(), 0); - for (unsigned i = 0, e = getNumItems(); i != e; ++i) { + for (size_t i = 0, e = getNumItems(); i != e; ++i) { const APInt Low = getItem(i).getLow(); const APInt High = getItem(i).getHigh(); APInt S = High - Low + 1; diff --git a/include/llvm/Support/SourceMgr.h b/include/llvm/Support/SourceMgr.h index d67914a1b8..5b33d42f9e 100644 --- a/include/llvm/Support/SourceMgr.h +++ b/include/llvm/Support/SourceMgr.h @@ -39,7 +39,7 @@ public: DK_Warning, DK_Note }; - + /// DiagHandlerTy - Clients that want to handle their own diagnostics in a /// custom way can register a function pointer+context as a diagnostic /// handler. It gets called each time PrintMessage is invoked. @@ -98,7 +98,7 @@ public: return Buffers[i].Buffer; } - unsigned getNumBuffers() const { + size_t getNumBuffers() const { return Buffers.size(); } @@ -109,20 +109,20 @@ public: /// AddNewSourceBuffer - Add a new source buffer to this source manager. This /// takes ownership of the memory buffer. - unsigned AddNewSourceBuffer(MemoryBuffer *F, SMLoc IncludeLoc) { + size_t AddNewSourceBuffer(MemoryBuffer *F, SMLoc IncludeLoc) { SrcBuffer NB; NB.Buffer = F; NB.IncludeLoc = IncludeLoc; Buffers.push_back(NB); - return Buffers.size()-1; + return Buffers.size() - 1; } /// AddIncludeFile - Search for a file with the specified name in the current /// directory or in one of the IncludeDirs. If no file is found, this returns /// ~0, otherwise it returns the buffer ID of the stacked file. /// The full path to the included file can be found in IncludedFile. - unsigned AddIncludeFile(const std::string &Filename, SMLoc IncludeLoc, - std::string &IncludedFile); + size_t AddIncludeFile(const std::string &Filename, SMLoc IncludeLoc, + std::string &IncludedFile); /// FindBufferContainingLoc - Return the ID of the buffer containing the /// specified location, returning -1 if not found. @@ -221,7 +221,7 @@ public: SMDiagnostic(StringRef filename, SourceMgr::DiagKind Knd, StringRef Msg) : SM(0), Filename(filename), LineNo(-1), ColumnNo(-1), Kind(Knd), Message(Msg) {} - + // Diagnostic with a location. SMDiagnostic(const SourceMgr &sm, SMLoc L, StringRef FN, int Line, int Col, SourceMgr::DiagKind Kind, |