diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2012-10-30 19:06:59 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2012-10-30 19:06:59 +0000 |
| commit | 54d333a601a84e10710463e845f9f3a0cb6ca72b (patch) | |
| tree | 23a7b23123e2088218754a31f9f60912626635c9 /libcxx/include/future | |
| parent | eac2887143bc33febe1cbbe308b2cef749e28284 (diff) | |
| download | bcm5719-llvm-54d333a601a84e10710463e845f9f3a0cb6ca72b.tar.gz bcm5719-llvm-54d333a601a84e10710463e845f9f3a0cb6ca72b.zip | |
Rename uses of _ and __ because these are getting stepped on by macros from other system code.
llvm-svn: 167038
Diffstat (limited to 'libcxx/include/future')
| -rw-r--r-- | libcxx/include/future | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/future b/libcxx/include/future index 39475bd955c..cf552a9f303 100644 --- a/libcxx/include/future +++ b/libcxx/include/future @@ -391,7 +391,7 @@ struct _LIBCPP_VISIBLE is_error_code_enum<future_errc> : public true_type {}; #ifdef _LIBCPP_HAS_NO_STRONG_ENUMS template <> -struct _LIBCPP_VISIBLE is_error_code_enum<future_errc::_> : public true_type { }; +struct _LIBCPP_VISIBLE is_error_code_enum<future_errc::__lx> : public true_type { }; #endif //enum class launch |
