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
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
From f566ae0b4818e4f656711980c81cef45245f8e67 Mon Sep 17 00:00:00 2001
From: aqua <aqua@iserlohn-fortress.net>
Date: Sun, 7 May 2023 09:37:40 +0300
Subject: [PATCH] Fix build with gcc13
---
CMakeLists.txt | 6 ++----
src/hash_utils.h | 1 +
src/om_direction.h | 3 ++-
src/units_mass.h | 1 +
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfc1533d737..88783ece7a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,7 +219,7 @@ IF(MSVC)
endif()
ELSE()
SET(CATA_WARNINGS
- "-Werror -Wall -Wextra \
+ "-Wall -Wextra \
-Wformat-signedness \
-Wlogical-op \
-Wmissing-declarations \
@@ -230,9 +230,7 @@ ELSE()
-Wpedantic \
-Wsuggest-override \
-Wunused-macros \
- -Wzero-as-null-pointer-constant \
- -Wno-unknown-warning-option \
- -Wno-range-loop-analysis")
+ -Wzero-as-null-pointer-constant")
IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows)
SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls")
ENDIF()
diff --git a/src/hash_utils.h b/src/hash_utils.h
index 28241d1570a..1fa418ff518 100644
--- a/src/hash_utils.h
+++ b/src/hash_utils.h
@@ -2,6 +2,7 @@
#ifndef CATA_SRC_HASH_UTILS_H
#define CATA_SRC_HASH_UTILS_H
+#include <cstdint>
#include <functional>
// Support for hashing standard types.
diff --git a/src/om_direction.h b/src/om_direction.h
index 04c4d41d5c5..58c05da6894 100644
--- a/src/om_direction.h
+++ b/src/om_direction.h
@@ -2,8 +2,9 @@
#ifndef CATA_SRC_OM_DIRECTION_H
#define CATA_SRC_OM_DIRECTION_H
-#include <climits>
#include <array>
+#include <climits>
+#include <cstdint>
#include <string>
struct point;
diff --git a/src/units_mass.h b/src/units_mass.h
index abf7ee91d0c..2fe1880ba96 100644
--- a/src/units_mass.h
+++ b/src/units_mass.h
@@ -3,6 +3,7 @@
#define CATA_SRC_UNITS_MASS_H
#include <algorithm>
+#include <cstdint>
#include "units_def.h"
--
2.40.1
|
