diff options
| author | Weiming Zhao <weimingz@codeaurora.org> | 2016-04-21 05:28:18 +0000 |
|---|---|---|
| committer | Weiming Zhao <weimingz@codeaurora.org> | 2016-04-21 05:28:18 +0000 |
| commit | d69a6d2b2864d3d601e5cbb42c45538f144ac8e2 (patch) | |
| tree | 9be36af3cd142b7cca26e6a9a3ca8f2a01278fc4 /libcxx/include | |
| parent | 54a3a006cab5a108322ed61ce4fbe2939177274c (diff) | |
| download | bcm5719-llvm-d69a6d2b2864d3d601e5cbb42c45538f144ac8e2.tar.gz bcm5719-llvm-d69a6d2b2864d3d601e5cbb42c45538f144ac8e2.zip | |
[libc++] fix macro redef warning when exception is disabled
Summary:
when setting LIBCXX_ENABLE_EXCEPTIONS=false, _LIBCPP_NO_EXCEPTIONS wil be defined in both commandline and _config
Reviewers: bcraig, EricWF
Subscribers: cfe-commits
Differential Revision: http://reviews.llvm.org/D19344
llvm-svn: 266956
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/__config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index b82c7083bef..a28a0a4a1e8 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -297,7 +297,7 @@ typedef __char16_t char16_t; typedef __char32_t char32_t; #endif -#if !(__has_feature(cxx_exceptions)) +#if !(__has_feature(cxx_exceptions)) && !defined(_LIBCPP_NO_EXCEPTIONS) #define _LIBCPP_NO_EXCEPTIONS #endif |
