LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work around recent -Wshadow changes in Clang

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@299407 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-04-04 01:05:59 +00:00
parent 6547dc88b4
commit 0867373a5c
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/experimental/filesystem
View File

@@ -1091,7 +1091,18 @@ class _LIBCPP_TYPE_VIS path::iterator
{ {
public: public:
typedef bidirectional_iterator_tag iterator_category; typedef bidirectional_iterator_tag iterator_category;
// FIXME: As of 3/April/2017 Clang warns on `value_type` shadowing the
// definition in path. Clang should be fixed and this should be removed.
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wshadow"
#endif
typedef path value_type; typedef path value_type;
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
typedef std::ptrdiff_t difference_type; typedef std::ptrdiff_t difference_type;
typedef const path* pointer; typedef const path* pointer;
typedef const path& reference; typedef const path& reference;

1
include/regex
View File

@@ -3957,7 +3957,6 @@ basic_regex<_CharT, _Traits>::__parse_equivalence_class(_ForwardIterator __first
if (__temp == __last) if (__temp == __last)
__throw_regex_error<regex_constants::error_brack>(); __throw_regex_error<regex_constants::error_brack>();
// [__first, __temp) contains all text in [= ... =] // [__first, __temp) contains all text in [= ... =]
typedef typename _Traits::string_type string_type;
string_type __collate_name = string_type __collate_name =
__traits_.lookup_collatename(__first, __temp); __traits_.lookup_collatename(__first, __temp);
if (__collate_name.empty()) if (__collate_name.empty())