diff options
author | Saleem Abdulrasool <compnerd@compnerd.org> | 2017-01-30 00:15:47 +0000 |
---|---|---|
committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2017-01-30 00:15:47 +0000 |
commit | a902e7aa941d5a82a44f11a42e4210812cf92d13 (patch) | |
tree | 58a7066fd961123b3e77c9053e0b2f5781d40bcb /libcxx/src | |
parent | 3b7e823f9222bf9f2c78841694c1957725f8d3ff (diff) | |
download | bcm5719-llvm-a902e7aa941d5a82a44f11a42e4210812cf92d13.tar.gz bcm5719-llvm-a902e7aa941d5a82a44f11a42e4210812cf92d13.zip |
experimental: tolerate the existence of a `__deref` macro
Microsoft's SAL has a `__deref` macro which results in a compilation
failure when building the filesystem module on Windows. Rename the
member function internally to avoid the conflict.
llvm-svn: 293449
Diffstat (limited to 'libcxx/src')
-rw-r--r-- | libcxx/src/experimental/filesystem/directory_iterator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/src/experimental/filesystem/directory_iterator.cpp b/libcxx/src/experimental/filesystem/directory_iterator.cpp index aa4bfe6f6f0..66429992086 100644 --- a/libcxx/src/experimental/filesystem/directory_iterator.cpp +++ b/libcxx/src/experimental/filesystem/directory_iterator.cpp @@ -136,7 +136,7 @@ directory_iterator& directory_iterator::__increment(error_code *ec) } -directory_entry const& directory_iterator::__deref() const { +directory_entry const& directory_iterator::__dereference() const { _LIBCPP_ASSERT(__imp_, "Attempting to dereference an invalid iterator"); return __imp_->__entry_; } @@ -182,7 +182,7 @@ int recursive_directory_iterator::depth() const { return __imp_->__stack_.size() - 1; } -const directory_entry& recursive_directory_iterator::__deref() const { +const directory_entry& recursive_directory_iterator::__dereference() const { return __imp_->__stack_.top().__entry_; } |