diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-12-31 17:34:26 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2016-12-31 17:34:26 +0000 |
| commit | c6aee64c5d7bd5dabd5e1f5770c4f3e0388b5534 (patch) | |
| tree | cdb2b7d1a746295e09b395d34e668635e35b0667 | |
| parent | 04674ef99be8ef54a31b339a1113420345fcdc10 (diff) | |
remove some inherited attributes on exceptions
These exception types are marked with `_LIBCPP_EXCEPTION_ABI` which
expands to `__attribute__((__visibility__("default")))` or
`__declspec(dllexport)`. When building for Windows, we would hit an
error:
cannot apply 'dllexport' to a 'dllexport' class
Remove the duplicate annotations as they will be inherited from the
class.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@290785 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/optional | 1 | ||||
| -rw-r--r-- | include/variant | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/optional b/include/optional index 735ef479e..b950efd0b 100644 --- a/include/optional +++ b/include/optional @@ -167,7 +167,6 @@ public: bad_optional_access() : logic_error("bad optional access") {} // Get the key function ~bad_optional_access() into the dylib - _LIBCPP_FUNC_VIS virtual ~bad_optional_access() _NOEXCEPT; }; diff --git a/include/variant b/include/variant index 22d6b6c94..fcbad951f 100644 --- a/include/variant +++ b/include/variant @@ -216,7 +216,7 @@ namespace std { // explicitly not using versioning namespace class _LIBCPP_EXCEPTION_ABI bad_variant_access : public exception { public: - _LIBCPP_FUNC_VIS virtual const char* what() const _NOEXCEPT; + virtual const char* what() const _NOEXCEPT; }; } // namespace std |