From db7b4b3f88e9d7653905340667e26619fff4c91f Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 2 May 2020 21:18:43 +0000 Subject: [PATCH] Refer to directly, not through "compiler-make_unique.h" --- common/2d/bitmap.cpp | 3 +-- common/2d/canvas.cpp | 3 +-- common/include/compiler-make_unique.h | 37 --------------------------- common/include/physfsx.h | 2 +- common/include/ui.h | 2 +- common/main/cmd.cpp | 2 +- common/misc/hmp.cpp | 2 +- common/ui/dialog.cpp | 3 +-- common/ui/file.cpp | 2 +- common/ui/keypad.cpp | 2 +- common/ui/menu.cpp | 2 +- common/ui/message.cpp | 2 +- d1x-rebirth/editor/ehostage.cpp | 3 +-- d1x-rebirth/main/custom.cpp | 2 +- d2x-rebirth/libmve/mvelib.cpp | 3 +-- d2x-rebirth/libmve/mveplay.cpp | 3 +-- similar/2d/font.cpp | 2 +- similar/arch/ogl/gr.cpp | 3 +-- similar/arch/ogl/ogl.cpp | 2 +- similar/arch/sdl/digi_mixer.cpp | 3 +-- similar/arch/sdl/gr.cpp | 2 +- similar/arch/sdl/jukebox.cpp | 2 +- similar/editor/centers.cpp | 2 +- similar/editor/eswitch.cpp | 2 +- similar/editor/medrobot.cpp | 2 +- similar/editor/medwall.cpp | 2 +- similar/main/automap.cpp | 2 +- similar/main/bm.cpp | 2 +- similar/main/config.cpp | 3 +-- similar/main/credits.cpp | 3 +-- similar/main/iff.cpp | 2 +- similar/main/menu.cpp | 2 +- similar/main/mission.cpp | 2 +- similar/main/piggy.cpp | 2 +- similar/main/polyobj.cpp | 2 +- similar/main/songs.cpp | 2 +- similar/main/terrain.cpp | 3 +-- similar/main/text.cpp | 3 +-- similar/main/titles.cpp | 2 +- 39 files changed, 38 insertions(+), 87 deletions(-) delete mode 100644 common/include/compiler-make_unique.h diff --git a/common/2d/bitmap.cpp b/common/2d/bitmap.cpp index 522e38724..6ed8b2db7 100644 --- a/common/2d/bitmap.cpp +++ b/common/2d/bitmap.cpp @@ -35,8 +35,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "ogl_init.h" #endif #include "bitmap.h" - -#include "compiler-make_unique.h" +#include namespace dcx { diff --git a/common/2d/canvas.cpp b/common/2d/canvas.cpp index 3d77879a5..e56e00a7d 100644 --- a/common/2d/canvas.cpp +++ b/common/2d/canvas.cpp @@ -26,8 +26,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #if DXX_USE_OGL #include "ogl_init.h" #endif - -#include "compiler-make_unique.h" +#include namespace dcx { diff --git a/common/include/compiler-make_unique.h b/common/include/compiler-make_unique.h deleted file mode 100644 index 1bb34b65f..000000000 --- a/common/include/compiler-make_unique.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include - -#ifdef DXX_HAVE_CXX14_MAKE_UNIQUE -using std::make_unique; -#else -namespace detail { - template - struct unique_enable - { - typedef std::unique_ptr scalar_type; - }; - - template - struct unique_enable - { - typedef std::unique_ptr vector_type; - typedef T element_type; - }; - - template - struct unique_enable {}; -} - -template -static inline typename detail::unique_enable::scalar_type make_unique(Args&&... args) -{ - return typename detail::unique_enable::scalar_type{new T(std::forward(args)...)}; -} - -template -static inline typename detail::unique_enable::vector_type make_unique(std::size_t N) -{ - return typename detail::unique_enable::vector_type{new typename detail::unique_enable::element_type[N]()}; -} -#endif diff --git a/common/include/physfsx.h b/common/include/physfsx.h index fdd2f42ec..338e18c20 100644 --- a/common/include/physfsx.h +++ b/common/include/physfsx.h @@ -39,9 +39,9 @@ #include "u_mem.h" #include "pack.h" #include "ntstring.h" -#include "compiler-make_unique.h" #include "partial_range.h" #include +#include #ifdef DXX_CONSTANT_TRUE #define _DXX_PHYSFS_CHECK_SIZE_CONSTANT(S,v) DXX_CONSTANT_TRUE((S) > (v)) diff --git a/common/include/ui.h b/common/include/ui.h index c42f3a14d..105fc8e88 100644 --- a/common/include/ui.h +++ b/common/include/ui.h @@ -38,9 +38,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "fwd-gr.h" #include "varutil.h" #include "window.h" -#include "compiler-make_unique.h" #include "ntstring.h" #include +#include namespace dcx { diff --git a/common/main/cmd.cpp b/common/main/cmd.cpp index 0867d0ab5..a147b1071 100644 --- a/common/main/cmd.cpp +++ b/common/main/cmd.cpp @@ -27,8 +27,8 @@ #include "cvar.h" #include "physfsx.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" +#include namespace { diff --git a/common/misc/hmp.cpp b/common/misc/hmp.cpp index 759afa3a3..a8e6de41b 100644 --- a/common/misc/hmp.cpp +++ b/common/misc/hmp.cpp @@ -24,10 +24,10 @@ #include "dxxsconf.h" #include "dsx-ns.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "d_range.h" #include "partial_range.h" +#include namespace dcx { diff --git a/common/ui/dialog.cpp b/common/ui/dialog.cpp index 9c147f1df..37fec3a95 100644 --- a/common/ui/dialog.cpp +++ b/common/ui/dialog.cpp @@ -37,8 +37,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mouse.h" #include "timer.h" #include "dxxerror.h" - -#include "compiler-make_unique.h" +#include namespace dcx { diff --git a/common/ui/file.cpp b/common/ui/file.cpp index 4d974fad9..f6a735d5e 100644 --- a/common/ui/file.cpp +++ b/common/ui/file.cpp @@ -33,9 +33,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "physfsx.h" #include "physfs_list.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "d_range.h" +#include namespace dcx { diff --git a/common/ui/keypad.cpp b/common/ui/keypad.cpp index d7497007e..24b0dafa8 100644 --- a/common/ui/keypad.cpp +++ b/common/ui/keypad.cpp @@ -31,9 +31,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "func.h" #include "dxxerror.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "d_range.h" +#include namespace dcx { diff --git a/common/ui/menu.cpp b/common/ui/menu.cpp index e64b4ad33..e96be5e1f 100644 --- a/common/ui/menu.cpp +++ b/common/ui/menu.cpp @@ -30,7 +30,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "dxxsconf.h" #include "dsx-ns.h" -#include "compiler-make_unique.h" +#include namespace dcx { diff --git a/common/ui/message.cpp b/common/ui/message.cpp index 97ec5562f..abd845f34 100644 --- a/common/ui/message.cpp +++ b/common/ui/message.cpp @@ -32,8 +32,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "dxxsconf.h" #include "dsx-ns.h" -#include "compiler-make_unique.h" #include +#include namespace dcx { diff --git a/d1x-rebirth/editor/ehostage.cpp b/d1x-rebirth/editor/ehostage.cpp index 9fb8364c9..ae63dfc78 100644 --- a/d1x-rebirth/editor/ehostage.cpp +++ b/d1x-rebirth/editor/ehostage.cpp @@ -52,8 +52,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "piggy.h" #include "u_mem.h" #include "event.h" - -#include "compiler-make_unique.h" +#include //------------------------------------------------------------------------- // Variables for this module... diff --git a/d1x-rebirth/main/custom.cpp b/d1x-rebirth/main/custom.cpp index a1324dab7..2b0035e8a 100644 --- a/d1x-rebirth/main/custom.cpp +++ b/d1x-rebirth/main/custom.cpp @@ -23,9 +23,9 @@ #include "physfsx.h" #include "compiler-begin.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "partial_range.h" +#include //#define D2TMAP_CONV // used for testing diff --git a/d2x-rebirth/libmve/mvelib.cpp b/d2x-rebirth/libmve/mvelib.cpp index 33c0b2b85..4dbb7d03e 100644 --- a/d2x-rebirth/libmve/mvelib.cpp +++ b/d2x-rebirth/libmve/mvelib.cpp @@ -13,8 +13,7 @@ #endif #include "mvelib.h" - -#include "compiler-make_unique.h" +#include static const char MVE_HEADER[] = "Interplay MVE File\x1A"; constexpr short MVE_HDRCONST1 = 0x001A; diff --git a/d2x-rebirth/libmve/mveplay.cpp b/d2x-rebirth/libmve/mveplay.cpp index 28c3971ff..5ac581637 100644 --- a/d2x-rebirth/libmve/mveplay.cpp +++ b/d2x-rebirth/libmve/mveplay.cpp @@ -40,8 +40,7 @@ #include "args.h" #include "console.h" #include "u_mem.h" - -#include "compiler-make_unique.h" +#include #define MVE_OPCODE_ENDOFSTREAM 0x00 #define MVE_OPCODE_ENDOFCHUNK 0x01 diff --git a/similar/2d/font.cpp b/similar/2d/font.cpp index 290936a99..e3d31516b 100644 --- a/similar/2d/font.cpp +++ b/similar/2d/font.cpp @@ -50,9 +50,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include "compiler-range_for.h" -#include "compiler-make_unique.h" #include "partial_range.h" #include +#include static font_x_scale_float FONTSCALE_X() { diff --git a/similar/arch/ogl/gr.cpp b/similar/arch/ogl/gr.cpp index 2d89c0a98..b1ded480b 100644 --- a/similar/arch/ogl/gr.cpp +++ b/similar/arch/ogl/gr.cpp @@ -72,8 +72,7 @@ #endif #include "ogl_sync.h" - -#include "compiler-make_unique.h" +#include using std::min; using std::max; diff --git a/similar/arch/ogl/ogl.cpp b/similar/arch/ogl/ogl.cpp index 05646dcc8..cb690a657 100644 --- a/similar/arch/ogl/ogl.cpp +++ b/similar/arch/ogl/ogl.cpp @@ -60,12 +60,12 @@ #include "object.h" #include "args.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "d_range.h" #include "partial_range.h" #include +#include #include using std::max; diff --git a/similar/arch/sdl/digi_mixer.cpp b/similar/arch/sdl/digi_mixer.cpp index a4e4db2ee..e4e52b539 100644 --- a/similar/arch/sdl/digi_mixer.cpp +++ b/similar/arch/sdl/digi_mixer.cpp @@ -36,8 +36,7 @@ #include "maths.h" #include "piggy.h" #include "u_mem.h" - -#include "compiler-make_unique.h" +#include #define MIX_DIGI_DEBUG 0 #define MIX_OUTPUT_FORMAT AUDIO_S16 diff --git a/similar/arch/sdl/gr.cpp b/similar/arch/sdl/gr.cpp index 28ef757e8..2da3ba4b4 100644 --- a/similar/arch/sdl/gr.cpp +++ b/similar/arch/sdl/gr.cpp @@ -29,9 +29,9 @@ #include "config.h" #include "palette.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "d_range.h" +#include using std::min; diff --git a/similar/arch/sdl/jukebox.cpp b/similar/arch/sdl/jukebox.cpp index b374f2ce1..9d1ba7b06 100644 --- a/similar/arch/sdl/jukebox.cpp +++ b/similar/arch/sdl/jukebox.cpp @@ -24,8 +24,8 @@ #include "physfs_list.h" #include "digi.h" -#include "compiler-make_unique.h" #include "partial_range.h" +#include namespace dcx { diff --git a/similar/editor/centers.cpp b/similar/editor/centers.cpp index afea451ae..4d40963c7 100644 --- a/similar/editor/centers.cpp +++ b/similar/editor/centers.cpp @@ -56,8 +56,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "centers.h" #include "u_mem.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" +#include //------------------------------------------------------------------------- // Variables for this module... diff --git a/similar/editor/eswitch.cpp b/similar/editor/eswitch.cpp index 92927ce3a..429ffaec3 100644 --- a/similar/editor/eswitch.cpp +++ b/similar/editor/eswitch.cpp @@ -50,9 +50,9 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "piggy.h" #include "u_mem.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "partial_range.h" +#include //------------------------------------------------------------------------- // Variables for this module... diff --git a/similar/editor/medrobot.cpp b/similar/editor/medrobot.cpp index cdfc082fb..75c8eb491 100644 --- a/similar/editor/medrobot.cpp +++ b/similar/editor/medrobot.cpp @@ -56,9 +56,9 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "bm.h" #include "u_mem.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "d_enumerate.h" +#include static int GoodyNextID(); static int GoodyPrevID(); diff --git a/similar/editor/medwall.cpp b/similar/editor/medwall.cpp index 2224dccc6..bf552c4fb 100644 --- a/similar/editor/medwall.cpp +++ b/similar/editor/medwall.cpp @@ -53,10 +53,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "d_enumerate.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "d_range.h" #include "partial_range.h" +#include #include static int wall_add_to_side(fvcvertptr &vcvertptr, wall_array &Walls, const vmsegptridx_t segp, unsigned side, unsigned type); diff --git a/similar/main/automap.cpp b/similar/main/automap.cpp index 3da392870..8d940c1e9 100644 --- a/similar/main/automap.cpp +++ b/similar/main/automap.cpp @@ -84,9 +84,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "args.h" #include "physics.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "partial_range.h" +#include #define LEAVE_TIME 0x4000 diff --git a/similar/main/bm.cpp b/similar/main/bm.cpp index 4856c8b5a..626bcbe57 100644 --- a/similar/main/bm.cpp +++ b/similar/main/bm.cpp @@ -66,9 +66,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include "compiler-range_for.h" -#include "compiler-make_unique.h" #include "d_range.h" #include "partial_range.h" +#include std::array Sounds, AltSounds; diff --git a/similar/main/config.cpp b/similar/main/config.cpp index 9c7b8f293..271dcbd56 100644 --- a/similar/main/config.cpp +++ b/similar/main/config.cpp @@ -43,8 +43,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "physfsx.h" #include "nvparse.h" - -#include "compiler-make_unique.h" +#include namespace dcx { CCfg CGameCfg; diff --git a/similar/main/credits.cpp b/similar/main/credits.cpp index 6be7680ad..a3c0b5c9d 100644 --- a/similar/main/credits.cpp +++ b/similar/main/credits.cpp @@ -57,8 +57,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "args.h" #endif #include "piggy.h" - -#include "compiler-make_unique.h" +#include #define ROW_SPACING (SHEIGHT / 17) #define NUM_LINES 20 //14 diff --git a/similar/main/iff.cpp b/similar/main/iff.cpp index 9bbc7d6eb..202820ff5 100644 --- a/similar/main/iff.cpp +++ b/similar/main/iff.cpp @@ -41,8 +41,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "dxxsconf.h" #include "compiler-range_for.h" -#include "compiler-make_unique.h" #include "partial_range.h" +#include //Internal constants and structures for this library diff --git a/similar/main/menu.cpp b/similar/main/menu.cpp index abbd82971..c2ac31be8 100644 --- a/similar/main/menu.cpp +++ b/similar/main/menu.cpp @@ -93,10 +93,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "dxxsconf.h" #include "dsx-ns.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "d_range.h" #include "partial_range.h" +#include #include // Menu IDs... diff --git a/similar/main/mission.cpp b/similar/main/mission.cpp index 7b6ac1d8a..ca92005dd 100644 --- a/similar/main/mission.cpp +++ b/similar/main/mission.cpp @@ -58,10 +58,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include "null_sentinel_iterator.h" -#include "compiler-make_unique.h" #include "compiler-poison.h" #include "compiler-range_for.h" #include "d_enumerate.h" +#include #define BIMD1_BRIEFING_FILE "briefing.txb" diff --git a/similar/main/piggy.cpp b/similar/main/piggy.cpp index 679380a6f..01f2afe8f 100644 --- a/similar/main/piggy.cpp +++ b/similar/main/piggy.cpp @@ -59,9 +59,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "console.h" #include "compiler-cf_assert.h" #include "compiler-range_for.h" -#include "compiler-make_unique.h" #include "d_range.h" #include "partial_range.h" +#include #if defined(DXX_BUILD_DESCENT_I) #include "custom.h" diff --git a/similar/main/polyobj.cpp b/similar/main/polyobj.cpp index 25bc8f81c..5dd7f211e 100644 --- a/similar/main/polyobj.cpp +++ b/similar/main/polyobj.cpp @@ -52,8 +52,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include "bm.h" -#include "compiler-make_unique.h" #include "partial_range.h" +#include namespace dcx { unsigned N_polygon_models = 0; diff --git a/similar/main/songs.cpp b/similar/main/songs.cpp index 8fa4f6394..b5823aac2 100644 --- a/similar/main/songs.cpp +++ b/similar/main/songs.cpp @@ -44,8 +44,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "args.h" #include "physfsx.h" #include "game.h" -#include "compiler-make_unique.h" #include "console.h" +#include namespace dcx { diff --git a/similar/main/terrain.cpp b/similar/main/terrain.cpp index fd0a2eb37..a04e3c0af 100644 --- a/similar/main/terrain.cpp +++ b/similar/main/terrain.cpp @@ -43,8 +43,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "player.h" #include "segment.h" #include "terrain.h" - -#include "compiler-make_unique.h" +#include #define GRID_MAX_SIZE 64 #define GRID_SCALE i2f(2*20) diff --git a/similar/main/text.cpp b/similar/main/text.cpp index e657f00ff..001f3d33e 100644 --- a/similar/main/text.cpp +++ b/similar/main/text.cpp @@ -35,8 +35,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "text.h" #include "strutil.h" #include "args.h" - -#include "compiler-make_unique.h" +#include #ifdef GENERATE_BUILTIN_TEXT_TABLE #include diff --git a/similar/main/titles.cpp b/similar/main/titles.cpp index 8a560892b..18195cd27 100644 --- a/similar/main/titles.cpp +++ b/similar/main/titles.cpp @@ -67,9 +67,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "args.h" #include "strutil.h" -#include "compiler-make_unique.h" #include "compiler-range_for.h" #include "partial_range.h" +#include #if defined(DXX_BUILD_DESCENT_I) constexpr std::true_type EMULATING_D1{};