Skip to content

Commit 2db4208

Browse files
Remove workarounds for VSO-1538698 "Better handling for non-exported friend function declarations", fixed in 17.10p2.
1 parent 7b1e270 commit 2db4208

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

stl/inc/memory

+2-2
Original file line numberDiff line numberDiff line change
@@ -2914,7 +2914,7 @@ struct _NODISCARD _Global_delete_guard {
29142914
}
29152915
};
29162916

2917-
_EXPORT_STD /* TRANSITION, VSO-1538698 */ template <class _Ty, class... _ArgTypes>
2917+
template <class _Ty, class... _ArgTypes>
29182918
_NODISCARD shared_ptr<_Ty> _Make_shared_unbounded_array(const size_t _Count, const _ArgTypes&... _Args) {
29192919
// make a shared_ptr to an unbounded array
29202920
static_assert(is_unbounded_array_v<_Ty>);
@@ -3022,7 +3022,7 @@ struct _Allocate_n_ptr {
30223022
_Allocate_n_ptr& operator=(const _Allocate_n_ptr&) = delete;
30233023
};
30243024

3025-
_EXPORT_STD /* TRANSITION, VSO-1538698 */ template <bool _IsForOverwrite, class _Ty, class _Alloc, class... _ArgTypes>
3025+
template <bool _IsForOverwrite, class _Ty, class _Alloc, class... _ArgTypes>
30263026
_NODISCARD shared_ptr<_Ty> _Allocate_shared_unbounded_array(
30273027
const _Alloc& _Al, const size_t _Count, const _ArgTypes&... _Args) {
30283028
// make a shared_ptr to an unbounded array

stl/inc/ostream

+1-1
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,7 @@ void _Vprint_nonunicode_impl(
11331133
_Ostr.setstate(_State);
11341134
}
11351135

1136-
_EXPORT_STD /* TRANSITION, VSO-1538698 */ template <class _Filebuf_type = filebuf>
1136+
template <class _Filebuf_type = filebuf>
11371137
ios_base::iostate _Print_noformat_unicode(ostream& _Ostr, const string_view _Str) {
11381138
// *LOCKED*
11391139
//

stl/inc/tuple

+1-1
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ _NODISCARD constexpr const tuple_element_t<_Index, tuple<_Types...>>&& get(const
954954
return static_cast<const _Ty&&>(static_cast<const _Ttype&>(_Tuple)._Myfirst._Val);
955955
}
956956

957-
_EXPORT_STD /* TRANSITION, VSO-1538698 */ template <size_t _Index, class... _Types>
957+
template <size_t _Index, class... _Types>
958958
_NODISCARD constexpr auto&& _Tuple_get(tuple<_Types...>&& _Tuple) noexcept {
959959
// used by pair's piecewise constructor
960960
using _Ty = tuple_element_t<_Index, tuple<_Types...>>;

stl/inc/utility

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ struct tuple_element;
155155
_EXPORT_STD template <size_t _Index, class _Tuple>
156156
using tuple_element_t = typename tuple_element<_Index, _Tuple>::type;
157157

158-
_EXPORT_STD /* TRANSITION, VSO-1538698 */ template <size_t _Index, class... _Types>
158+
template <size_t _Index, class... _Types>
159159
_NODISCARD constexpr auto&& _Tuple_get(tuple<_Types...>&& _Tuple) noexcept;
160160

161161
_EXPORT_STD template <size_t _Index, class... _Types>

stl/inc/xhash

+1-1
Original file line numberDiff line numberDiff line change
@@ -2002,7 +2002,7 @@ template <class _Hasher>
20022002
using _Is_hasher = negation<disjunction<is_integral<_Hasher>, _Is_allocator<_Hasher>>>;
20032003
#endif // _HAS_CXX17
20042004

2005-
_EXPORT_STD /* TRANSITION, VSO-1538698 */ template <class _Traits>
2005+
template <class _Traits>
20062006
_NODISCARD bool _Hash_equal(const _Hash<_Traits>& _Left, const _Hash<_Traits>& _Right) {
20072007
if (_Left.size() != _Right.size()) {
20082008
return false;

stl/inc/xlocale

+1-1
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ __PURE_APPDOMAIN_GLOBAL locale::id codecvt<_Elem, _Byte, _Statype>::id;
800800
#pragma clang diagnostic pop
801801
#endif // defined(__clang__)
802802

803-
_EXPORT_STD /* TRANSITION, VSO-1538698 */ template <class _CvtTy, class _Byte, class _Statype>
803+
template <class _CvtTy, class _Byte, class _Statype>
804804
_NODISCARD int _Codecvt_do_length(
805805
const _CvtTy& _Cvt, _Statype& _State, const _Byte* _First1, const _Byte* _Last1, size_t _Count) {
806806
// return p - _First1, for the largest value p in [_First1, _Last1] such that _Cvt will successfully convert

0 commit comments

Comments
 (0)