Skip to content

Commit 5021c89

Browse files
hkaiserhkaiser
committed
Remove detail namespaces from module exports
Signed-off-by: Hartmut Kaiser <hartmut.kaiser@gmail.com>
1 parent 2094c4c commit 5021c89

60 files changed

Lines changed: 440 additions & 474 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎libs/core/allocator_support/include/hpx/allocator_support/aligned_allocator.hpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525

2626
namespace hpx::util::detail {
2727

28-
HPX_CXX_EXPORT [[nodiscard]] inline void* __aligned_alloc(
28+
[[nodiscard]] inline void* __aligned_alloc(
2929
std::size_t alignment, std::size_t size) noexcept
3030
{
3131
return HPX_PP_CAT(HPX_HAVE_JEMALLOC_PREFIX, aligned_alloc)(
3232
alignment, size);
3333
}
3434

35-
HPX_CXX_EXPORT inline void __aligned_free(void* p, std::size_t) noexcept
35+
inline void __aligned_free(void* p, std::size_t) noexcept
3636
{
3737
return HPX_PP_CAT(HPX_HAVE_JEMALLOC_PREFIX, free)(p);
3838
}
@@ -44,13 +44,13 @@ namespace hpx::util::detail {
4444

4545
namespace hpx::util::detail {
4646

47-
HPX_CXX_EXPORT [[nodiscard]] inline void* __aligned_alloc(
47+
[[nodiscard]] inline void* __aligned_alloc(
4848
std::size_t alignment, std::size_t size) noexcept
4949
{
5050
return std::aligned_alloc(alignment, size);
5151
}
5252

53-
HPX_CXX_EXPORT inline void __aligned_free(void* p, std::size_t) noexcept
53+
inline void __aligned_free(void* p, std::size_t) noexcept
5454
{
5555
std::free(p);
5656
}
@@ -62,13 +62,13 @@ namespace hpx::util::detail {
6262

6363
namespace hpx::util::detail {
6464

65-
HPX_CXX_EXPORT [[nodiscard]] inline void* __aligned_alloc(
65+
[[nodiscard]] inline void* __aligned_alloc(
6666
std::size_t alignment, std::size_t size) noexcept
6767
{
6868
return aligned_alloc(alignment, size);
6969
}
7070

71-
HPX_CXX_EXPORT inline void __aligned_free(void* p, std::size_t) noexcept
71+
inline void __aligned_free(void* p, std::size_t) noexcept
7272
{
7373
free(p);
7474
}
@@ -81,7 +81,7 @@ namespace hpx::util::detail {
8181
namespace hpx::util::detail {
8282

8383
// provide our own (simple) implementation of aligned_alloc
84-
HPX_CXX_EXPORT [[nodiscard]] inline void* __aligned_alloc(
84+
[[nodiscard]] inline void* __aligned_alloc(
8585
std::size_t alignment, std::size_t size) noexcept
8686
{
8787
if (alignment < alignof(void*))
@@ -105,7 +105,7 @@ namespace hpx::util::detail {
105105
return aligned_mem;
106106
}
107107

108-
HPX_CXX_EXPORT inline void __aligned_free(void* p, std::size_t) noexcept
108+
inline void __aligned_free(void* p, std::size_t) noexcept
109109
{
110110
if (nullptr != p)
111111
{
@@ -118,7 +118,7 @@ namespace hpx::util::detail {
118118

119119
namespace hpx::util::detail {
120120

121-
HPX_CXX_EXPORT template <typename Allocator>
121+
template <typename Allocator>
122122
[[nodiscard]] void* __aligned_alloc(Allocator const& alloc,
123123
std::size_t alignment, std::size_t size) noexcept
124124
{
@@ -146,14 +146,14 @@ namespace hpx::util::detail {
146146
return aligned_mem;
147147
}
148148

149-
HPX_CXX_EXPORT template <typename T>
149+
template <typename T>
150150
[[nodiscard]] void* __aligned_alloc(std::allocator<T> const&,
151151
std::size_t alignment, std::size_t size) noexcept
152152
{
153153
return __aligned_alloc(alignment, size);
154154
}
155155

156-
HPX_CXX_EXPORT template <typename Allocator>
156+
template <typename Allocator>
157157
void __aligned_free(
158158
Allocator const& alloc, void* p, std::size_t size) noexcept
159159
{
@@ -167,7 +167,7 @@ namespace hpx::util::detail {
167167
}
168168
}
169169

170-
HPX_CXX_EXPORT template <typename T>
170+
template <typename T>
171171
inline void __aligned_free(
172172
std::allocator<T> const&, void* p, std::size_t size) noexcept
173173
{

‎libs/core/datastructures/include/hpx/datastructures/any.hpp‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,11 @@ namespace hpx {
8181
namespace hpx::util::detail::any {
8282

8383
////////////////////////////////////////////////////////////////////////
84-
HPX_CXX_EXPORT template <typename T>
84+
template <typename T>
8585
struct get_table;
8686

8787
// function pointer table
88-
HPX_CXX_EXPORT template <typename IArch, typename OArch, typename Char,
89-
typename Copyable>
88+
template <typename IArch, typename OArch, typename Char, typename Copyable>
9089
struct fxn_ptr_table;
9190

9291
template <>
@@ -130,7 +129,7 @@ namespace hpx::util::detail::any {
130129
};
131130

132131
////////////////////////////////////////////////////////////////////////
133-
HPX_CXX_EXPORT template <typename Char, typename Copyable>
132+
template <typename Char, typename Copyable>
134133
struct fxn_ptr_table<void, void, Char, Copyable>
135134
: fxn_ptr_table<void, void, void, Copyable>
136135
{
@@ -152,32 +151,32 @@ namespace hpx::util::detail::any {
152151
};
153152

154153
////////////////////////////////////////////////////////////////////////
155-
HPX_CXX_EXPORT template <typename T, typename Small, typename Char,
154+
template <typename T, typename Small, typename Char,
156155
typename Enable = typename traits::supports_streaming_with_any<T>::type>
157156
struct streaming_base;
158157

159158
// no streaming support
160-
HPX_CXX_EXPORT template <typename T>
159+
template <typename T>
161160
struct streaming_base<T, std::true_type, void, std::true_type>
162161
{
163162
};
164163

165-
HPX_CXX_EXPORT template <typename T>
164+
template <typename T>
166165
struct streaming_base<T, std::true_type, void, std::false_type>
167166
{
168167
};
169-
HPX_CXX_EXPORT template <typename T>
168+
template <typename T>
170169
struct streaming_base<T, std::false_type, void, std::true_type>
171170
{
172171
};
173172

174-
HPX_CXX_EXPORT template <typename T>
173+
template <typename T>
175174
struct streaming_base<T, std::false_type, void, std::false_type>
176175
{
177176
};
178177

179178
// streaming support is enabled
180-
HPX_CXX_EXPORT template <typename T, typename Char>
179+
template <typename T, typename Char>
181180
struct streaming_base<T, std::true_type, Char, std::true_type>
182181
{
183182
template <typename Char_>
@@ -197,7 +196,7 @@ namespace hpx::util::detail::any {
197196
}
198197
};
199198

200-
HPX_CXX_EXPORT template <typename T, typename Char>
199+
template <typename T, typename Char>
201200
struct streaming_base<T, std::false_type, Char, std::true_type>
202201
{
203202
template <typename Char_>
@@ -217,7 +216,7 @@ namespace hpx::util::detail::any {
217216
}
218217
};
219218

220-
HPX_CXX_EXPORT template <typename T, typename Small, typename Char>
219+
template <typename T, typename Small, typename Char>
221220
struct streaming_base<T, Small, Char, std::false_type>
222221
{
223222
template <typename Char_>
@@ -237,7 +236,7 @@ namespace hpx::util::detail::any {
237236

238237
////////////////////////////////////////////////////////////////////////
239238
// static functions for small value-types
240-
HPX_CXX_EXPORT template <typename Small, typename Copyable>
239+
template <typename Small, typename Copyable>
241240
struct fxns;
242241

243242
template <>
@@ -454,11 +453,11 @@ namespace hpx::util::detail::any {
454453
};
455454

456455
////////////////////////////////////////////////////////////////////////
457-
HPX_CXX_EXPORT template <typename IArch, typename OArch, typename Vtable,
458-
typename Char, typename Copyable>
456+
template <typename IArch, typename OArch, typename Vtable, typename Char,
457+
typename Copyable>
459458
struct fxn_ptr;
460459

461-
HPX_CXX_EXPORT template <typename Vtable>
460+
template <typename Vtable>
462461
struct fxn_ptr<void, void, Vtable, void, std::true_type>
463462
: fxn_ptr_table<void, void, void, std::true_type>
464463
{
@@ -481,7 +480,7 @@ namespace hpx::util::detail::any {
481480
}
482481
};
483482

484-
HPX_CXX_EXPORT template <typename Vtable, typename Char>
483+
template <typename Vtable, typename Char>
485484
struct fxn_ptr<void, void, Vtable, Char, std::true_type>
486485
: fxn_ptr_table<void, void, Char, std::true_type>
487486
{
@@ -506,7 +505,7 @@ namespace hpx::util::detail::any {
506505
}
507506
};
508507

509-
HPX_CXX_EXPORT template <typename Vtable>
508+
template <typename Vtable>
510509
struct fxn_ptr<void, void, Vtable, void, std::false_type>
511510
: fxn_ptr_table<void, void, void, std::false_type>
512511
{
@@ -527,7 +526,7 @@ namespace hpx::util::detail::any {
527526
}
528527
};
529528

530-
HPX_CXX_EXPORT template <typename Vtable, typename Char>
529+
template <typename Vtable, typename Char>
531530
struct fxn_ptr<void, void, Vtable, Char, std::false_type>
532531
: fxn_ptr_table<void, void, Char, std::false_type>
533532
{
@@ -551,7 +550,7 @@ namespace hpx::util::detail::any {
551550
};
552551

553552
////////////////////////////////////////////////////////////////////////
554-
HPX_CXX_EXPORT template <typename Vtable, typename T>
553+
template <typename Vtable, typename T>
555554
struct any_vtable
556555
{
557556
static_assert(
@@ -569,7 +568,7 @@ namespace hpx::util::detail::any {
569568
}
570569
};
571570

572-
HPX_CXX_EXPORT template <typename T>
571+
template <typename T>
573572
struct get_table
574573
{
575574
using is_small =
@@ -592,7 +591,7 @@ namespace hpx::util::detail::any {
592591
};
593592

594593
////////////////////////////////////////////////////////////////////////
595-
HPX_CXX_EXPORT struct empty
594+
struct empty
596595
{
597596
[[nodiscard]] constexpr bool operator==(empty) const noexcept
598597
{
@@ -604,7 +603,7 @@ namespace hpx::util::detail::any {
604603
}
605604
};
606605

607-
HPX_CXX_EXPORT template <typename Char>
606+
template <typename Char>
608607
std::basic_istream<Char>& operator>>(std::basic_istream<Char>& i, empty&)
609608
{
610609
// If this assertion fires you tried to insert from a std istream
@@ -621,15 +620,15 @@ namespace hpx::util::detail::any {
621620
return i;
622621
}
623622

624-
HPX_CXX_EXPORT template <typename Char>
623+
template <typename Char>
625624
std::basic_ostream<Char>& operator<<(std::basic_ostream<Char>& o, empty)
626625
{
627626
return o;
628627
}
629628

630629
// helper types allowing to access internal data of basic_any
631-
HPX_CXX_EXPORT struct stream_support;
632-
HPX_CXX_EXPORT struct any_cast_support;
630+
struct stream_support;
631+
struct any_cast_support;
633632
} // namespace hpx::util::detail::any
634633

635634
namespace hpx::util {

‎libs/core/datastructures/include/hpx/datastructures/member_pack.hpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace hpx::util {
2020
#if defined(HPX_HAVE_MSVC_NO_UNIQUE_ADDRESS_ATTRIBUTE) || \
2121
defined(HPX_HAVE_CXX20_NO_UNIQUE_ADDRESS_ATTRIBUTE)
2222

23-
HPX_CXX_EXPORT template <std::size_t I, typename T>
23+
template <std::size_t I, typename T>
2424
struct member_leaf
2525
{
2626
HPX_NO_UNIQUE_ADDRESS T member;
@@ -34,22 +34,22 @@ namespace hpx::util {
3434
}
3535
};
3636

37-
HPX_CXX_EXPORT template <std::size_t I, typename T>
37+
template <std::size_t I, typename T>
3838
T member_type(member_leaf<I, T> const& /*leaf*/) noexcept;
3939

40-
HPX_CXX_EXPORT template <std::size_t I, typename T>
40+
template <std::size_t I, typename T>
4141
constexpr T& member_get(member_leaf<I, T>& leaf) noexcept
4242
{
4343
return leaf.member;
4444
}
4545

46-
HPX_CXX_EXPORT template <std::size_t I, typename T>
46+
template <std::size_t I, typename T>
4747
constexpr T const& member_get(member_leaf<I, T> const& leaf) noexcept
4848
{
4949
return leaf.member;
5050
}
5151
#else
52-
HPX_CXX_EXPORT template <std::size_t I, typename T,
52+
template <std::size_t I, typename T,
5353
bool Empty = std::is_empty_v<T> && !std::is_final_v<T>>
5454
struct member_leaf
5555
{
@@ -64,7 +64,7 @@ namespace hpx::util {
6464
}
6565
};
6666

67-
HPX_CXX_EXPORT template <std::size_t I, typename T>
67+
template <std::size_t I, typename T>
6868
struct member_leaf<I, T, /*Empty*/ true> : T
6969
{
7070
member_leaf() = default;
@@ -76,29 +76,29 @@ namespace hpx::util {
7676
}
7777
};
7878

79-
HPX_CXX_EXPORT template <std::size_t I, typename T>
79+
template <std::size_t I, typename T>
8080
T member_type(member_leaf<I, T> const& /*leaf*/) noexcept;
8181

82-
HPX_CXX_EXPORT template <std::size_t I, typename T>
82+
template <std::size_t I, typename T>
8383
constexpr T& member_get(member_leaf<I, T, false>& leaf) noexcept
8484
{
8585
return leaf.member;
8686
}
8787

88-
HPX_CXX_EXPORT template <std::size_t I, typename T>
88+
template <std::size_t I, typename T>
8989
constexpr T& member_get(member_leaf<I, T, true>& leaf) noexcept
9090
{
9191
return leaf;
9292
}
9393

94-
HPX_CXX_EXPORT template <std::size_t I, typename T>
94+
template <std::size_t I, typename T>
9595
constexpr T const& member_get(
9696
member_leaf<I, T, false> const& leaf) noexcept
9797
{
9898
return leaf.member;
9999
}
100100

101-
HPX_CXX_EXPORT template <std::size_t I, typename T>
101+
template <std::size_t I, typename T>
102102
constexpr T const& member_get(
103103
member_leaf<I, T, true> const& leaf) noexcept
104104
{

0 commit comments

Comments
 (0)