Skip to content

Commit ff12d49

Browse files
author
LoS
committed
Removed duplicated _LIBCPP_HIDE_FROM_ABI in libcxx
1 parent c87ef14 commit ff12d49

File tree

6 files changed

+32
-36
lines changed

6 files changed

+32
-36
lines changed

‎libcxx/include/__cxx03/__functional/function.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ class _LIBCPP_TEMPLATE_VIS function<_Rp(_ArgTypes...)>
853853

854854
// construct/copy/destroy:
855855
_LIBCPP_HIDE_FROM_ABI function() _NOEXCEPT {}
856-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDE_FROM_ABI function(nullptr_t) _NOEXCEPT {}
856+
_LIBCPP_HIDE_FROM_ABI function(nullptr_t) _NOEXCEPT {}
857857
_LIBCPP_HIDE_FROM_ABI function(const function&);
858858
_LIBCPP_HIDE_FROM_ABI function(function&&) _NOEXCEPT;
859859
template <class _Fp, class = _EnableIfLValueCallable<_Fp>>

‎libcxx/include/__cxx03/future‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,7 @@ public:
14721472

14731473
_LIBCPP_HIDE_FROM_ABI void swap(__packaged_task_function&) _NOEXCEPT;
14741474

1475-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDE_FROM_ABI _Rp operator()(_ArgTypes...) const;
1475+
_LIBCPP_HIDE_FROM_ABI _Rp operator()(_ArgTypes...) const;
14761476
};
14771477

14781478
template <class _Rp, class... _ArgTypes>

‎libcxx/include/__cxx03/regex‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5544,9 +5544,7 @@ public:
55445544

55455545
_LIBCPP_HIDE_FROM_ABI bool operator==(const regex_token_iterator& __x) const;
55465546
#if _LIBCPP_STD_VER >= 20
5547-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDE_FROM_ABI bool operator==(default_sentinel_t) const {
5548-
return *this == regex_token_iterator();
5549-
}
5547+
_LIBCPP_HIDE_FROM_ABI bool operator==(default_sentinel_t) const { return *this == regex_token_iterator(); }
55505548
#endif
55515549
#if _LIBCPP_STD_VER < 20
55525550
_LIBCPP_HIDE_FROM_ABI bool operator!=(const regex_token_iterator& __x) const { return !(*this == __x); }

