Changeset - r27379:fc235a1040ab
[Not reviewed]
master
! ! !
Peter Nelson - 18 months ago 2023-05-17 08:08:39
peter1138@openttd.org
Codechange: Move includes for common STL headers to stdafx.
72 files changed with 5 insertions and 98 deletions:
0 comments (0 inline, 0 general)
src/ai/ai_info.cpp
Show inline comments
 
@@ -15,7 +15,6 @@
 
#include "../debug.h"
 
#include "../string_func.h"
 
#include "../rev.h"
 
#include <set>
 

	
 
#include "../safeguards.h"
 

	
src/blitter/factory.hpp
Show inline comments
 
@@ -13,7 +13,6 @@
 
#include "base.hpp"
 
#include "../debug.h"
 
#include "../string_func.h"
 
#include <map>
 

	
 

	
 
/**
src/cargomonitor.h
Show inline comments
 
@@ -15,7 +15,6 @@
 
#include "industry.h"
 
#include "town.h"
 
#include "core/overflowsafe_type.hpp"
 
#include <map>
 

	
 
struct Station;
 

	
src/cargopacket.h
Show inline comments
 
@@ -18,7 +18,6 @@
 
#include "vehicle_type.h"
 
#include "core/multimap.hpp"
 
#include "saveload/saveload.h"
 
#include <list>
 

	
 
/** Unique identifier for a single cargo packet. */
 
typedef uint32 CargoPacketID;
src/command.cpp
Show inline comments
 
@@ -59,8 +59,6 @@
 
#include "misc/endian_buffer.hpp"
 
#include "string_func.h"
 

	
 
#include <array>
 

	
 
#include "table/strings.h"
 

	
 
#include "safeguards.h"
src/company_base.h
Show inline comments
 
@@ -17,7 +17,6 @@
 
#include "timer/timer_game_calendar.h"
 
#include "settings_type.h"
 
#include "group.h"
 
#include <array>
 

	
 
/** Statistics about the economy. */
 
