Skip to content

Commit b92951e

Browse files
authored
Merge pull request #2682 from heshpdx/master
Fixes for gcc-15 build
2 parents 0cc966d + e24d31a commit b92951e

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

libs/librrgraph/src/base/rr_graph_storage.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
#include "vtr_memory.h"
1616
#include "vtr_strong_id_range.h"
1717
#include "vtr_array_view.h"
18-
#include<iostream>
18+
#include <iostream>
1919
#include <optional>
20+
#include <cstdint>
2021

2122
/* Main structure describing one routing resource node. Everything in *
2223
* this structure should describe the graph -- information needed only *

libs/librrgraph/src/base/rr_node_types.h

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <vector>
88
#include <array>
99
#include <map>
10+
#include <cstdint>
1011
#include "vtr_range.h"
1112
#include "vtr_ndmatrix.h"
1213

libs/libvtrutil/src/vtr_ragged_matrix.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,11 @@ class FlatRaggedMatrix {
238238
return !(*this == other);
239239
}
240240

241-
int operator-(const RowLengthIterator& other) {
241+
difference_type operator-(const RowLengthIterator& other) {
242242
return irow_ - other.irow_;
243243
}
244244

245-
size_t operator*() {
245+
value_type operator*() {
246246
//Call the callback to get the row length
247247
return callback_(Index0(irow_));
248248
}

libs/libvtrutil/src/vtr_string_interning.h

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include <unordered_map>
4949
#include <stdexcept>
5050
#include <climits>
51+
#include <cstdint>
5152
#include <algorithm>
5253
#include <array>
5354

0 commit comments

Comments
 (0)