Revert "Revert "Fix build failures in Ubuntu 21.10 (#22952)""

This reverts commit 5e2570d.
commaai · Nov 17, 2021 · f2a8130 · f2a8130
1 parent 36ca9d2
commit f2a8130
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/SConstruct b/SConstruct
@@ -189,6 +189,7 @@ env = Environment(
     "-Wno-inconsistent-missing-override",
     "-Wno-c99-designator",
     "-Wno-reorder-init-list",
+    "-Wno-error=unused-but-set-variable",
   ] + cflags + ccflags,
 
   CPPPATH=cpppath + [

diff --git a/selfdrive/ui/navd/route_engine.h b/selfdrive/ui/navd/route_engine.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <optional>
+
 #include <QThread>
 #include <QGeoCoordinate>
 #include <QGeoManeuver>

diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h
@@ -3,6 +3,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <optional>
 
 #include <QObject>
 #include <QTimer>