1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
From: =?utf-8?q?Andr=C3=A9_Offringa?= <offringa@gmail.com>
Date: Sun, 17 Aug 2025 22:15:17 +0200
Subject: Fix FTBFS with gcc-15
Closes: #1110674
---
external/schaapcommon/external/ducc0/infra/mav.h | 5 ++---
external/schaapcommon/include/schaapcommon/reordering/reordering.h | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/external/schaapcommon/external/ducc0/infra/mav.h b/external/schaapcommon/external/ducc0/infra/mav.h
index 05976f9..d66606d 100644
--- a/external/schaapcommon/external/ducc0/infra/mav.h
+++ b/external/schaapcommon/external/ducc0/infra/mav.h
@@ -627,7 +627,7 @@ template<typename T> class vfmav: public cfmav<T>
: cfmav<T>(info, d_, buf) {}
public:
- using tbuf::raw, tbuf::data, tinfo::ndim;
+ using tinfo::ndim;
vfmav() {}
vfmav(T *d_, const fmav_info &info)
: cfmav<T>(d_, info) {}
@@ -835,7 +835,6 @@ template<typename T, size_t ndim> class vmav: public cmav<T, ndim>
public:
using typename tinfo::shape_t;
using typename tinfo::stride_t;
- using tbuf::raw, tbuf::data;
using tinfo::contiguous, tinfo::size, tinfo::idx, tinfo::conformable;
protected:
@@ -874,7 +873,7 @@ template<typename T, size_t ndim> class vmav: public cmav<T, ndim>
using cmav<T, ndim>::to_fmav;
vfmav<T> to_fmav() const { return operator vfmav<T>(); }
- using parent::operator();
+ //using parent::operator();
template<typename... Ns> T &operator()(Ns... ns) const
{ return const_cast<T &>(parent::operator()(ns...)); }
diff --git a/external/schaapcommon/include/schaapcommon/reordering/reordering.h b/external/schaapcommon/include/schaapcommon/reordering/reordering.h
index d72e2ca..6b97e57 100644
--- a/external/schaapcommon/include/schaapcommon/reordering/reordering.h
+++ b/external/schaapcommon/include/schaapcommon/reordering/reordering.h
@@ -4,6 +4,7 @@
#ifndef SCHAAPCOMMON_REORDERING_H_
#define SCHAAPCOMMON_REORDERING_H_
+#include <cstdint>
#include <string>
#include <map>
#include <vector>
|
