remove Pragma.h

DFHack · Sep 16, 2024 · bd74e01 · bd74e01
1 parent ee8ada4
commit bd74e01
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 57 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,16 +94,17 @@ if(MSVC)
     add_compile_options("/wd4267")
 
     # suppress C4251 - VC++ will warn when exporting an entire class which contains members
-    # referencing unexported compound types is unsafe. because we don't guarantee a stable API
-    # for our exports, we don't really care about this, so we choose to be lazy and continue to
-    # export entire classes instead of exporting on a method-by-method basis
+    # referencing unexported compound types as this is potentially unsafe. because we don't
+    # guarantee a stable ABI for exports, we don't really care about this, and so we choose to
+    # be lazy and continue to export entire classes instead of exporting on a method-by-method basis
     add_compile_options("/wd4251")
 
     # suppress C4068 - VC++ will warn for unknown pragmas by default. this is equivalent to gcc
-    # -Wno-unknown-pragmas. we could work around this with sufficiently complex macros
+    # -Wno-unknown-pragmas (which is enabled for gcc below).
+    # we could work around this with sufficiently complex macros
     add_compile_options("/wd4068")
 
-    # suppress C4244 - VC++ warns by default (with /Wall) about narrowing conversions that may lose data
+    # suppress C4244 - VC++ warns by default (with /W3) about narrowing conversions that may lose data
     # (such as double -> int or int32_t -> int16_t). dfhack has many of these, mostly related to Lua
     # this is equivalent to gcc -Wno_conversions which is the default as gcc -Wall doesn't enable -Wconversions
     add_compile_options("/wd4244")

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
@@ -69,12 +69,10 @@ set(MAIN_HEADERS
     include/Memory.h
     include/MiscUtils.h
     include/Module.h
-    include/Pragma.h
     include/MemAccess.h
     include/ModuleFactory.h
     include/PluginManager.h
     include/PluginStatics.h
-    include/Pragma.h
     include/RemoteClient.h
     include/RemoteServer.h
     include/RemoteTools.h

diff --git a/library/include/BitArray.h b/library/include/BitArray.h
@@ -23,7 +23,6 @@ distribution.
 */
 
 #pragma once
-#include "Pragma.h"
 #include "Export.h"
 #include "Error.h"
 #include <stdint.h>

diff --git a/library/include/ColorText.h b/library/include/ColorText.h
@@ -23,7 +23,6 @@ distribution.
 */
 
 #pragma once
-#include "Pragma.h"
 #include "Export.h"
 
 #include <list>

diff --git a/library/include/Console.h b/library/include/Console.h
@@ -23,7 +23,6 @@ distribution.
 */
 
 #pragma once
-#include "Pragma.h"
 #include "Export.h"
 #include "ColorText.h"
 #include <atomic>

diff --git a/library/include/Core.h b/library/include/Core.h
@@ -24,8 +24,6 @@ distribution.
 
 #pragma once
 
-#include "Pragma.h"
-
 #include "Console.h"
 #include "Export.h"
 #include "Hooks.h"

diff --git a/library/include/Error.h b/library/include/Error.h
@@ -30,7 +30,6 @@ distribution.
 
 #include "Export.h"
 #include "MiscUtils.h"
-#include "Pragma.h"
 
 namespace DFHack
 {

diff --git a/library/include/Internal.h b/library/include/Internal.h
@@ -34,8 +34,5 @@ distribution.
     #define _FILE_OFFSET_BITS 64
 #endif
 
-// one file for telling the MSVC compiler where it can shove its pointless warnings
-#include "Pragma.h"
-
 // C99 integer types
 #include <stdint.h>
diff --git a/library/include/MemAccess.h b/library/include/MemAccess.h
@@ -28,7 +28,6 @@ distribution.
 #ifndef PROCESS_H_INCLUDED
 #define PROCESS_H_INCLUDED
 
-#include "Pragma.h"
 #include "Export.h"
 #include <iostream>
 #include <cstring>

diff --git a/library/include/Pragma.h b/library/include/Pragma.h
diff --git a/library/include/RemoteClient.h b/library/include/RemoteClient.h
@@ -23,7 +23,6 @@ distribution.
 */
 
 #pragma once
-#include "Pragma.h"
 #include "Export.h"
 #include "ColorText.h"
 #include "Core.h"

diff --git a/library/include/RemoteServer.h b/library/include/RemoteServer.h
@@ -23,7 +23,6 @@ distribution.
 */
 
 #pragma once
-#include "Pragma.h"
 #include "Export.h"
 #include "RemoteClient.h"
 #include "Core.h"

diff --git a/library/include/RemoteTools.h b/library/include/RemoteTools.h
@@ -23,7 +23,6 @@ distribution.
 */
 
 #pragma once
-#include "Pragma.h"
 #include "Export.h"
 #include "RemoteServer.h"
 

diff --git a/library/include/TileTypes.h b/library/include/TileTypes.h
@@ -24,7 +24,6 @@ distribution.
 
 #pragma once
 
-#include "Pragma.h"
 #include "Export.h"
 #include "DataDefs.h"
 

diff --git a/library/include/Types.h b/library/include/Types.h
@@ -27,7 +27,6 @@ distribution.
 
 #include <algorithm>
 
-#include "Pragma.h"
 #include "Export.h"
 
 #include "DataDefs.h"

diff --git a/library/include/VersionInfo.h b/library/include/VersionInfo.h
@@ -32,7 +32,6 @@ distribution.
 #include <vector>
 
 #include "Export.h"
-#include "Pragma.h"
 
 namespace DFHack
 {

diff --git a/library/include/VersionInfoFactory.h b/library/include/VersionInfoFactory.h
@@ -27,7 +27,6 @@ distribution.
 
 #include <memory>
 
-#include "Pragma.h"
 #include "Export.h"
 
 class TiXmlElement;