struct CompanyEconomyEntry {
src/console_gui.cpp
Show inline comments
 
@@ -22,7 +22,6 @@
 
#include "video/video_driver.hpp"
 
#include "timer/timer.h"
 
#include "timer/timer_window.h"
 
#include <deque>
 

	
 
#include "widgets/console_widget.h"
 

	
src/console_internal.h
Show inline comments
 
@@ -11,7 +11,6 @@
 
#define CONSOLE_INTERNAL_H
 

	
 
#include "gfx_type.h"
 
#include <map>
 

	
 
static const uint ICON_CMDLN_SIZE     = 1024; ///< maximum length of a typed in command
 
static const uint ICON_MAX_STREAMSIZE = 2048; ///< maximum length of a totally expanded command
src/core/multimap.hpp
Show inline comments
 
@@ -10,9 +10,6 @@
 
#ifndef MULTIMAP_HPP
 
#define MULTIMAP_HPP
 

	
 
#include <map>
 
#include <list>
 

	
 
template<typename Tkey, typename Tvalue, typename Tcompare>
 
class MultiMap;
 

	
src/driver.h
Show inline comments
 
@@ -12,7 +12,6 @@
 

	
 
#include "core/enum_type.hpp"
 
#include "string_type.h"
 
#include <map>
 

	
 
const char *GetDriverParam(const StringList &parm, const char *name);
 
bool GetDriverParamBool(const StringList &parm, const char *name);
src/error.h
Show inline comments
 
@@ -10,7 +10,6 @@
 
#ifndef ERROR_H
 
#define ERROR_H
 

	
 
#include <list>
 
#include "strings_type.h"
 
#include "company_type.h"
 
#include "command_type.h"
src/error_gui.cpp
Show inline comments
 
@@ -27,7 +27,6 @@
 
#include "widgets/error_widget.h"
 

	
 
#include "table/strings.h"
 
#include <list>
 

	
 
#include "safeguards.h"
 

	
src/fileio.cpp
Show inline comments
 
@@ -25,7 +25,6 @@
 
#include <pwd.h>
 
#endif
 
#include <sys/stat.h>
 
#include <array>
 
#include <sstream>
 

	
 
#include "safeguards.h"
src/game/game_info.cpp
Show inline comments
 
@@ -13,7 +13,6 @@
 
#include "game_info.hpp"
 
#include "game_scanner.hpp"
 
#include "../debug.h"
 
#include <set>
 

	
 
#include "../safeguards.h"
 

	
src/gamelog_internal.h
Show inline comments
 
@@ -11,7 +11,6 @@
 
#define GAMELOG_INTERNAL_H
 

	
 
#include "gamelog.h"
 
#include <iterator>
 

	
 
/**
 
 * Information about the presence of a Grf at a certain point during gamelog history
src/gfx_layout.h
Show inline comments
 
@@ -14,7 +14,6 @@
 
#include "gfx_func.h"
 
#include "core/smallmap_type.hpp"
 

	
 
#include <map>
 
#include <stack>
 
#include <string_view>
 

	
src/gfx_layout_icu.cpp
Show inline comments
 
@@ -24,8 +24,6 @@
 
#include <hb.h>
 
#include <hb-ft.h>
 

	
 
#include <deque>
 

	
 
#include "safeguards.h"
 

	
 
/** harfbuzz doesn't use floats, so we need a value to scale position with to get sub-pixel precision. */
src/industrytype.h
Show inline comments
 
@@ -10,7 +10,6 @@
 
#ifndef INDUSTRYTYPE_H
 
#define INDUSTRYTYPE_H
 

	
 
#include <array>
 
#include "map_type.h"
 
#include "slope_type.h"
 
#include "industry_type.h"
src/landscape.cpp
Show inline comments
 
@@ -36,9 +36,6 @@
 
#include "landscape_cmd.h"
 
#include "terraform_cmd.h"
 
#include "station_func.h"
 
#include <array>
 
#include <list>
 
#include <set>
 

	
 
#include "table/strings.h"
 
#include "table/sprites.h"
src/linkgraph/linkgraph_gui.h
Show inline comments
 
@@ -15,7 +15,6 @@
 
#include "../widget_type.h"
 
#include "../window_gui.h"
 
#include "linkgraph_base.h"
 
#include <map>
 

	
 
/**
 
 * Monthly statistics for a link between two stations.
src/linkgraph/linkgraphjob.h
Show inline comments
 
@@ -12,7 +12,6 @@
 

	
 
#include "../thread.h"
 
#include "linkgraph.h"
 
#include <list>
 
#include <atomic>
 

	
 
class LinkGraphJob;
src/linkgraph/mcf.cpp
Show inline comments
 
@@ -3,7 +3,6 @@
 
#include "../stdafx.h"
 
#include "../core/math_func.hpp"
 
#include "mcf.h"
 
#include <set>
 

	
 
#include "../safeguards.h"
 

	
src/linkgraph/refresh.h
Show inline comments
 
@@ -12,8 +12,6 @@
 

	
 
#include "../cargo_type.h"
 
#include "../vehicle_base.h"
 
#include <map>
 
#include <set>
 

	
 
/**
 
 * Utility to refresh links a consist will visit.
src/misc/dbg_helpers.h
Show inline comments
 
@@ -10,7 +10,6 @@
 
#ifndef DBG_HELPERS_H
 
#define DBG_HELPERS_H
 

	
 
#include <map>
 
#include <stack>
 

	
 
#include "../direction_type.h"
src/misc/lrucache.hpp
Show inline comments
 
@@ -11,7 +11,6 @@
 
#define LRUCACHE_HPP
 

	
 
#include <utility>
 
#include <list>
 
#include <unordered_map>
 

	
 
/**
src/network/core/tcp.h
Show inline comments
 
@@ -17,7 +17,6 @@
 

	
 
#include <atomic>
 
#include <chrono>
 
#include <map>
 
#include <thread>
 

	
 
/** The states of sending the packets. */
src/network/core/tcp_connect.cpp
Show inline comments
 
@@ -16,8 +16,6 @@
 
#include "../network_coordinator.h"
 
#include "../network_internal.h"
 

	
 
#include <deque>
 

	
 
#include "../../safeguards.h"
 

	
 
/** List of connections that are currently being created */
src/network/network_chat_gui.cpp
Show inline comments
 
@@ -28,8 +28,6 @@
 

	
 
#include "table/strings.h"
 

	
 
#include <deque>
 

	
 
#include "../safeguards.h"
 

	
 
/** The draw buffer must be able to contain the chat message, client name and the "[All]" message,
src/network/network_command.cpp
Show inline comments
 
@@ -51,7 +51,6 @@
 
#include "../water_cmd.h"
 
#include "../waypoint_cmd.h"
 
#include "../script/script_cmd.h"
 
#include <array>
 

	
 
#include "../safeguards.h"
 

	
src/network/network_coordinator.h
Show inline comments
 
@@ -13,7 +13,6 @@
 
#include "core/tcp_coordinator.h"
 
#include "network_stun.h"
 
#include "network_turn.h"
 
#include <map>
 

	
 
/**
 
 * Game Coordinator communication.
src/network/network_gui.cpp
Show inline comments
 
@@ -52,8 +52,6 @@
 
#	include <emscripten.h>
 
#endif
 

	
 
#include <map>
 

	
 
#include "../safeguards.h"
 

	
 
static void ShowNetworkStartServerWindow();
src/newgrf.cpp
Show inline comments
 
@@ -41,7 +41,6 @@
 
#include "timer/timer_game_calendar.h"
 
#include "string_func.h"
 
#include "network/core/config.h"
 
#include <map>
 
#include "smallmap_gui.h"
 
#include "genworld.h"
 
#include "error.h"
src/newgrf_generic.cpp
Show inline comments
 
@@ -14,7 +14,6 @@
 
#include "core/random_func.hpp"
 
#include "newgrf_sound.h"
 
#include "water_map.h"
 
#include <list>
 

	
 
#include "safeguards.h"
 

	
src/newgrf_gui.cpp
Show inline comments
 
@@ -36,7 +36,6 @@
 

	
 
#include "table/sprites.h"
 

	
 
#include <map>
 
#include "safeguards.h"
 

	
 
/**
src/newgrf_storage.cpp
Show inline comments
 
@@ -12,7 +12,6 @@
 
#include "core/pool_func.hpp"
 
#include "core/endian_func.hpp"
 
#include "debug.h"
 
#include <set>
 

	
 
#include "safeguards.h"
 

	
src/newgrf_text.cpp
Show inline comments
 
@@ -17,8 +17,6 @@
 

	
 
#include "stdafx.h"
 

	
 
#include <array>
 

	
 
#include "newgrf.h"
 
#include "strings_func.h"
 
#include "newgrf_storage.h"
 
@@ -31,7 +29,6 @@
 
#include "core/smallmap_type.hpp"
 
#include "language.h"
 
#include <sstream>
 
#include <map>
 

	
 
#include "table/strings.h"
 
#include "table/control_codes.h"
src/os/macosx/macos.mm
Show inline comments
 
@@ -14,7 +14,6 @@
 
#include "../../string_func.h"
 
#include "../../fileio_func.h"
 
#include <pthread.h>
 
#include <array>
 

	
 
#define Rect  OTTDRect
 
#define Point OTTDPoint
src/os/windows/win32.cpp
Show inline comments
 
@@ -27,7 +27,6 @@
 
#include <sys/stat.h>
 
#include "../../language.h"
 
#include "../../thread.h"
 
#include <array>
 

	
 
#include "../../safeguards.h"
 

	
src/roadveh.h
Show inline comments
 
@@ -17,7 +17,6 @@
 
#include "road.h"
 
#include "road_map.h"
 
#include "newgrf_engine.h"
 
#include <deque>
 

	
 
struct RoadVehicle;
 

	
src/saveload/map_sl.cpp
Show inline comments
 
@@ -15,7 +15,6 @@
 
#include "../map_func.h"
 
#include "../core/bitmath_func.hpp"
 
#include "../fios.h"
 
#include <array>
 

	
 
#include "../safeguards.h"
 

	
src/saveload/oldloader_sl.cpp
Show inline comments
 
@@ -33,7 +33,6 @@
 
#include "../timer/timer_game_calendar.h"
 
#include "saveload_internal.h"
 
#include "oldloader.h"
 
#include <array>
 

	
 
#include "table/strings.h"
 
#include "../table/engines.h"
src/saveload/saveload.cpp
Show inline comments
 
@@ -43,7 +43,6 @@
 
#include "../fios.h"
 
#include "../error.h"
 
#include <atomic>
 
#include <deque>
 
#ifdef __EMSCRIPTEN__
 
#	include <emscripten.h>
 
#endif
src/saveload/vehicle_sl.cpp
Show inline comments
 
@@ -23,8 +23,6 @@
 
#include "../company_func.h"
 
#include "../disaster_vehicle.h"
 

	
 
#include <map>
 

	
 
#include "../safeguards.h"
 

	
 
/**
src/script/api/script_controller.hpp
Show inline comments
 
@@ -11,7 +11,6 @@
 
#define SCRIPT_CONTROLLER_HPP
 

	
 
#include "script_types.hpp"
 
#include <map>
 

	
 
/**
 
 * The Controller, the class each Script should extend. It creates the Script,
src/script/api/script_error.hpp
Show inline comments
 
@@ -12,7 +12,6 @@
 

	
 
#include "script_object.hpp"
 
#include "script_companymode.hpp"
 
#include <map>
 

	
 
/**
 
 * Helper to write precondition enforcers for the script API in an abbreviated manner.
src/script/api/script_list.hpp
Show inline comments
 
@@ -12,8 +12,6 @@
 
#define SCRIPT_LIST_HPP
 

	
 
#include "script_object.hpp"
 
#include <map>
 
#include <set>
 

	
 
class ScriptListSorter;
 

	
src/script/api/script_log_types.hpp
Show inline comments
 
@@ -10,8 +10,6 @@
 
#ifndef SCRIPT_LOG_TYPES_HPP
 
#define SCRIPT_LOG_TYPES_HPP
 

	
 
#include <deque>
 

	
 
namespace ScriptLogTypes {
 
	/**
 
	 * Log levels; The value is also feed to Debug() lvl.
src/script/script_config.hpp
Show inline comments
 
@@ -10,8 +10,6 @@
 
#ifndef SCRIPT_CONFIG_HPP
 
#define SCRIPT_CONFIG_HPP
 

	
 
#include <map>
 
#include <list>
 
#include "../core/smallmap_type.hpp"
 
#include "../company_type.h"
 
#include "../textfile_gui.h"
src/script/script_instance.hpp
Show inline comments
 
@@ -11,7 +11,6 @@
 
#define SCRIPT_INSTANCE_HPP
 

	
 
#include <variant>
 
#include <list>
 
#include <squirrel.h>
 
#include "script_suspend.hpp"
 
#include "script_log_types.hpp"
src/script/script_scanner.hpp
Show inline comments
 
@@ -10,7 +10,6 @@
 
#ifndef SCRIPT_SCANNER_HPP
 
#define SCRIPT_SCANNER_HPP
 

	
 
#include <map>
 
#include "../fileio_func.h"
 
#include "../string_func.h"
 

	
src/script/squirrel.cpp
Show inline comments
 
@@ -20,7 +20,6 @@
 
#include "../core/alloc_func.hpp"
 

	
 
#include <stdarg.h>
 
#include <map>
 

	
 
/**
 
 * In the memory allocator for Squirrel we want to directly use malloc/realloc, so when the OS
src/settings_table.h
Show inline comments
 
@@ -12,7 +12,6 @@
 
#ifndef SETTINGS_TABLE_H
 
#define SETTINGS_TABLE_H
 

	
 
#include <array>
 
#include "settings_internal.h"
 

	
 
extern SettingTable _company_settings;
src/ship.h
Show inline comments
 
@@ -10,8 +10,6 @@
 
#ifndef SHIP_H
 
#define SHIP_H
 

	
 
#include <deque>
 

	
 
#include "vehicle_base.h"
 
#include "water_map.h"
 

	
src/station_base.h
Show inline comments
 
@@ -18,8 +18,6 @@
 
#include "linkgraph/linkgraph_type.h"
 
#include "newgrf_storage.h"
 
#include "bitmap_type.h"
 
#include <map>
 
#include <set>
 

	
 
static const byte INITIAL_STATION_RATING = 175;
 

	
src/station_gui.cpp
Show inline comments
 
@@ -37,8 +37,6 @@
 

	
 
#include "table/strings.h"
 

	
 
#include <set>
 

	
 
#include "safeguards.h"
 

	
 
/**
src/station_type.h
Show inline comments
 
@@ -12,7 +12,6 @@
 

	
 
#include "core/smallstack_type.hpp"
 
#include "tilearea_type.h"
 
#include <set>
 

	
 
typedef uint16 StationID;
 
typedef uint16 RoadStopID;
src/stdafx.h
Show inline comments
 
@@ -53,6 +53,7 @@
 
#endif
 

	
 
#include <algorithm>
 
#include <array>
 
#include <cassert>
 
#include <cctype>
 
#include <cerrno>
 
@@ -65,12 +66,16 @@
 
#include <cstring>
 
#include <cstdlib>
 
#include <cwchar>
 
#include <deque>
 
#include <exception>
 
#include <functional>
 
#include <iterator>
 
#include <list>
 
#include <limits>
 
#include <map>
 
#include <memory>
 
#include <optional>
 
#include <set>
 
#include <stdexcept>
 
#include <string>
 
#include <type_traits>
src/tar_type.h
Show inline comments
 
@@ -10,9 +10,6 @@
 
#ifndef TAR_TYPE_H
 
#define TAR_TYPE_H
 

	
 
#include <map>
 
#include <array>
 

	
 
#include "fileio_type.h"
 

	
 

	
src/terraform_cmd.cpp
Show inline comments
 
@@ -22,9 +22,6 @@
 

	
 
#include "table/strings.h"
 

	
 
#include <map>
 
#include <set>
 

	
 
#include "safeguards.h"
 

	
 
/** Set of tiles. */
src/tests/landscape_partial_pixel_z.cpp
Show inline comments
 
@@ -13,7 +13,6 @@
 

	
 
#include "../landscape.h"
 
#include "../slope_func.h"
 
#include <array>
 

	
 
/**
 
 * Check whether the addition of two slope's GetPartialPixelZ values results in
src/tests/string_func.cpp
Show inline comments
 
@@ -12,7 +12,6 @@
 
#include "../3rdparty/catch2/catch.hpp"
 

	
 
#include "../string_func.h"
 
#include <array>
 

	
 
/**** String compare/equals *****/
 

	
src/timer/timer_manager.h
Show inline comments
 
@@ -13,8 +13,6 @@
 

	
 
#include "stdafx.h"
 

	
 
#include <set>
 

	
 
template <typename TTimerType>
 
class BaseTimer;
 

	
src/town.h
Show inline comments
 
@@ -16,7 +16,6 @@
 
#include "subsidy_type.h"
 
#include "newgrf_storage.h"
 
#include "cargotype.h"
 
#include <list>
 

	
 
template <typename T>
 
struct BuildingCounts {
src/townname_type.h
Show inline comments
 
@@ -16,7 +16,6 @@
 
#include "newgrf_townname.h"
 
#include "town_type.h"
 
#include "string_type.h"
 
#include <set>
 

	
 
typedef std::set<std::string> TownNames;
 

	
src/vehicle_base.h
Show inline comments
 
@@ -24,8 +24,6 @@
 
#include "network/network.h"
 
#include "saveload/saveload.h"
 
#include "timer/timer_game_calendar.h"
 
#include <list>
 
#include <map>
 

	
 
const uint TILE_AXIAL_DISTANCE = 192;  // Logical length of the tile in any DiagDirection used in vehicle movement.
 
const uint TILE_CORNER_DISTANCE = 128;  // Logical length of the tile corner crossing in any non-diagonal direction used in vehicle movement.
src/video/cocoa/cocoa_v.mm
Show inline comments
 
@@ -44,7 +44,6 @@
 

	
 
#import <sys/param.h> /* for MAXPATHLEN */
 
#import <sys/time.h> /* gettimeofday */
 
#include <array>
 

	
 
/* The 10.12 SDK added new names for some enum constants and
 
 * deprecated the old ones. As there's no functional change in any
src/video/cocoa/cocoa_wnd.mm
Show inline comments
 
@@ -34,7 +34,6 @@
 
#include "../../window_gui.h"
 
#include "../../spritecache.h"
 
#include "../../toolbar_gui.h"
 
#include <array>
 

	
 
#include "table/sprites.h"
 

	
src/video/opengl.cpp
Show inline comments
 
@@ -36,7 +36,6 @@
 
#include "../debug.h"
 
#include "../blitter/factory.hpp"
 
#include "../zoom_func.h"
 
#include <array>
 
#include <numeric>
 

	
 
#include "../table/opengl_shader.h"
src/viewport.cpp
Show inline comments
 
@@ -92,7 +92,6 @@
 
#include "viewport_cmd.h"
 

	
 
#include <forward_list>
 
#include <map>
 
#include <stack>
 

	
 
#include "table/strings.h"
src/viewport_sprite_sorter_sse4.cpp
Show inline comments
 
@@ -14,7 +14,6 @@
 
#include "smmintrin.h"
 
#include "viewport_sprite_sorter.h"
 
#include <forward_list>
 
#include <map>
 
#include <stack>
 

	
 
#include "safeguards.h"
src/widgets/slider_func.h
Show inline comments
 
@@ -13,8 +13,6 @@
 
#include "../window_type.h"
 
#include "../gfx_func.h"
 

	
 
#include <map>
 

	
 
void DrawSliderWidget(Rect r, int min_value, int max_value, int value, const std::map<int, StringID> &labels);
 
bool ClickSliderWidget(Rect r, Point pt, int min_value, int max_value, int &value);
 

	
src/window_gui.h
Show inline comments
 
@@ -10,8 +10,6 @@
 
#ifndef WINDOW_GUI_H
 
#define WINDOW_GUI_H
 

	
 
#include <list>
 

	
 
#include "vehiclelist.h"
 
#include "vehicle_type.h"
 
#include "viewport_type.h"
0 comments (0 inline, 0 general)