TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refer to <memory> directly, not through "compiler-make_unique.h"

Browse source
This commit is contained in:
Kp 2020-05-02 21:18:43 +00:00
parent 3add38df3d
commit db7b4b3f88
39 changed files with 38 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/2d/bitmap.cpp
View file

@ -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 <memory>
namespace dcx {

3
common/2d/canvas.cpp
View file

@ -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 <memory>
namespace dcx {

37
common/include/compiler-make_unique.h
View file

@ -1,37 +0,0 @@
#pragma once
#include <memory>
#ifdef DXX_HAVE_CXX14_MAKE_UNIQUE
using std::make_unique;
#else
namespace detail {
template <typename T>
struct unique_enable
{
typedef std::unique_ptr<T> scalar_type;
};
template <typename T>
struct unique_enable<T[]>
{
typedef std::unique_ptr<T[]> vector_type;
typedef T element_type;
};
template <typename T, std::size_t N>
struct unique_enable<T[N]> {};
}
template <typename T, typename... Args>
static inline typename detail::unique_enable<T>::scalar_type make_unique(Args&&... args)
{
return typename detail::unique_enable<T>::scalar_type{new T(std::forward<Args>(args)...)};
}
template <typename T>
static inline typename detail::unique_enable<T>::vector_type make_unique(std::size_t N)
{
return typename detail::unique_enable<T>::vector_type{new typename detail::unique_enable<T>::element_type[N]()};
}
#endif

2
common/include/physfsx.h
View file

@ -39,9 +39,9 @@
#include "u_mem.h"
#include "pack.h"
#include "ntstring.h"
#include "compiler-make_unique.h"
#include "partial_range.h"
#include <array>
#include <memory>
#ifdef DXX_CONSTANT_TRUE
#define _DXX_PHYSFS_CHECK_SIZE_CONSTANT(S,v) DXX_CONSTANT_TRUE((S) > (v))

2
common/include/ui.h
View file

@ -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 <array>
#include <memory>
namespace dcx {

2
common/main/cmd.cpp
View file

@ -27,8 +27,8 @@
#include "cvar.h"
#include "physfsx.h"
#include "compiler-make_unique.h"
#include "compiler-range_for.h"
#include <memory>
namespace {

2
common/misc/hmp.cpp
View file

@ -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 <memory>
namespace dcx {

3
common/ui/dialog.cpp
View file

@ -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 <memory>
namespace dcx {

2
common/ui/file.cpp
View file

@ -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 <memory>
namespace dcx {

2
common/ui/keypad.cpp
View file

@ -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 <memory>
namespace dcx {

2
common/ui/menu.cpp
View file

@ -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 <memory>
namespace dcx {

2
common/ui/message.cpp
View file

@ -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 <array>
#include <memory>
namespace dcx {

3
d1x-rebirth/editor/ehostage.cpp
View file

@ -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 <memory>
//-------------------------------------------------------------------------
// Variables for this module...

2
d1x-rebirth/main/custom.cpp
View file

@ -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 <memory>
//#define D2TMAP_CONV // used for testing

3
d2x-rebirth/libmve/mvelib.cpp
View file

@ -13,8 +13,7 @@
#endif
#include "mvelib.h"
#include "compiler-make_unique.h"
#include <memory>
static const char MVE_HEADER[] = "Interplay MVE File\x1A";
constexpr short MVE_HDRCONST1 = 0x001A;

3
d2x-rebirth/libmve/mveplay.cpp
View file

@ -40,8 +40,7 @@
#include "args.h"
#include "console.h"
#include "u_mem.h"
#include "compiler-make_unique.h"
#include <memory>
#define MVE_OPCODE_ENDOFSTREAM 0x00
#define MVE_OPCODE_ENDOFCHUNK 0x01

2
similar/2d/font.cpp
View file

@ -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 <array>
#include <memory>
static font_x_scale_float FONTSCALE_X()
{

3
similar/arch/ogl/gr.cpp
View file

@ -72,8 +72,7 @@
#endif
#include "ogl_sync.h"
#include "compiler-make_unique.h"
#include <memory>
using std::min;
using std::max;

2
similar/arch/ogl/ogl.cpp
View file

@ -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 <algorithm>
#include <memory>
#include <utility>
using std::max;

3
similar/arch/sdl/digi_mixer.cpp
View file

@ -36,8 +36,7 @@
#include "maths.h"
#include "piggy.h"
#include "u_mem.h"
#include "compiler-make_unique.h"
#include <memory>
#define MIX_DIGI_DEBUG 0
#define MIX_OUTPUT_FORMAT AUDIO_S16

2
similar/arch/sdl/gr.cpp
View file

@ -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 <memory>
using std::min;

2
similar/arch/sdl/jukebox.cpp
View file

@ -24,8 +24,8 @@
#include "physfs_list.h"
#include "digi.h"
#include "compiler-make_unique.h"
#include "partial_range.h"
#include <memory>
namespace dcx {

2
similar/editor/centers.cpp
View file

@ -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 <memory>
//-------------------------------------------------------------------------
// Variables for this module...

2
similar/editor/eswitch.cpp
View file

@ -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 <memory>
//-------------------------------------------------------------------------
// Variables for this module...

2
similar/editor/medrobot.cpp
View file

@ -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 <memory>
static int GoodyNextID();
static int GoodyPrevID();

2
similar/editor/medwall.cpp
View file

@ -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 <memory>
#include <utility>
static int wall_add_to_side(fvcvertptr &vcvertptr, wall_array &Walls, const vmsegptridx_t segp, unsigned side, unsigned type);

2
similar/main/automap.cpp
View file

@ -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 <memory>
#define LEAVE_TIME 0x4000

2
similar/main/bm.cpp
View file

@ -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 <memory>
std::array<ubyte, MAX_SOUNDS> Sounds, AltSounds;

3
similar/main/config.cpp
View file

@ -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 <memory>
namespace dcx {
CCfg CGameCfg;

3
similar/main/credits.cpp
View file

@ -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 <memory>
#define ROW_SPACING (SHEIGHT / 17)
#define NUM_LINES 20 //14

2
similar/main/iff.cpp
View file

@ -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 <memory>
//Internal constants and structures for this library

2
similar/main/menu.cpp
View file

@ -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 <memory>
#include <utility>
// Menu IDs...

2
similar/main/mission.cpp
View file

@ -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 <memory>
#define BIMD1_BRIEFING_FILE "briefing.txb"

2
similar/main/piggy.cpp
View file

@ -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 <memory>
#if defined(DXX_BUILD_DESCENT_I)
#include "custom.h"

2
similar/main/polyobj.cpp
View file

@ -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 <memory>
namespace dcx {
unsigned N_polygon_models = 0;

2
similar/main/songs.cpp
View file

@ -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 <memory>
namespace dcx {

3
similar/main/terrain.cpp
View file

@ -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 <memory>
#define GRID_MAX_SIZE 64
#define GRID_SCALE i2f(2*20)

3
similar/main/text.cpp
View file

@ -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 <memory>
#ifdef GENERATE_BUILTIN_TEXT_TABLE
#include <ctype.h>

2
similar/main/titles.cpp
View file

@ -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 <memory>
#if defined(DXX_BUILD_DESCENT_I)
constexpr std::true_type EMULATING_D1{};