averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
Bob Wilson
2016-10-17 11:52:21 -07:00
parent fd5e69f18a 781ee82cf6
commit 1caba3e209
222 changed files with 4965 additions and 4290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/swift/Basic/STLExtras.h
View File

@@ -182,7 +182,7 @@ inline void set_union_for_each(const Container1 &C1, const Container2 &C2,
/// Takes an iterator and an iterator pointing to the end of the iterator range.
/// If the iterator already points to the end of its range, simply return it,
/// otherwise return the the next element.
/// otherwise return the next element.
template <typename Iterator>
inline Iterator next_or_end(Iterator it, Iterator end) {
return (it == end) ? end : std::next(it);

2
include/swift/Basic/SourceManager.h
View File

@@ -40,7 +40,7 @@ class SourceManager {
int LineOffset;
};
std::map<const char *, VirtualFile> VirtualFiles;
mutable std::pair<const char *, const VirtualFile*> CachedVFile = {};
mutable std::pair<const char *, const VirtualFile*> CachedVFile = {nullptr, nullptr};
public:
llvm::SourceMgr &getLLVMSourceMgr() {