Uninline namespace dcx

SConstruct

@@ -3176,10 +3176,11 @@ inline namespace dsx {	/* Force type mismatch on attempted nesting */
 class dsx;	/* dsx declared in common-only code */
 #endif
 
-inline namespace dcx {	/* Force type mismatch on attempted nesting */
+namespace dcx {	/* Force type mismatch on attempted nesting */
 	class dcx;	/* dcx declared inside dcx */
 	class dsx;	/* dsx declared inside dcx */
 }
+using namespace dcx;
 namespace {
 	class dcx;	/* dcx declared inside anonymous */
 	class dsx;	/* dsx declared inside anonymous */

common/2d/2dsline.cpp

@@ -28,7 +28,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "gr.h"
 #include "grdef.h"
 
-inline namespace dcx {
+namespace dcx {
 
 static void gr_linear_darken(ubyte * dest, int darkening_level, int count, const gft_array1 &fade_table) {
 	auto predicate = [&](ubyte c) { return fade_table[darkening_level][c]; };

common/2d/bitblt.cpp

@@ -39,7 +39,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "compiler-array.h"
 #include "compiler-exchange.h"
 
-inline namespace dcx {
+namespace dcx {
 
 static int gr_bitblt_dest_step_shift = 0;
 

common/2d/bitmap.cpp

@@ -38,7 +38,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #include "compiler-make_unique.h"
 
-inline namespace dcx {
+namespace dcx {
 
 // Allocated a bitmap and makes its data be raw_data that is already somewhere.
 static grs_bitmap_ptr gr_create_bitmap_raw(uint16_t w, uint16_t h, unsigned char * raw_data);

common/2d/bitmap.h

@@ -12,7 +12,7 @@
 #include "palette.h"
 #include "compiler-array.h"
 
-inline namespace dcx {
+namespace dcx {
 void build_colormap_good(const palette_array_t &palette, array<color_t, 256> &colormap, array<unsigned, 256> &freq);
 void decode_data(ubyte *data, uint_fast32_t num_pixels, array<color_t, 256> &colormap, array<unsigned, 256> &count);
 }

common/2d/box.cpp

@@ -24,7 +24,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "gr.h"
 #include "grdef.h"
 
-inline namespace dcx {
+namespace dcx {
 
 static void gr_ubox0(int left,int top,int right,int bot)
 {

common/2d/canvas.cpp

@@ -29,7 +29,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #include "compiler-make_unique.h"
 
-inline namespace dcx {
+namespace dcx {
 
 grs_canvas * grd_curcanv;    //active canvas
 std::unique_ptr<grs_screen> grd_curscreen;  //active screen

common/2d/circle.cpp

@@ -23,7 +23,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "gr.h"
 #include "grdef.h"
 
-inline namespace dcx {
+namespace dcx {
 
 #ifndef OGL
 int gr_ucircle(fix xc1,fix yc1,fix r1)

common/2d/disc.cpp

@@ -14,7 +14,7 @@
 #include "gr.h"
 #include "grdef.h"
 
-inline namespace dcx {
+namespace dcx {
 
 #ifndef OGL
 int gr_disk(fix xc1,fix yc1,fix r1)

common/2d/gpixel.cpp

@@ -24,7 +24,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "ogl_init.h"
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 unsigned char gr_ugpixel(const grs_bitmap &bitmap, int x, int y)
 {

common/2d/line.cpp

@@ -33,7 +33,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "ogl_init.h"
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 /*
 Symmetric Double Step Line Algorithm

common/2d/pixel.cpp

@@ -30,7 +30,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "ogl_init.h"
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 void gr_upixel(unsigned x, unsigned y)
 {

common/2d/rect.cpp

@@ -31,7 +31,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "ogl_init.h"
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 void gr_urect(int left,int top,int right,int bot)
 {

common/2d/rle.cpp

@@ -39,7 +39,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #include "compiler-range_for.h"
 
-inline namespace dcx {
+namespace dcx {
 
 const uint8_t RLE_CODE = 0xe0;
 const uint8_t NOT_RLE_CODE = 0x1f;

common/2d/scalec.cpp

@@ -21,7 +21,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "rle.h"
 #include "compiler-array.h"
 
-inline namespace dcx {
+namespace dcx {
 
 // John's new stuff below here....
 

common/3d/clipper.cpp

@@ -13,7 +13,7 @@
 #include "compiler-exchange.h"
 #include "compiler-range_for.h"
 
-inline namespace dcx {
+namespace dcx {
 
 temporary_points_t::temporary_points_t() :
 	free_point_num(0)

common/3d/clipper.h

@@ -23,7 +23,7 @@ struct g3s_point;
 #include "globvars.h"
 #include "compiler-array.h"
 
-inline namespace dcx {
+namespace dcx {
 
 struct polygon_clip_points : array<g3s_point *, MAX_POINTS_IN_POLY> {};
 struct temporary_points_t

common/3d/draw.cpp

@@ -21,7 +21,7 @@
 #include "gr.h"
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 tmap_drawer_type tmap_drawer_ptr = draw_tmap;
 #ifndef OGL

common/3d/globvars.cpp

@@ -14,7 +14,7 @@
 #include "3d.h"
 #include "globvars.h"
 
-inline namespace dcx {
+namespace dcx {
 
 vms_vector	View_position;
 fix			View_zoom;

common/3d/globvars.h

@@ -17,7 +17,7 @@
 
 struct g3s_point;
 
-inline namespace dcx {
+namespace dcx {
 
 extern int Canvas_width,Canvas_height;	//the actual width & height
 extern fix Canv_w2,Canv_h2;				//fixed-point width,height/2

common/3d/instance.cpp

@@ -16,7 +16,7 @@
 #include "3d.h"
 #include "globvars.h"
 
-inline namespace dcx {
+namespace dcx {
 
 #define MAX_INSTANCE_DEPTH	5
 

common/3d/matrix.cpp

@@ -14,7 +14,7 @@
 #include "3d.h"
 #include "globvars.h"
 
-inline namespace dcx {
+namespace dcx {
 
 static void scale_matrix(void);
 

common/3d/points.cpp

@@ -14,7 +14,7 @@
 #include "3d.h"
 #include "globvars.h"
 
-inline namespace dcx {
+namespace dcx {
 
 //code a point.  fills in the p3_codes field of the point, and returns the codes
 ubyte g3_code_point(g3s_point &p)

common/3d/rod.cpp

@@ -20,7 +20,7 @@
 
 #include "compiler-range_for.h"
 
-inline namespace dcx {
+namespace dcx {
 
 namespace {
 

common/3d/setup.cpp

@@ -26,7 +26,7 @@
 #endif
 #include "gr.h"
 
-inline namespace dcx {
+namespace dcx {
 
 //start the frame
 void g3_start_frame(void)

common/arch/cocoa/messagebox.mm

@@ -18,7 +18,7 @@
 #include "event.h"
 #include "messagebox.h"
 
-inline namespace dcx {
+namespace dcx {
 
 void display_cocoa_alert(const char *message, int error)
 {

common/arch/ogl/ogl_extensions.cpp

@@ -19,7 +19,7 @@
 #include "dxxsconf.h"
 #include "compiler-array.h"
 
-inline namespace dcx {
+namespace dcx {
 
 /* GL_ARB_sync */
 bool ogl_have_ARB_sync = false;

common/arch/ogl/ogl_sync.cpp

@@ -20,7 +20,7 @@
 #include "ogl_sync.h"
 #include "timer.h"
 
-inline namespace dcx {
+namespace dcx {
 
 ogl_sync::ogl_sync()
 {

common/arch/sdl/digi_mixer_music.cpp

@@ -25,7 +25,7 @@
 #include "u_mem.h"
 #include "console.h"
 
-inline namespace dcx {
+namespace dcx {
 
 namespace {
 

common/arch/sdl/event.cpp

@@ -25,7 +25,7 @@
 #include "joy.h"
 #include "args.h"
 
-inline namespace dcx {
+namespace dcx {
 
 void event_poll()
 {

common/arch/sdl/joy.cpp

@@ -26,7 +26,7 @@
 #include "compiler-integer_sequence.h"
 #include "compiler-type_traits.h"
 
-inline namespace dcx {
+namespace dcx {
 
 namespace {
 

common/arch/sdl/key.cpp

@@ -28,7 +28,7 @@
 #include "dxxsconf.h"
 #include "compiler-array.h"
 
-inline namespace dcx {
+namespace dcx {
 
 //-------- Variable accessed by outside functions ---------
 static bool keyd_repeat; // 1 = use repeats, 0 no repeats

common/arch/sdl/mouse.cpp

@@ -23,7 +23,7 @@
 #include "args.h"
 #include "gr.h"
 
-inline namespace dcx {
+namespace dcx {
 
 namespace {
 

common/arch/sdl/rbaudio.cpp

@@ -31,7 +31,7 @@
 #include "partial_range.h"
 #include "compiler-range_for.h"
 
-inline namespace dcx {
+namespace dcx {
 
 #define REDBOOK_VOLUME_SCALE 255
 

common/arch/sdl/timer.cpp

@@ -17,7 +17,7 @@
 #include "config.h"
 #include "multi.h"
 
-inline namespace dcx {
+namespace dcx {
 
 static fix64 F64_RunTime = 0;
 

common/arch/sdl/window.cpp

@@ -20,7 +20,7 @@
 #include "dxxerror.h"
 #include "event.h"
 
-inline namespace dcx {
+namespace dcx {
 
 struct window
 {

common/arch/win32/messagebox.cpp

@@ -17,7 +17,7 @@
 #include "event.h"
 #include "messagebox.h"
 
-inline namespace dcx {
+namespace dcx {
 
 static void display_win32_alert(const char *message, int error)
 {

common/editor/autosave.cpp

@@ -39,7 +39,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "ui.h"
 #include "strutil.h"
 
-inline namespace dcx {
+namespace dcx {
 
 #define AUTOSAVE_PERIOD 5			// Number of minutes for timed autosave
 

common/editor/func.cpp

@@ -30,7 +30,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "func.h"
 #include "strutil.h"
 
-inline namespace dcx {
+namespace dcx {
 
 #define MAX_PARAMS 10
 

common/include/3d.h

@@ -36,7 +36,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 struct grs_bitmap;
 
 #ifdef EDITOR
-inline namespace dcx {
+namespace dcx {
 extern int g3d_interp_outline;      //if on, polygon models outlined in white
 }
 #endif
@@ -107,7 +107,7 @@ struct g3s_object {
 
 //Frame setup functions:
 
-inline namespace dcx {
+namespace dcx {
 
 #ifdef OGL
 typedef const g3s_point cg3s_point;
@@ -157,7 +157,7 @@ bool g3_check_normal_facing(const vms_vector &v,const vms_vector &norm);
 //returns codes_and & codes_or of a list of points numbers
 g3s_codes g3_check_codes(int nv,g3s_point **pointlist);
 
-inline namespace dcx {
+namespace dcx {
 
 //rotates a point. returns codes.  does not check if already rotated
 ubyte g3_rotate_point(g3s_point &dest,const vms_vector &src);

common/include/args.h

@@ -59,7 +59,7 @@ typedef enum {
 #include "pack.h"
 #include "compiler-type_traits.h"
 
-inline namespace dcx {
+namespace dcx {
 struct CArg : prohibit_void_ptr<CArg>
 {
 	bool CtlNoCursor;

common/include/digi_mixer_music.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #ifdef __cplusplus
-inline namespace dcx {
+namespace dcx {
 
 int mix_play_music(const char *, int);
 int mix_play_file(const char *, int, void (*)());

common/include/dxxerror.h

@@ -39,7 +39,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #define __noreturn
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 int error_init(void (*func)(const char *));    //init error system, returns 0=ok
 void Warning_puts(const char *str) __attribute_nonnull();

common/include/editor/editor.h

@@ -173,7 +173,7 @@ extern	struct window *Pad_info;		// Keypad text
 
 extern	int		Show_axes_flag;		// 0 = don't show, !0 = do show coordinate axes in *Cursegp orientation
 
-inline namespace dcx {
+namespace dcx {
 extern   int		Autosave_count;		// Current counter for which autosave mine we are "on"
 extern	int		Autosave_flag;			// Whether or not Autosave is on.
 extern	struct tm Editor_time_of_day;
@@ -450,7 +450,7 @@ extern	int	Lock_view_to_cursegp;			// !0 means whenever cursegp changes, view it
 extern	int	Num_tilings;						// number of tilings/wall
 extern	int	Degenerate_segment_found;
 
-inline namespace dcx {
+namespace dcx {
 
 // Initializes autosave system.
 // Sets global Autosave_count to 0.

common/include/event.h

@@ -12,7 +12,7 @@
 #include "maths.h"
 
 #ifdef __cplusplus
-inline namespace dcx {
+namespace dcx {
 
 enum event_type : unsigned
 {

common/include/func.h

@@ -21,7 +21,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #ifdef __cplusplus
 
-inline namespace dcx {
+namespace dcx {
 typedef struct {
 	const char *  name;
 	int     nparams;

common/include/fwd-event.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-inline namespace dcx {
+namespace dcx {
 
 struct d_event;
 struct d_create_event;

common/include/fwd-gr.h

@@ -88,7 +88,7 @@ union screen_mode;
 
 class grs_screen;
 
-inline namespace dcx {
+namespace dcx {
 
 struct grs_main_canvas;
 typedef std::unique_ptr<grs_main_canvas> grs_canvas_ptr;
@@ -116,7 +116,7 @@ void gr_close();
 }
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 grs_canvas_ptr gr_create_canvas(uint16_t w, uint16_t h);
 
@@ -182,7 +182,7 @@ void gr_use_palette_table(const char * filename);
 //=========================================================================
 // Drawing functions:
 
-inline namespace dcx {
+namespace dcx {
 
 // Sets the color in the current canvas.
 void gr_setcolor(color_t color);
@@ -264,7 +264,7 @@ void gr_remap_color_fonts();
 #endif
 
 // Writes a string using current font. Returns the next column after last char.
-inline namespace dcx {
+namespace dcx {
 void gr_set_curfont(const grs_font *);
 void gr_set_fontcolor(int fg_color, int bg_color);
 void gr_string(int x, int y, const char *s);
@@ -277,7 +277,7 @@ void gr_uprintf(int x, int y, const char * format, ...) __attribute_format_print
 void gr_get_string_size(const char *s, int *string_width, int *string_height, int *average_width);
 }
 
-inline namespace dcx {
+namespace dcx {
 
 // From scale.c
 void scale_bitmap(const grs_bitmap &bp, const array<grs_point, 3> &vertbuf, int orientation);
@@ -336,7 +336,7 @@ extern uint16_t gr_fade_table_selector;
 
 // Same as above, but searches using gr_find_closest_color which uses
 // 18-bit accurracy instead of 15bit when translating colors.
-inline namespace dcx {
+namespace dcx {
 void gr_remap_bitmap_good(grs_bitmap &bmp, palette_array_t &palette, uint_fast32_t transparent_color, uint_fast32_t super_transparent_color);
 
 void gr_palette_step_up(int r, int g, int b);
@@ -367,7 +367,7 @@ void gr_toggle_fullscreen();
 
 }
 #endif
-inline namespace dcx {
+namespace dcx {
 void ogl_do_palfx();
 void ogl_init_pixel_buffers(unsigned w, unsigned h);
 void ogl_close_pixel_buffers();

common/include/fwd-vecmat.h

@@ -8,7 +8,7 @@
 #include "maths.h"
 #include "dxxsconf.h"
 
-inline namespace dcx {
+namespace dcx {
 
 struct vms_vector;
 class vm_distance_squared;

common/include/fwd-window.h

@@ -16,7 +16,7 @@ inline namespace dsx {
 void arch_init();
 }
 #endif
-inline namespace dcx {
+namespace dcx {
 
 struct window;
 enum class window_event_result : uint8_t;

common/include/gr.h

@@ -183,7 +183,7 @@ public:
 // Makes a new canvas. allocates memory for the canvas and its bitmap,
 // including the raw pixel buffer.
 
-inline namespace dcx {
+namespace dcx {
 
 struct grs_main_canvas : grs_canvas
 {
@@ -231,7 +231,7 @@ static inline void gr_set_transparent(grs_bitmap &bm, bool bTransparent)
 	gr_set_bitmap_flags(bm, bTransparent ? bm_flags | BM_FLAG_TRANSPARENT : bm_flags & ~BM_FLAG_TRANSPARENT);
 }
 
-inline namespace dcx {
+namespace dcx {
 struct font_delete
 {
 	void operator()(grs_font *p) const

common/include/hash.h

@@ -22,7 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #include <map>
 
-inline namespace dcx {
+namespace dcx {
 
 struct hashtable
 {

common/include/hmp.h

@@ -16,7 +16,7 @@
 #include "physfsx.h"
 
 #ifdef __cplusplus
-inline namespace dcx {
+namespace dcx {
 
 #define HMP_TRACKS 32
 #ifdef _WIN32

common/include/ignorecase.h

@@ -54,7 +54,7 @@
 
 #ifdef __cplusplus
 
-inline namespace dcx {
+namespace dcx {
 
 /**
  * \fn int PHYSFSEXT_locateCorrectCase(char *buf)

common/include/internal.h

@@ -21,7 +21,7 @@ void ogl_init_texture_list_internal(void);
 void ogl_smash_texture_list_internal(void);
 void ogl_vivify_texture_list_internal(void);
 
-inline namespace dcx {
+namespace dcx {
 extern int linedotscale;
 
 extern int GL_TEXTURE_2D_enabled;
@@ -37,7 +37,7 @@ extern int GL_TEXTURE_2D_enabled;
 //#define OGL_TEXENV(p,m) OGL_SETSTATE(p,m,glTexEnvi(GL_TEXTURE_ENV, p,m));
 //#define OGL_TEXPARAM(p,m) OGL_SETSTATE(p,m,glTexParameteri(GL_TEXTURE_2D,p,m))
 
-inline namespace dcx {
+namespace dcx {
 extern unsigned last_width,last_height;
 static inline void OGL_VIEWPORT(const unsigned x, const unsigned y, const unsigned w, const unsigned h)
 {

common/include/interp.h

@@ -20,7 +20,7 @@
 #include "dxxsconf.h"
 #include "compiler-array.h"
 
-inline namespace dcx {
+namespace dcx {
 class submodel_angles;
 
 const std::size_t MAX_POLYGON_VECS = 1000;
@@ -63,7 +63,7 @@ int g3_poly_get_color(const uint8_t *model_ptr);
 }
 #endif
 
-inline namespace dcx {
+namespace dcx {
 #ifdef WORDS_BIGENDIAN
 // routine to convert little to big endian in polygon model data
 void swap_polygon_model_data(ubyte *data);

common/include/joy.h

@@ -19,7 +19,7 @@
 #include "maths.h"
 #include <SDL.h>
 
-inline namespace dcx {
+namespace dcx {
 
 struct d_event;
 
@@ -45,7 +45,7 @@ extern int event_joystick_get_button(const d_event &event);
 #define joy_close()
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 #if MAX_BUTTONS_PER_JOYSTICK
 extern void joy_button_handler(SDL_JoyButtonEvent *jbe);

common/include/jukebox.h

@@ -12,7 +12,7 @@
 #ifdef __cplusplus
 
 #if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
-inline namespace dcx {
+namespace dcx {
 extern const array<file_extension_t, 5> jukebox_exts;
 
 void jukebox_unload();

common/include/key.h

@@ -41,7 +41,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 struct SDL_KeyboardEvent;
 
-inline namespace dcx {
+namespace dcx {
 
 //==========================================================================
 // This installs the int9 vector and initializes the keyboard in buffered

common/include/maths.h

@@ -21,7 +21,7 @@
 #include "dxxsconf.h"
 #include "compiler-array.h"
 
-inline namespace dcx {
+namespace dcx {
 
 void d_srand (unsigned int seed);
 __attribute_warn_unused_result

common/include/messagebox.h

@@ -15,7 +15,7 @@
 #pragma once
 
 #ifdef __cplusplus
-inline namespace dcx {
+namespace dcx {
 
 // Display a warning in a messagebox
 extern void msgbox_warning(const char *message);

common/include/mouse.h

@@ -23,7 +23,7 @@
 struct SDL_MouseButtonEvent;
 struct SDL_MouseMotionEvent;
 
-inline namespace dcx {
+namespace dcx {
 
 #define MOUSE_MAX_BUTTONS       16
 #define Z_SENSITIVITY		100

common/include/ogl_extensions.h

@@ -47,7 +47,7 @@ typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuin
 #define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
 #define GL_TIMEOUT_EXPIRED                0x911B
 
-inline namespace dcx {
+namespace dcx {
 
 extern bool ogl_have_ARB_sync;
 extern PFNGLFENCESYNCPROC glFenceSyncFunc;

common/include/ogl_init.h

@@ -78,7 +78,7 @@ void ogl_init_texture(ogl_texture &t, int w, int h, int flags);
 
 void ogl_init_shared_palette(void);
 
-inline namespace dcx {
+namespace dcx {
 extern GLfloat ogl_maxanisotropy;
 
 #define OGL_FLAG_MIPMAP (1 << 0)
@@ -120,7 +120,7 @@ static inline void g3_draw_tmap_2(unsigned nv, const array<cg3s_point *, N> &poi
 }
 
 void ogl_draw_vertex_reticle(int cross,int primary,int secondary,int color,int alpha,int size_offs);
-inline namespace dcx {
+namespace dcx {
 void ogl_toggle_depth_test(int enable);
 void ogl_set_blending();
 unsigned pow2ize(unsigned x);//from ogl.c

common/include/ogl_sync.h

@@ -17,7 +17,7 @@
 #include "args.h"
 #include "ogl_extensions.h"
 
-inline namespace dcx {
+namespace dcx {
 
 class ogl_sync {
 	class sync_deleter

common/include/palette.h

@@ -58,13 +58,13 @@ extern int gr_palette_get_gamma();
 void gr_palette_load( palette_array_t &pal );
 }
 #endif
-inline namespace dcx {
+namespace dcx {
 color_t gr_find_closest_color_current( int r, int g, int b );
 }
 #ifndef OGL
 void gr_palette_read(palette_array_t &palette);
 #endif
-inline namespace dcx {
+namespace dcx {
 extern void init_computed_colors(void);
 extern ubyte gr_palette_gamma;
 extern palette_array_t gr_current_pal;

common/include/pcx.h

@@ -49,7 +49,7 @@ extern int bald_guy_load( const char * filename, grs_bitmap * bmp,int bitmap_typ
 }
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 // Reads filename into bitmap bmp, and fills in palette.  If bmp->bm_data==NULL,
 // then bmp->bm_data is allocated and the w,h are filled.

common/include/physfs_list.h

@@ -18,7 +18,7 @@ typedef char file_extension_t[5];
 #include "dxxsconf.h"
 #include "compiler-array.h"
 
-inline namespace dcx {
+namespace dcx {
 
 class PHYSFS_list_deleter
 {

common/include/physfsx.h

@@ -69,7 +69,7 @@
 	((void)(DXX_PHYSFS_CHECK_WRITE_ELEMENT_SIZE_CONSTANT(S,C),	\
 	DXX_PHYSFS_CHECK_WRITE_SIZE_ARRAY_SIZE(S,C), 0))	\
 
-inline namespace dcx {
+namespace dcx {
 
 template <typename V>
 __attribute_always_inline()

common/include/rbaudio.h

@@ -22,7 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #define RBA_MEDIA_CHANGED	-1
 
 #ifdef __cplusplus
-inline namespace dcx {
+namespace dcx {
 
 struct RBACHANNELCTL
 {

common/include/rle.h

@@ -61,7 +61,7 @@ static inline rle_position_t rle_end(const T1 &src, T2 &dst)
 	return {end(src), end(dst)};
 }
 
-inline namespace dcx {
+namespace dcx {
 rle_position_t gr_rle_decode(rle_position_t b, const rle_position_t e);
 int gr_bitmap_rle_compress(grs_bitmap &bmp);
 void gr_rle_expand_scanline_masked(uint8_t *dest, const uint8_t *src, int x1, int x2);

common/include/strutil.h

@@ -13,7 +13,7 @@
 #include "dxxsconf.h"
 #include <vector>
 
-inline namespace dcx {
+namespace dcx {
 
 #if defined(macintosh)
 #define snprintf macintosh_snprintf

common/include/texmap.h

@@ -39,7 +39,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "dxxsconf.h"
 #include "compiler-array.h"
 
-inline namespace dcx {
+namespace dcx {
 
 const unsigned MAX_TMAP_VERTS = 25;
 

common/include/timer.h

@@ -16,7 +16,7 @@
 #include "maths.h"
 
 #ifdef __cplusplus
-inline namespace dcx {
+namespace dcx {
 
 fix64 timer_update();
 __attribute_warn_unused_result

common/include/u_mem.h

@@ -36,7 +36,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #define DXX_DEBUG_BIAS_MEMORY_ALLOCATION (0)
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 #ifdef DEBUG_MEMORY_ALLOCATIONS
 void mem_init(void);

common/include/ui.h

@@ -43,7 +43,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 struct grs_bitmap;
 struct grs_font;
 
-inline namespace dcx {
+namespace dcx {
 
 struct UI_KEYPAD {
 	typedef array<char, 100> buttontext_element_t;

common/include/vecmat.h

@@ -31,7 +31,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <utility>
 #include "fwd-vecmat.h"
 
-inline namespace dcx {
+namespace dcx {
 
 //The basic fixed-point vector.  Access elements by name or position
 struct vms_vector

common/include/window.h

@@ -21,7 +21,7 @@
 
 #ifdef __cplusplus
 #include "fwd-window.h"
-inline namespace dcx {
+namespace dcx {
 
 enum class window_event_result : uint8_t
 {

common/main/ai.h

@@ -41,7 +41,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "aistruct.h"
 #endif
 
-inline namespace dcx {
+namespace dcx {
 struct point_seg;
 }
 struct PHYSFS_File;
@@ -267,7 +267,7 @@ void buddy_message(const char * format, ... ) __attribute_format_printf(1, 2);
 extern void special_reactor_stuff(void);
 #endif
 
-inline namespace dcx {
+namespace dcx {
 struct point_seg_array_t : public array<point_seg, MAX_POINT_SEGS> {};
 extern point_seg_array_t        Point_segs;
 extern point_seg_array_t::iterator        Point_segs_free_ptr;

common/main/aistruct.h

@@ -40,7 +40,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #define MAX_SEGMENTS_PER_PATH       20
 
-inline namespace dcx {
+namespace dcx {
 
 enum class player_awareness_type_t : uint8_t
 {
@@ -313,7 +313,7 @@ struct ai_cloak_info_rw
 }
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 struct point_seg : prohibit_void_ptr<point_seg> {
 	segnum_t         segnum;

common/main/automap.h

@@ -33,7 +33,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "dxxsconf.h"
 #include "compiler-array.h"
 
-inline namespace dcx {
+namespace dcx {
 extern int Automap_active;
 }
 #if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
@@ -42,7 +42,7 @@ void do_automap();
 extern void automap_clear_visited();
 }
 #endif
-inline namespace dcx {
+namespace dcx {
 extern array<ubyte, MAX_SEGMENTS> Automap_visited;
 }
 

common/main/config.h

@@ -35,7 +35,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "compiler-array.h"
 #include "ntstring.h"
 
-inline namespace dcx {
+namespace dcx {
 struct CCfg : prohibit_void_ptr<CCfg>
 {
 	bool VSync;

common/main/fwd-object.h

@@ -105,7 +105,7 @@ const physics_flag_t PF_FREE_SPINNING = 0x100;   // Drag does not apply to rotat
 const physics_flag_t PF_BOUNCES_TWICE = 0x200;   // This weapon bounces twice, then dies
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 typedef unsigned powerup_flag_t;
 const powerup_flag_t PF_SPAT_BY_PLAYER = 1;   //this powerup was spat by the player

common/main/fwd-player.h

@@ -68,7 +68,7 @@ struct callsign_t;
 
 struct player_ship;
 
-inline namespace dcx {
+namespace dcx {
 typedef unsigned playernum_t;
 typedef array<playernum_t, MAX_PLAYERS> playernum_array_t;
 

common/main/fwd-segment.h

@@ -18,7 +18,7 @@
 #include "dxxsconf.h"
 #include "compiler-array.h"
 
-inline namespace dcx {
+namespace dcx {
 constexpr std::size_t MAX_SEGMENTS = 9000;
 }
 #if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
@@ -32,7 +32,7 @@ static constexpr valptridx<segment>::magic_constant<0> segment_first{};
 }
 #endif
 
-inline namespace dcx {
+namespace dcx {
 const std::size_t MAX_VERTICES_PER_SEGMENT = 8;
 const std::size_t MAX_SIDES_PER_SEGMENT = 6;
 const std::size_t MAX_VERTICES_PER_POLY = 4;
@@ -93,7 +93,7 @@ const segment_type_t SEGMENT_IS_GOAL_RED = 6;
 const std::size_t MAX_CENTER_TYPES = 7;
 #endif
 
-inline namespace dcx {
+namespace dcx {
 struct count_segment_array_t;
 struct group;
 
@@ -142,7 +142,7 @@ void dl_index_write(dl_index *di, PHYSFS_file *fp);
 }
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 template <typename T, unsigned bits>
 class visited_segment_mask_t;

common/main/fwd-wall.h

@@ -128,7 +128,7 @@ const auto WID_CLOAKED_WALL        = WALL_IS_DOORWAY_sresult(WID_RENDER_FLAG | W
 #endif
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 template <int16_t I>
 struct wall_magic_constant_t

common/main/gamepal.h

@@ -27,7 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #ifdef __cplusplus
 
-inline namespace dcx {
+namespace dcx {
 template <std::size_t>
 struct PHYSFSX_gets_line_t;
 }

common/main/gameseq.h

@@ -32,7 +32,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 struct player;
 
-inline namespace dcx {
+namespace dcx {
 template <std::size_t>
 struct PHYSFSX_gets_line_t;
 
@@ -123,7 +123,7 @@ void editor_reset_stuff_on_level();
 // Show endlevel bonus scores
 extern void DoEndLevelScoreGlitz(int network);
 
-inline namespace dcx {
+namespace dcx {
 // stuff for multiplayer
 extern unsigned NumNetPlayerPositions;
 extern fix StartingShields;

common/main/hostage.h

@@ -61,7 +61,7 @@ static inline void hostage_init_info(const objnum_t &) {}
 #endif
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 extern unsigned N_hostage_types;
 extern array<int, MAX_HOSTAGE_TYPES> Hostage_vclip_num;    // for each type of hostage

common/main/inferno.h

@@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "fwd-event.h"
 #include "ntstring.h"
 
-inline namespace dcx {
+namespace dcx {
 
 #if defined(__APPLE__) || defined(macintosh)
 #define KEY_MAC(x) x

common/main/multi.h

@@ -62,7 +62,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "compiler-static_assert.h"
 #include "compiler-type_traits.h"
 
-inline namespace dcx {
+namespace dcx {
 
 struct _sockaddr
 {
@@ -358,7 +358,7 @@ extern const array<char[MULTI_GAME_NAME_LENGTH], MULTI_GAME_TYPE_COUNT> GMNames;
 extern const array<char[8], MULTI_GAME_TYPE_COUNT> GMNamesShrt;
 }
 
-inline namespace dcx {
+namespace dcx {
 extern ubyte multibuf[MAX_MULTI_MESSAGE_LEN+4];
 extern array<objnum_t, MAX_NET_CREATE_OBJECTS> Net_create_objnums;
 extern unsigned Net_create_loc;
@@ -515,7 +515,7 @@ void multi_send_player_deres(deres_type_t type);
 void multi_send_reappear();
 void multi_send_create_explosion(playernum_t);
 void multi_send_controlcen_fire(const vms_vector &to_target, int gun_num, objnum_t objnum);
-inline namespace dcx {
+namespace dcx {
 void multi_send_cloak(void);
 void multi_send_decloak(void);
 }
@@ -592,7 +592,7 @@ void multi_send_got_flag (playernum_t);
 
 // Exported variables
 
-inline namespace dcx {
+namespace dcx {
 extern int Network_status;
 
 // IMPORTANT: These variables needed for player rejoining done by protocol-specific code
@@ -638,7 +638,7 @@ extern array<grs_main_bitmap, 2> Orb_icons;
 extern int PhallicLimit,PhallicMan;
 }
 #endif
-inline namespace dcx {
+namespace dcx {
 extern int Bounty_target;
 
 extern array<array<bitmap_index, N_PLAYER_SHIP_TEXTURES>, MAX_PLAYERS> multi_player_textures;
@@ -679,7 +679,7 @@ struct bit_game_flags {
 } __pack__;
 }
 
-inline namespace dcx {
+namespace dcx {
 struct packed_game_flags
 {
 	unsigned char value;

common/main/object.h

@@ -108,7 +108,7 @@ struct player_info
 
 }
 
-inline namespace dcx {
+namespace dcx {
 
 // A compressed form for sending crucial data
 struct shortpos
@@ -230,7 +230,7 @@ struct laser_info : prohibit_void_ptr<laser_info>, laser_parent
 
 }
 
-inline namespace dcx {
+namespace dcx {
 
 // Same as above but structure Savegames/Multiplayer objects expect
 struct laser_info_rw
@@ -297,7 +297,7 @@ struct powerup_info_rw
 
 }
 
-inline namespace dcx {
+namespace dcx {
 
 struct vclip_info : prohibit_void_ptr<vclip_info>
 {
@@ -401,7 +401,7 @@ struct object {
 
 }
 
-inline namespace dcx {
+namespace dcx {
 
 // Same as above but structure Savegames/Multiplayer objects expect
 struct object_rw

common/main/polyobj.h

@@ -56,7 +56,7 @@ extern array<int, MAX_POLYGON_MODELS> Dying_modelnums, Dead_modelnums;
 #endif
 #define MAX_SUBMODELS 10
 
-inline namespace dcx {
+namespace dcx {
 
 //used to describe a polygon model
 struct polymodel : prohibit_void_ptr<polymodel>
@@ -145,7 +145,7 @@ static const unsigned N_D2_POLYGON_MODELS = 166;
 extern array<grs_bitmap *, MAX_POLYOBJ_TEXTURES> texture_list;
 #endif
 
-inline namespace dcx {
+namespace dcx {
 /*
  * reads a polymodel structure from a PHYSFS_file
  */

common/main/segment.h

@@ -44,7 +44,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "compiler-type_traits.h"
 #include "fwd-segment.h"
 
-inline namespace dcx {
+namespace dcx {
 
 #if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
 // Returns true if segnum references a child, else returns false.
@@ -181,7 +181,7 @@ struct segment {
 }
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 struct count_segment_array_t : public count_array_t<segnum_t, MAX_SEGMENTS> {};
 
@@ -206,7 +206,7 @@ struct group
 DEFINE_VALPTRIDX_SUBTYPE(seg, segment, segnum_t, Segments);
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 // Globals from mglobal.c
 struct vertex : vms_vector
@@ -279,7 +279,7 @@ struct dl_index {
 }
 #endif
 
-inline namespace dcx {
+namespace dcx {
 
 template <typename T, unsigned bits>
 class visited_segment_mask_t

common/main/titles.h

@@ -28,7 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifdef __cplusplus
 #include <cstdint>
 
-inline namespace dcx {
+namespace dcx {
 
 struct d_fname;
 

common/maths/fixc.cpp

@@ -18,7 +18,7 @@
 #include "dxxerror.h"
 #include "maths.h"
 
-inline namespace dcx {
+namespace dcx {
 
 #define EPSILON (F1_0/100)
 

common/maths/rand.cpp

@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include "maths.h"
 
-inline namespace dcx {
+namespace dcx {
 
 #ifdef NO_WATCOM_RAND
 

common/maths/tables.cpp

@@ -13,7 +13,7 @@
 
 #include "maths.h"
 
-inline namespace dcx {
+namespace dcx {
 
 const array<ubyte, 256> guess_table{{
 	1,

common/maths/vecmat.cpp

@@ -19,7 +19,7 @@
 #include "vecmat.h"
 #include "dxxerror.h"
 
-inline namespace dcx {
+namespace dcx {
 
 //#define USE_ISQRT 1
 

common/mem/mem.cpp

@@ -33,7 +33,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "console.h"
 #include "u_mem.h"
 
-inline namespace dcx {
+namespace dcx {
 
 #define MEMSTATS 0
 #define FULL_MEM_CHECKING 1