From 6a8930cef0b288a120b68cbee8a94d89927718b4 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 5 May 2018 22:33:55 +0000
Subject: [PATCH] Remove unnecessary inclusions of compiler-static_assert.h

Various files included compiler-static_assert.h to use the compatibility
macros for compilers that lacked a working C++11 static_assert.
However, some source files used static_assert without this inclusion,
and no one ever reported problems.  From this, assume that no one uses a
compiler which lacks C++11 static_assert.  Remove the inclusions that
were only for the compatibility macro.  Keep the inclusions that use the
assert_equal helper.
---
 common/include/physfsx.h   | 1 -
 common/include/valptridx.h | 1 -
 common/main/player.h       | 1 -
 similar/main/collide.cpp   | 1 -
 similar/main/net_udp.cpp   | 1 -
 similar/main/piggy.cpp     | 1 -
 6 files changed, 6 deletions(-)

diff --git a/common/include/physfsx.h b/common/include/physfsx.h
index 945eb1389..9ac515053 100644
--- a/common/include/physfsx.h
+++ b/common/include/physfsx.h
@@ -41,7 +41,6 @@
 #include "ntstring.h"
 #include "compiler-array.h"
 #include "compiler-make_unique.h"
-#include "compiler-static_assert.h"
 #include "partial_range.h"
 
 #ifdef DXX_CONSTANT_TRUE
diff --git a/common/include/valptridx.h b/common/include/valptridx.h
index 5b4d42106..dd17a788a 100644
--- a/common/include/valptridx.h
+++ b/common/include/valptridx.h
@@ -11,7 +11,6 @@
 #include <type_traits>
 #include "fwd-valptridx.h"
 #include "compiler-array.h"
-#include "compiler-static_assert.h"
 #include "pack.h"
 #include "compiler-poison.h"
 
diff --git a/common/main/player.h b/common/main/player.h
index c008d845b..4148efb3f 100644
--- a/common/main/player.h
+++ b/common/main/player.h
@@ -36,7 +36,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "pack.h"
 #include "dxxsconf.h"
 #include "compiler-array.h"
-#include "compiler-static_assert.h"
 #include "objnum.h"
 #include "player-callsign.h"
 
diff --git a/similar/main/collide.cpp b/similar/main/collide.cpp
index e32f5dee3..c2d03c17d 100644
--- a/similar/main/collide.cpp
+++ b/similar/main/collide.cpp
@@ -86,7 +86,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "dxxsconf.h"
 #include "dsx-ns.h"
 #include "compiler-integer_sequence.h"
-#include "compiler-static_assert.h"
 
 using std::min;
 
diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp
index 9009ce245..a851c497a 100644
--- a/similar/main/net_udp.cpp
+++ b/similar/main/net_udp.cpp
@@ -66,7 +66,6 @@
 #include "compiler-exchange.h"
 #include "compiler-range_for.h"
 #include "compiler-lengthof.h"
-#include "compiler-static_assert.h"
 #include "partial_range.h"
 
 #if defined(DXX_BUILD_DESCENT_I)
diff --git a/similar/main/piggy.cpp b/similar/main/piggy.cpp
index bcb937c48..0a7418a74 100644
--- a/similar/main/piggy.cpp
+++ b/similar/main/piggy.cpp
@@ -58,7 +58,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "console.h"
 #include "compiler-range_for.h"
 #include "compiler-make_unique.h"
-#include "compiler-static_assert.h"
 #include "partial_range.h"
 
 #if defined(DXX_BUILD_DESCENT_I)