‎libcxx/include/__functional/function.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -518,13 +518,13 @@ struct __policy {
518518

519519
_LIBCPP_HIDE_FROM_ABI static const __policy* __create_empty() {
520520
static constexpr __policy __policy = {
521-
nullptr,
522-
nullptr,
523-
true,
521+
nullptr,
522+
nullptr,
523+
true,
524524
# if _LIBCPP_HAS_RTTI
525-
&typeid(void)
525+
&typeid(void)
526526
# else
527-
nullptr
527+
nullptr
528528
# endif
529529
};
530530
return &__policy;
@@ -545,13 +545,13 @@ struct __policy {
545545
template <typename _Fun>
546546
_LIBCPP_HIDE_FROM_ABI static const __policy* __choose_policy(/* is_small = */ false_type) {
547547
static constexpr __policy __policy = {
548-
&__large_clone<_Fun>,
549-
&__large_destroy<_Fun>,
550-
false,
548+
&__large_clone<_Fun>,
549+
&__large_destroy<_Fun>,
550+
false,
551551
# if _LIBCPP_HAS_RTTI
552-
&typeid(typename _Fun::_Target)
552+
&typeid(typename _Fun::_Target)
553553
# else
554-
nullptr
554+
nullptr
555555
# endif
556556
};
557557
return &__policy;
@@ -560,13 +560,13 @@ struct __policy {
560560
template <typename _Fun>
561561
_LIBCPP_HIDE_FROM_ABI static const __policy* __choose_policy(/* is_small = */ true_type) {
562562
static constexpr __policy __policy = {
563-
nullptr,
564-
nullptr,
565-
false,
563+
nullptr,
564+
nullptr,
565+
false,
566566
# if _LIBCPP_HAS_RTTI
567-
&typeid(typename _Fun::_Target)
567+
&typeid(typename _Fun::_Target)
568568
# else
569-
nullptr
569+
nullptr
570570
# endif
571571
};
572572
return &__policy;
@@ -854,7 +854,7 @@ class _LIBCPP_TEMPLATE_VIS function<_Rp(_ArgTypes...)>
854854

855855
// construct/copy/destroy:
856856
_LIBCPP_HIDE_FROM_ABI function() _NOEXCEPT {}
857-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDE_FROM_ABI function(nullptr_t) _NOEXCEPT {}
857+
_LIBCPP_HIDE_FROM_ABI function(nullptr_t) _NOEXCEPT {}
858858
_LIBCPP_HIDE_FROM_ABI function(const function&);
859859
_LIBCPP_HIDE_FROM_ABI function(function&&) _NOEXCEPT;
860860
template <class _Fp, class = _EnableIfLValueCallable<_Fp>>

‎libcxx/include/future‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1492,7 +1492,7 @@ public:
14921492

14931493
_LIBCPP_HIDE_FROM_ABI void swap(__packaged_task_function&) _NOEXCEPT;
14941494

1495-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDE_FROM_ABI _Rp operator()(_ArgTypes...) const;
1495+
_LIBCPP_HIDE_FROM_ABI _Rp operator()(_ArgTypes...) const;
14961496
};
14971497

14981498
template <class _Rp, class... _ArgTypes>

‎libcxx/include/regex‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -842,20 +842,20 @@ namespace regex_constants {
842842
// syntax_option_type
843843

844844
enum syntax_option_type {
845-
icase = 1 << 0,
846-
nosubs = 1 << 1,
847-
optimize = 1 << 2,
848-
collate = 1 << 3,
845+
icase = 1 << 0,
846+
nosubs = 1 << 1,
847+
optimize = 1 << 2,
848+
collate = 1 << 3,
849849
# ifdef _LIBCPP_ABI_REGEX_CONSTANTS_NONZERO
850850
ECMAScript = 1 << 9,
851851
# else
852852
ECMAScript = 0,
853853
# endif
854-
basic = 1 << 4,
855-
extended = 1 << 5,
856-
awk = 1 << 6,
857-
grep = 1 << 7,
858-
egrep = 1 << 8,
854+
basic = 1 << 4,
855+
extended = 1 << 5,
856+
awk = 1 << 6,
857+
grep = 1 << 7,
858+
egrep = 1 << 8,
859859
// 1 << 9 may be used by ECMAScript
860860
multiline = 1 << 10
861861
};
@@ -5548,9 +5548,7 @@ public:
55485548

55495549
_LIBCPP_HIDE_FROM_ABI bool operator==(const regex_token_iterator& __x) const;
55505550
# if _LIBCPP_STD_VER >= 20
5551-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDE_FROM_ABI bool operator==(default_sentinel_t) const {
5552-
return *this == regex_token_iterator();
5553-
}
5551+
_LIBCPP_HIDE_FROM_ABI bool operator==(default_sentinel_t) const { return *this == regex_token_iterator(); }
55545552
# endif
55555553
# if _LIBCPP_STD_VER < 20
55565554
_LIBCPP_HIDE_FROM_ABI bool operator!=(const regex_token_iterator& __x) const { return !(*this == __x); }
@@ -5811,8 +5809,8 @@ template <class _BidirT>
58115809
using match_results _LIBCPP_AVAILABILITY_PMR =
58125810
std::match_results<_BidirT, polymorphic_allocator<std::sub_match<_BidirT>>>;
58135811

5814-
using cmatch _LIBCPP_AVAILABILITY_PMR = match_results<const char*>;
5815-
using smatch _LIBCPP_AVAILABILITY_PMR = match_results<std::pmr::string::const_iterator>;
5812+
using cmatch _LIBCPP_AVAILABILITY_PMR = match_results<const char*>;
5813+
using smatch _LIBCPP_AVAILABILITY_PMR = match_results<std::pmr::string::const_iterator>;
58165814

58175815
# if _LIBCPP_HAS_WIDE_CHARACTERS
58185816
using wcmatch _LIBCPP_AVAILABILITY_PMR = match_results<const wchar_t*>;

0 commit comments

Comments
 (0)