Commit 1614227
committed
[onert] Fix compilation on Ubuntu 25.10 with GCC 15.2.0
Trying to compile generated tests on Ubuntu 25.10 results in a
compilation error due to name clash between test case namespace
and function from the standard library:
> In file included from ../../../../runtime/tests/nnapi/src/generated/all_generated_V1_2_cts_tests.cpp:182:
> ../../../../runtime/tests/nnapi/src/generated/tests/rsqrt.mod.py.cpp:5:11: error: ‘namespace rsqrt { }’ redeclared as different kind of entity
> 5 | namespace rsqrt {
> | ^~~~~
> In file included from /usr/include/features.h:523,
> from /usr/include/x86_64-linux-gnu/c++/15/bits/os_defines.h:39,
> from /usr/include/x86_64-linux-gnu/c++/15/bits/c++config.h:727,
> from /usr/include/c++/15/cstddef:51,
> from ../../../../runtime/externals/GTEST-1.15.2/googletest/include/gtest/gtest.h:52,
> from ../../../../runtime/tests/nnapi/src/generated/tests/../../TestGenerated.h:21,
> from ../../../../runtime/tests/nnapi/src/generated/tests/abs_1D_float_nnfw.mod.py.cpp:3,
> from ../../../../runtime/tests/nnapi/src/generated/all_generated_V1_2_cts_tests.cpp:4:
> /usr/include/x86_64-linux-gnu/bits/mathcalls.h:206:1: note: previous declaration ‘double rsqrt(double)’
ONE-DCO-1.0-Signed-off-by: Arkadiusz Bokowy <a.bokowy@samsung.com>1 parent cdd7cb6 commit 1614227
File tree
3 files changed
+39
-32
lines changed- runtime/tests/nnapi
- nnapi_test_generator/android-10
- specs
3 files changed
+39
-32
lines changedLines changed: 11 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
102 | | - | |
103 | | - | |
| 102 | + | |
| 103 | + | |
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | | - | |
| 108 | + | |
| 109 | + | |
109 | 110 | | |
110 | 111 | | |
111 | 112 | | |
| |||
272 | 273 | | |
273 | 274 | | |
274 | 275 | | |
275 | | - | |
276 | | - | |
277 | | - | |
278 | | - | |
279 | | - | |
280 | | - | |
281 | | - | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
282 | 283 | | |
283 | 284 | | |
284 | 285 | | |
| |||
Lines changed: 11 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
| |||
271 | 272 | | |
272 | 273 | | |
273 | 274 | | |
274 | | - | |
275 | | - | |
276 | | - | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
277 | 279 | | |
278 | 280 | | |
279 | | - | |
280 | | - | |
| 281 | + | |
| 282 | + | |
281 | 283 | | |
282 | | - | |
| 284 | + | |
| 285 | + | |
283 | 286 | | |
284 | 287 | | |
285 | 288 | | |
| |||
300 | 303 | | |
301 | 304 | | |
302 | 305 | | |
303 | | - | |
| 306 | + | |
304 | 307 | | |
305 | 308 | | |
306 | 309 | | |
307 | 310 | | |
308 | | - | |
| 311 | + | |
309 | 312 | | |
310 | 313 | | |
311 | 314 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
1 | 3 | | |
2 | 4 | | |
| 5 | + | |
3 | 6 | | |
4 | 7 | | |
5 | 8 | | |
| |||
29 | 32 | | |
30 | 33 | | |
31 | 34 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
46 | 49 | | |
47 | 50 | | |
48 | 51 | | |
| |||
0 commit comments