From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 7 Feb 2022 19:31:02 +0000 (+0100)
Subject: chore: Remove obsolete GCC 4.8 workarounds
X-Git-Tag: v4.6~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef78c381db63024be035cb7e33b5aa0834c974b7;p=thirdparty%2Fccache.git

chore: Remove obsolete GCC 4.8 workarounds
---

diff --git a/cmake/DevModeWarnings.cmake b/cmake/DevModeWarnings.cmake
index ee464763c..acc32b798 100644
--- a/cmake/DevModeWarnings.cmake
+++ b/cmake/DevModeWarnings.cmake
@@ -97,15 +97,6 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     # -Wduplicated-branches
     # -Wuseless-cast
   )
-
-  # TODO: Exact version or reason unknown, discovered in Ubuntu 14 Docker test
-  # with GCC 4.8.4
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8.5)
-    add_compile_flag_if_supported(
-      CCACHE_COMPILER_WARNINGS "-Wno-missing-field-initializers")
-    add_compile_flag_if_supported(
-      CCACHE_COMPILER_WARNINGS "-Wno-unused-variable")
-  endif()
 elseif(MSVC)
   # Remove any warning level flags added by CMake.
   string(REGEX REPLACE "/W[0-4]" "" CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}")
diff --git a/src/TemporaryFile.hpp b/src/TemporaryFile.hpp
index 624d5937d..032cbfa8d 100644
--- a/src/TemporaryFile.hpp
+++ b/src/TemporaryFile.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2021 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2022 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -36,9 +36,7 @@ public:
 
   TemporaryFile(TemporaryFile&& other) noexcept = default;
 
-  // Note: Should be declared noexcept, but since GCC 4.8 trips on it, don't do
-  // that for now.
-  TemporaryFile& operator=(TemporaryFile&& other) = default;
+  TemporaryFile& operator=(TemporaryFile&& other) noexcept = default;
 
   // The resulting open file descriptor in read/write mode. Unset on error.
   Fd fd;