Author: ericwf
Date: Mon Apr 3 20:05:59 2017
New Revision: 299407
URL: http://llvm.org/viewvc/llvm-project?rev=299407&view=rev
Log:
Work around recent -Wshadow changes in Clang
Modified:
libcxx/trunk/include/experimental/filesystem
libcxx/trunk/include/regex
Modified: libcxx/trunk/include/experimental/filesystem
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/experimental/filesystem?rev=299407&r1=299406&r2=299407&view=diff
==============================================================================
--- libcxx/trunk/include/experimental/filesystem (original)
+++ libcxx/trunk/include/experimental/filesystem Mon Apr 3 20:05:59 2017
@@ -1091,7 +1091,18 @@ class _LIBCPP_TYPE_VIS path::iterator
{
public:
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;
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
typedef std::ptrdiff_t difference_type;
typedef const path* pointer;
typedef const path& reference;
Modified: libcxx/trunk/include/regex
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/regex?rev=299407&r1=299406&r2=299407&view=diff
==============================================================================
--- libcxx/trunk/include/regex (original)
+++ libcxx/trunk/include/regex Mon Apr 3 20:05:59 2017
@@ -3957,7 +3957,6 @@ basic_regex<_CharT, _Traits>::__parse_eq
if (__temp == __last)
__throw_regex_error<regex_constants::error_brack>();
// [__first, __temp) contains all text in [= ... =]
- typedef typename _Traits::string_type string_type;
string_type __collate_name =
__traits_.lookup_collatename(__first, __temp);
if (__collate_name.empty())
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
