Skip to content

Commit 914f8cd

Browse files
isaevilisaevil
authored
Mark functions and variables as inline to avoid "TU-local entity exposure" issue (#1960)
Signed-off-by: Isaev, Ilya <ilya.isaev@intel.com>
1 parent 662602c commit 914f8cd

16 files changed

+104
-97
lines changed

‎include/oneapi/tbb/collaborative_call_once.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
Copyright (c) 2021-2024 Intel Corporation
3+
Copyright (c) 2026 UXL Foundation Contributors
34
45
Licensed under the Apache License, Version 2.0 (the "License");
56
you may not use this file except in compliance with the License.
@@ -53,8 +54,8 @@ class collaborative_call_stack_task : public task {
5354
collaborative_call_stack_task(const F& f, wait_context& wctx) : m_func(f), m_wait_ctx(wctx) {}
5455
};
5556

56-
constexpr std::uintptr_t collaborative_once_max_references = max_nfs_size;
57-
constexpr std::uintptr_t collaborative_once_references_mask = collaborative_once_max_references-1;
57+
__TBB_GLOBAL_VAR constexpr std::uintptr_t collaborative_once_max_references = max_nfs_size;
58+
__TBB_GLOBAL_VAR constexpr std::uintptr_t collaborative_once_references_mask = collaborative_once_max_references-1;
5859

5960
class alignas(max_nfs_size) collaborative_once_runner : no_copy {
6061

‎include/oneapi/tbb/concurrent_hash_map.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Copyright (c) 2005-2025 Intel Corporation
3-
Copyright (c) 2025 UXL Foundation Contributors
3+
Copyright (c) 2025-2026 UXL Foundation Contributors
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -59,9 +59,9 @@ struct hash_map_node_base : no_copy {
5959
};
6060

6161
// Incompleteness flag value
62-
static void* const rehash_req_flag = reinterpret_cast<void*>(std::size_t(3));
62+
__TBB_GLOBAL_VAR void* const rehash_req_flag = reinterpret_cast<void*>(std::size_t(3));
6363
// Rehashed empty bucket flag
64-
static void* const empty_rehashed_flag = reinterpret_cast<void*>(std::size_t(0));
64+
__TBB_GLOBAL_VAR void* const empty_rehashed_flag = reinterpret_cast<void*>(std::size_t(0));
6565

6666
template <typename MutexType>
6767
bool rehash_required( hash_map_node_base<MutexType>* node_ptr ) {

‎include/oneapi/tbb/concurrent_queue.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
Copyright (c) 2005-2025 Intel Corporation
3+
Copyright (c) 2026 UXL Foundation Contributors
34
45
Licensed under the Apache License, Version 2.0 (the "License");
56
you may not use this file except in compliance with the License.
@@ -294,8 +295,8 @@ concurrent_queue( It, It, Alloc = Alloc() )
294295
class concurrent_monitor;
295296

296297
// The concurrent monitor tags for concurrent_bounded_queue.
297-
static constexpr std::size_t cbq_slots_avail_tag = 0;
298-
static constexpr std::size_t cbq_items_avail_tag = 1;
298+
__TBB_GLOBAL_VAR constexpr std::size_t cbq_slots_avail_tag = 0;
299+
__TBB_GLOBAL_VAR constexpr std::size_t cbq_items_avail_tag = 1;
299300
} // namespace d2
300301

301302

‎include/oneapi/tbb/concurrent_vector.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
Copyright (c) 2005-2024 Intel Corporation
3+
Copyright (c) 2026 UXL Foundation Contributors
34
45
Licensed under the Apache License, Version 2.0 (the "License");
56
you may not use this file except in compliance with the License.
@@ -221,7 +222,7 @@ bool operator<=( const vector_iterator<Vector, T>& i, const vector_iterator<Vect
221222
return !(j < i);
222223
}
223224

224-
static constexpr std::size_t embedded_table_num_segments = 3;
225+
__TBB_GLOBAL_VAR constexpr std::size_t embedded_table_num_segments = 3;
225226

226227
template <typename T, typename Allocator = tbb::cache_aligned_allocator<T>>
227228
class concurrent_vector

‎include/oneapi/tbb/detail/_config.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@
5555
#define __TBB_CPP17_PRESENT (__TBB_LANG >= 201703L)
5656
#define __TBB_CPP20_PRESENT (__TBB_LANG >= 202002L)
5757

58+
#if __TBB_CPP17_PRESENT
59+
#define __TBB_GLOBAL_VAR inline
60+
#else
61+
#define __TBB_GLOBAL_VAR static
62+
#endif
63+
5864
#if __INTEL_COMPILER || _MSC_VER
5965
#define __TBB_NOINLINE(decl) __declspec(noinline) decl
6066
#elif __GNUC__

‎include/oneapi/tbb/detail/_flow_graph_impl.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Copyright (c) 2005-2025 Intel Corporation
3-
Copyright (c) 2025 UXL Foundation Contributors
3+
Copyright (c) 2025-2026 UXL Foundation Contributors
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
1818
#ifndef __TBB_flow_graph_impl_H
1919
#define __TBB_flow_graph_impl_H
2020

21-
// #include "../config.h"
21+
#include "_config.h"
2222
#include "_task.h"
2323
#include "../task_group.h"
2424
#include "../task_arena.h"
@@ -34,9 +34,9 @@ namespace detail {
3434
namespace d2 {
3535

3636
class graph_task;
37-
static graph_task* const SUCCESSFULLY_ENQUEUED = (graph_task*)-1;
37+
__TBB_GLOBAL_VAR graph_task* const SUCCESSFULLY_ENQUEUED = (graph_task*)-1;
3838
typedef unsigned int node_priority_t;
39-
static const node_priority_t no_priority = node_priority_t(0);
39+
__TBB_GLOBAL_VAR constexpr node_priority_t no_priority = node_priority_t(0);
4040

4141
class graph;
4242
class graph_node;

‎include/oneapi/tbb/detail/_flow_graph_trace_impl.h‎

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
Copyright (c) 2005-2024 Intel Corporation
3+
Copyright (c) 2026 UXL Foundation Contributors
34
45
Licensed under the Apache License, Version 2.0 (the "License");
56
you may not use this file except in compliance with the License.
@@ -42,14 +43,14 @@ template< typename T > class receiver;
4243
#define CODEPTR() nullptr
4344
#endif /* __TBB_FLOW_TRACE_CODEPTR */
4445

45-
static inline void fgt_alias_port(void *node, void *p, bool visible) {
46+
inline void fgt_alias_port(void *node, void *p, bool visible) {
4647
if(visible)
4748
itt_relation_add( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p, FLOW_NODE );
4849
else
4950
itt_relation_add( d1::ITT_DOMAIN_FLOW, p, FLOW_NODE, __itt_relation_is_child_of, node, FLOW_NODE );
5051
}
5152

52-
static inline void fgt_composite ( void* codeptr, void *node, void *graph ) {
53+
inline void fgt_composite ( void* codeptr, void *node, void *graph ) {
5354
itt_make_task_group( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, graph, FLOW_GRAPH, FLOW_COMPOSITE_NODE );
5455
suppress_unused_warning( codeptr );
5556
#if __TBB_FLOW_TRACE_CODEPTR
@@ -59,12 +60,12 @@ static inline void fgt_composite ( void* codeptr, void *node, void *graph ) {
5960
#endif
6061
}
6162

62-
static inline void fgt_internal_alias_input_port( void *node, void *p, string_resource_index name_index ) {
63+
inline void fgt_internal_alias_input_port( void *node, void *p, string_resource_index name_index ) {
6364
itt_make_task_group( d1::ITT_DOMAIN_FLOW, p, FLOW_INPUT_PORT, node, FLOW_NODE, name_index );
6465
itt_relation_add( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p, FLOW_INPUT_PORT );
6566
}
6667

67-
static inline void fgt_internal_alias_output_port( void *node, void *p, string_resource_index name_index ) {
68+
inline void fgt_internal_alias_output_port( void *node, void *p, string_resource_index name_index ) {
6869
itt_make_task_group( d1::ITT_DOMAIN_FLOW, p, FLOW_OUTPUT_PORT, node, FLOW_NODE, name_index );
6970
itt_relation_add( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, __itt_relation_is_parent_of, p, FLOW_OUTPUT_PORT );
7071
}
@@ -108,11 +109,11 @@ struct fgt_internal_output_alias_helper<PortsTuple, 0> {
108109
}
109110
};
110111

111-
static inline void fgt_internal_create_input_port( void *node, void *p, string_resource_index name_index ) {
112+
inline void fgt_internal_create_input_port( void *node, void *p, string_resource_index name_index ) {
112113
itt_make_task_group( d1::ITT_DOMAIN_FLOW, p, FLOW_INPUT_PORT, node, FLOW_NODE, name_index );
113114
}
114115

115-
static inline void fgt_internal_create_output_port( void* codeptr, void *node, void *p, string_resource_index name_index ) {
116+
inline void fgt_internal_create_output_port( void* codeptr, void *node, void *p, string_resource_index name_index ) {
116117
itt_make_task_group(d1::ITT_DOMAIN_FLOW, p, FLOW_OUTPUT_PORT, node, FLOW_NODE, name_index);
117118
suppress_unused_warning( codeptr );
118119
#if __TBB_FLOW_TRACE_CODEPTR
@@ -177,43 +178,43 @@ void fgt_multiinput_multioutput_node_desc( const NodeType *node, const char *des
177178
}
178179

179180
template< typename NodeType >
180-
static inline void fgt_node_desc( const NodeType *node, const char *desc ) {
181+
inline void fgt_node_desc( const NodeType *node, const char *desc ) {
181182
void *addr = (void *)( static_cast< sender< typename NodeType::output_type > * >(const_cast< NodeType *>(node)) );
182183
itt_metadata_str_add( d1::ITT_DOMAIN_FLOW, addr, FLOW_NODE, FLOW_OBJECT_NAME, desc );
183184
}
184185

185-
static inline void fgt_graph_desc( const void *g, const char *desc ) {
186+
inline void fgt_graph_desc( const void *g, const char *desc ) {
186187
void *addr = const_cast< void *>(g);
187188
itt_metadata_str_add( d1::ITT_DOMAIN_FLOW, addr, FLOW_GRAPH, FLOW_OBJECT_NAME, desc );
188189
}
189190

190-
static inline void fgt_body( void *node, void *body ) {
191+
inline void fgt_body( void *node, void *body ) {
191192
itt_relation_add( d1::ITT_DOMAIN_FLOW, body, FLOW_BODY, __itt_relation_is_child_of, node, FLOW_NODE );
192193
}
193194

194195
template< int N, typename PortsTuple >
195-
static inline void fgt_multioutput_node(void* codeptr, string_resource_index t, void *g, void *input_port, PortsTuple &ports ) {
196+
inline void fgt_multioutput_node(void* codeptr, string_resource_index t, void *g, void *input_port, PortsTuple &ports ) {
196197
itt_make_task_group( d1::ITT_DOMAIN_FLOW, input_port, FLOW_NODE, g, FLOW_GRAPH, t );
197198
fgt_internal_create_input_port( input_port, input_port, FLOW_INPUT_PORT_0 );
198199
fgt_internal_output_helper<PortsTuple, N>::register_port(codeptr, input_port, ports );
199200
}
200201

201202
template< int N, typename PortsTuple >
202-
static inline void fgt_multioutput_node_with_body( void* codeptr, string_resource_index t, void *g, void *input_port, PortsTuple &ports, void *body ) {
203+
inline void fgt_multioutput_node_with_body( void* codeptr, string_resource_index t, void *g, void *input_port, PortsTuple &ports, void *body ) {
203204
itt_make_task_group( d1::ITT_DOMAIN_FLOW, input_port, FLOW_NODE, g, FLOW_GRAPH, t );
204205
fgt_internal_create_input_port( input_port, input_port, FLOW_INPUT_PORT_0 );
205206
fgt_internal_output_helper<PortsTuple, N>::register_port( codeptr, input_port, ports );
206207
fgt_body( input_port, body );
207208
}
208209

209210
template< int N, typename PortsTuple >
210-
static inline void fgt_multiinput_node( void* codeptr, string_resource_index t, void *g, PortsTuple &ports, void *output_port) {
211+
inline void fgt_multiinput_node( void* codeptr, string_resource_index t, void *g, PortsTuple &ports, void *output_port) {
211212
itt_make_task_group( d1::ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t );
212213
fgt_internal_create_output_port( codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0 );
213214
fgt_internal_input_helper<PortsTuple, N>::register_port( output_port, ports );
214215
}
215216

216-
static inline void fgt_multiinput_multioutput_node( void* codeptr, string_resource_index t, void *n, void *g ) {
217+
inline void fgt_multiinput_multioutput_node( void* codeptr, string_resource_index t, void *n, void *g ) {
217218
itt_make_task_group( d1::ITT_DOMAIN_FLOW, n, FLOW_NODE, g, FLOW_GRAPH, t );
218219
suppress_unused_warning( codeptr );
219220
#if __TBB_FLOW_TRACE_CODEPTR
@@ -223,124 +224,124 @@ static inline void fgt_multiinput_multioutput_node( void* codeptr, string_resour
223224
#endif
224225
}
225226

226-
static inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *output_port ) {
227+
inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *output_port ) {
227228
itt_make_task_group( d1::ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t );
228229
fgt_internal_create_output_port( codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0 );
229230
}
230231

231-
static void fgt_node_with_body( void* codeptr, string_resource_index t, void *g, void *output_port, void *body ) {
232+
inline void fgt_node_with_body( void* codeptr, string_resource_index t, void *g, void *output_port, void *body ) {
232233
itt_make_task_group( d1::ITT_DOMAIN_FLOW, output_port, FLOW_NODE, g, FLOW_GRAPH, t );
233234
fgt_internal_create_output_port(codeptr, output_port, output_port, FLOW_OUTPUT_PORT_0 );
234235
fgt_body( output_port, body );
235236
}
236237

237-
static inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *input_port, void *output_port ) {
238+
inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *input_port, void *output_port ) {
238239
fgt_node( codeptr, t, g, output_port );
239240
fgt_internal_create_input_port( output_port, input_port, FLOW_INPUT_PORT_0 );
240241
}
241242

242-
static inline void fgt_node_with_body( void* codeptr, string_resource_index t, void *g, void *input_port, void *output_port, void *body ) {
243+
inline void fgt_node_with_body( void* codeptr, string_resource_index t, void *g, void *input_port, void *output_port, void *body ) {
243244
fgt_node_with_body( codeptr, t, g, output_port, body );
244245
fgt_internal_create_input_port( output_port, input_port, FLOW_INPUT_PORT_0 );
245246
}
246247

247248

248-
static inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *input_port, void *decrement_port, void *output_port ) {
249+
inline void fgt_node( void* codeptr, string_resource_index t, void *g, void *input_port, void *decrement_port, void *output_port ) {
249250
fgt_node( codeptr, t, g, input_port, output_port );
250251
fgt_internal_create_input_port( output_port, decrement_port, FLOW_INPUT_PORT_1 );
251252
}
252253

253-
static inline void fgt_make_edge( void *output_port, void *input_port ) {
254+
inline void fgt_make_edge( void *output_port, void *input_port ) {
254255
itt_relation_add( d1::ITT_DOMAIN_FLOW, output_port, FLOW_OUTPUT_PORT, __itt_relation_is_predecessor_to, input_port, FLOW_INPUT_PORT);
255256
}
256257

257-
static inline void fgt_remove_edge( void *output_port, void *input_port ) {
258+
inline void fgt_remove_edge( void *output_port, void *input_port ) {
258259
itt_relation_add( d1::ITT_DOMAIN_FLOW, output_port, FLOW_OUTPUT_PORT, __itt_relation_is_sibling_of, input_port, FLOW_INPUT_PORT);
259260
}
260261

261-
static inline void fgt_graph( void *g ) {
262+
inline void fgt_graph( void *g ) {
262263
itt_make_task_group( d1::ITT_DOMAIN_FLOW, g, FLOW_GRAPH, nullptr, FLOW_NULL, FLOW_GRAPH );
263264
}
264265

265-
static inline void fgt_begin_body( void *body ) {
266+
inline void fgt_begin_body( void *body ) {
266267
itt_task_begin( d1::ITT_DOMAIN_FLOW, body, FLOW_BODY, nullptr, FLOW_NULL, FLOW_BODY );
267268
}
268269

269-
static inline void fgt_end_body( void * ) {
270+
inline void fgt_end_body( void * ) {
270271
itt_task_end( d1::ITT_DOMAIN_FLOW );
271272
}
272273

273-
static inline void fgt_async_try_put_begin( void *node, void *port ) {
274+
inline void fgt_async_try_put_begin( void *node, void *port ) {
274275
itt_task_begin( d1::ITT_DOMAIN_FLOW, port, FLOW_OUTPUT_PORT, node, FLOW_NODE, FLOW_OUTPUT_PORT );
275276
}
276277

277-
static inline void fgt_async_try_put_end( void *, void * ) {
278+
inline void fgt_async_try_put_end( void *, void * ) {
278279
itt_task_end( d1::ITT_DOMAIN_FLOW );
279280
}
280281

281-
static inline void fgt_async_reserve( void *node, void *graph ) {
282+
inline void fgt_async_reserve( void *node, void *graph ) {
282283
itt_region_begin( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE, graph, FLOW_GRAPH, FLOW_NULL );
283284
}
284285

285-
static inline void fgt_async_commit( void *node, void * /*graph*/) {
286+
inline void fgt_async_commit( void *node, void * /*graph*/) {
286287
itt_region_end( d1::ITT_DOMAIN_FLOW, node, FLOW_NODE );
287288
}
288289

289-
static inline void fgt_reserve_wait( void *graph ) {
290+
inline void fgt_reserve_wait( void *graph ) {
290291
itt_region_begin( d1::ITT_DOMAIN_FLOW, graph, FLOW_GRAPH, nullptr, FLOW_NULL, FLOW_NULL );
291292
}
292293

293-
static inline void fgt_release_wait( void *graph ) {
294+
inline void fgt_release_wait( void *graph ) {
294295
itt_region_end( d1::ITT_DOMAIN_FLOW, graph, FLOW_GRAPH );
295296
}
296297

297298
#else // TBB_USE_PROFILING_TOOLS
298299

299300
#define CODEPTR() nullptr
300301

301-
static inline void fgt_alias_port(void * /*node*/, void * /*p*/, bool /*visible*/ ) { }
302+
inline void fgt_alias_port(void * /*node*/, void * /*p*/, bool /*visible*/ ) { }
302303

303-
static inline void fgt_composite ( void* /*codeptr*/, void * /*node*/, void * /*graph*/ ) { }
304+
inline void fgt_composite ( void* /*codeptr*/, void * /*node*/, void * /*graph*/ ) { }
304305

305-
static inline void fgt_graph( void * /*g*/ ) { }
306+
inline void fgt_graph( void * /*g*/ ) { }
306307

307308
template< typename NodeType >
308-
static inline void fgt_multioutput_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
309+
inline void fgt_multioutput_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
309310

310311
template< typename NodeType >
311-
static inline void fgt_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
312+
inline void fgt_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }
312313

313-
static inline void fgt_graph_desc( const void * /*g*/, const char * /*desc*/ ) { }
314+
inline void fgt_graph_desc( const void * /*g*/, const char * /*desc*/ ) { }
314315

315316
template< int N, typename PortsTuple >
316-
static inline void fgt_multioutput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, PortsTuple & /*ports*/ ) { }
317+
inline void fgt_multioutput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, PortsTuple & /*ports*/ ) { }
317318

318319
template< int N, typename PortsTuple >
319-
static inline void fgt_multioutput_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, PortsTuple & /*ports*/, void * /*body*/ ) { }
320+
inline void fgt_multioutput_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, PortsTuple & /*ports*/, void * /*body*/ ) { }
320321

321322
template< int N, typename PortsTuple >
322-
static inline void fgt_multiinput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, PortsTuple & /*ports*/, void * /*output_port*/ ) { }
323+
inline void fgt_multiinput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, PortsTuple & /*ports*/, void * /*output_port*/ ) { }
323324

324-
static inline void fgt_multiinput_multioutput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*node*/, void * /*graph*/ ) { }
325+
inline void fgt_multiinput_multioutput_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*node*/, void * /*graph*/ ) { }
325326

326-
static inline void fgt_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*output_port*/ ) { }
327-
static inline void fgt_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*decrement_port*/, void * /*output_port*/ ) { }
327+
inline void fgt_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*output_port*/ ) { }
328+
inline void fgt_node( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*decrement_port*/, void * /*output_port*/ ) { }
328329

329-
static inline void fgt_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*output_port*/, void * /*body*/ ) { }
330-
static inline void fgt_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*output_port*/, void * /*body*/ ) { }
330+
inline void fgt_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*output_port*/, void * /*body*/ ) { }
331+
inline void fgt_node_with_body( void* /*codeptr*/, string_resource_index /*t*/, void * /*g*/, void * /*input_port*/, void * /*output_port*/, void * /*body*/ ) { }
331332

332-
static inline void fgt_make_edge( void * /*output_port*/, void * /*input_port*/ ) { }
333-
static inline void fgt_remove_edge( void * /*output_port*/, void * /*input_port*/ ) { }
333+
inline void fgt_make_edge( void * /*output_port*/, void * /*input_port*/ ) { }
334+
inline void fgt_remove_edge( void * /*output_port*/, void * /*input_port*/ ) { }
334335

335-
static inline void fgt_begin_body( void * /*body*/ ) { }
336-
static inline void fgt_end_body( void * /*body*/) { }
336+
inline void fgt_begin_body( void * /*body*/ ) { }
337+
inline void fgt_end_body( void * /*body*/) { }
337338

338-
static inline void fgt_async_try_put_begin( void * /*node*/, void * /*port*/ ) { }
339-
static inline void fgt_async_try_put_end( void * /*node*/ , void * /*port*/ ) { }
340-
static inline void fgt_async_reserve( void * /*node*/, void * /*graph*/ ) { }
341-
static inline void fgt_async_commit( void * /*node*/, void * /*graph*/ ) { }
342-
static inline void fgt_reserve_wait( void * /*graph*/ ) { }
343-
static inline void fgt_release_wait( void * /*graph*/ ) { }
339+
inline void fgt_async_try_put_begin( void * /*node*/, void * /*port*/ ) { }
340+
inline void fgt_async_try_put_end( void * /*node*/ , void * /*port*/ ) { }
341+
inline void fgt_async_reserve( void * /*node*/, void * /*graph*/ ) { }
342+
inline void fgt_async_commit( void * /*node*/, void * /*graph*/ ) { }
343+
inline void fgt_reserve_wait( void * /*graph*/ ) { }
344+
inline void fgt_release_wait( void * /*graph*/ ) { }
344345

345346
template< typename NodeType >
346347
void fgt_multiinput_multioutput_node_desc( const NodeType * /*node*/, const char * /*desc*/ ) { }

0 commit comments

Comments
 (0)