Merge branch 'main' into ouruin

WolfireGames · Mar 12, 2024 · 5eb22fa · 5eb22fa
2 parents f5d9e16 + a2555e0
commit 5eb22fa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     container: 'registry.fedoraproject.org/fedora:latest'
     env:
-      SONAR_SCANNER_VERSION: 4.7.0.2747
+      SONAR_SCANNER_VERSION: 5.0.1.3006
       SONAR_SERVER_URL: "https://sonarcloud.io"
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
     steps:
@@ -22,7 +22,7 @@ jobs:
           key: ${{ runner.os }}-dnfcache
       - name: Install pre-requisites
         run: dnf --assumeyes --setopt=install_weak_deps=False install
-              gcc-c++ cmake make /usr/bin/git java-11-openjdk-headless curl unzip
+              gcc-c++ cmake make /usr/bin/git java-17-openjdk-headless curl unzip
               'pkgconfig(gl)' 'pkgconfig(glu)'
               'pkgconfig(sdl2)' 'pkgconfig(SDL2_net)'
               'pkgconfig(gtk+-2.0)' 'pkgconfig(ogg)' 'pkgconfig(vorbis)'

diff --git a/Source/Internal/stopwatch.h b/Source/Internal/stopwatch.h
@@ -22,6 +22,7 @@
 //-----------------------------------------------------------------------------
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 void BusyWaitMilliseconds(uint32_t how_many);

diff --git a/Source/Network/asnetwork.h b/Source/Network/asnetwork.h
@@ -27,6 +27,8 @@
 #include <SDL_net.h>
 
 #include <map>
+#include <string>
+#include <vector>
 
 #define SOCKET_ID_INVALID 0xFFFFFFFF
 

diff --git a/Source/Utility/waveform_obj_serializer.h b/Source/Utility/waveform_obj_serializer.h
@@ -23,6 +23,7 @@
 //-----------------------------------------------------------------------------
 #pragma once
 
+#include <cstdint>
 #include <string>
 #include <vector>