From ab050e31f01702d9c59e1636168c5f13d041a5e9 Mon Sep 17 00:00:00 2001
From: admercs <adam.michael.erickson@gmail.com>
Date: Thu, 25 Apr 2024 17:03:11 -0700
Subject: [PATCH] mowing down bugs like I'm mowing the lawn

---
 .../include/common/AutonomySimSettings.hpp        | 15 ++++++++-------
 README.md                                         |  2 +-
 scripts/build_gcc.sh                              |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/AutonomyLib/include/common/AutonomySimSettings.hpp b/AutonomyLib/include/common/AutonomySimSettings.hpp
index f10b4c9f..d6e696e4 100644
--- a/AutonomyLib/include/common/AutonomySimSettings.hpp
+++ b/AutonomyLib/include/common/AutonomySimSettings.hpp
@@ -21,6 +21,14 @@ namespace autonomylib {
 
 struct AutonomySimSettings {
 
+  private:
+    typedef common_utils::Utils Utils;
+    typedef ImageCaptureBase::ImageType ImageType;
+
+    // fields
+    float settings_version_actual;
+    float settings_version_minimum = 1.2f;
+
   public:
     // types
     static constexpr int kSubwindowCount = 3; // must be >= 3 for now
@@ -452,13 +460,6 @@ struct AutonomySimSettings {
     }
 
   private:
-    typedef common_utils::Utils Utils;
-    typedef ImageCaptureBase::ImageType ImageType;
-
-    // fields
-    float settings_version_actual;
-    float settings_version_minimum = 1.2f;
-
     void checkSettingsVersion(const Settings &settings_json) {
         bool has_default_settings = hasDefaultSettings(settings_json, settings_version_actual);
         bool upgrade_required = settings_version_actual < settings_version_minimum;
diff --git a/README.md b/README.md
index 1b98d5fe..b5f3d376 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@
 
 ### AutonomySim
 
-- `Build systems`: updated to C++20 standard, `CMake` 3.29.2, `Clang` 17, `GCC` 13, `Python` 3.12
+- `Build systems`: updated to `C++20` standard, `CMake` 3.29.2, `Clang` 17, `GCC` 13, `Python` 3.12
 - The `autonomysim` Python package has undergone a complete overhaul! `AutonomyLib` is next.
 - `Windows`: we now provide separate Batch/Command and PowerShell build systems. Both are tested in CI/CD.
 - `Documentation`: a new system has been rolled out that also generates Python and C++ API docs.
diff --git a/scripts/build_gcc.sh b/scripts/build_gcc.sh
index beb73855..161d1d69 100644
--- a/scripts/build_gcc.sh
+++ b/scripts/build_gcc.sh
@@ -50,7 +50,7 @@ gpg --recv-keys 6C35B99309B5FA62
 gpg --verify "gcc-${GCC_VERSION}.tar.gz.sig"
 
 echo 'Unpacking GCC tarball...'
-tar -xzf "gcc-${GCC_VERSION}.tar.gz"
+tar -xzvf "gcc-${GCC_VERSION}.tar.gz"
 
 echo 'Downloading prerequisites...'
 pushd "gcc-${GCC_VERSION}"