diff --git a/src/r_3dfloors.cpp b/src/r_3dfloors.cpp index 4289b7843..87c8af618 100644 --- a/src/r_3dfloors.cpp +++ b/src/r_3dfloors.cpp @@ -17,7 +17,7 @@ CVAR(Int, r_3dfloors, true, 0); -namespace swrenderer +namespace swrenderer { // external variables diff --git a/src/r_bsp.cpp b/src/r_bsp.cpp index 9918e62a9..fef7271e1 100644 --- a/src/r_bsp.cpp +++ b/src/r_bsp.cpp @@ -55,7 +55,7 @@ CVAR (Bool, r_drawflat, false, 0) // [RH] Don't texture segs? EXTERN_CVAR(Bool, r_fullbrightignoresectorcolor); -namespace swrenderer +namespace swrenderer { using namespace drawerargs; diff --git a/src/r_bsp.h b/src/r_bsp.h index e4b518e75..e4d70c4cf 100644 --- a/src/r_bsp.h +++ b/src/r_bsp.h @@ -29,7 +29,7 @@ EXTERN_CVAR (Bool, r_drawflat) // [RH] Don't texture segs? -namespace swrenderer +namespace swrenderer { // The 3072 below is just an arbitrary value picked to avoid diff --git a/src/r_draw_rgba.cpp b/src/r_draw_rgba.cpp index 2928ac73e..9f8a0c312 100644 --- a/src/r_draw_rgba.cpp +++ b/src/r_draw_rgba.cpp @@ -58,7 +58,7 @@ CVAR(Bool, r_mipmap, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); // Level of detail texture bias CVAR(Float, r_lod_bias, -1.5, 0); // To do: add CVAR_ARCHIVE | CVAR_GLOBALCONFIG when a good default has been decided -namespace swrenderer +namespace swrenderer { extern "C" short spanend[MAXHEIGHT]; extern float rw_light; diff --git a/src/r_draw_rgba.h b/src/r_draw_rgba.h index 079074068..afb3bc22d 100644 --- a/src/r_draw_rgba.h +++ b/src/r_draw_rgba.h @@ -36,7 +36,7 @@ struct FSpecialColormap; EXTERN_CVAR(Bool, r_mipmap) EXTERN_CVAR(Float, r_lod_bias) -namespace swrenderer +namespace swrenderer { // Give the compiler a strong hint we want these functions inlined: #ifndef FORCEINLINE diff --git a/src/r_drawt_rgba.cpp b/src/r_drawt_rgba.cpp index d5aeed8a9..5d3064e5d 100644 --- a/src/r_drawt_rgba.cpp +++ b/src/r_drawt_rgba.cpp @@ -31,7 +31,7 @@ #include "r_draw_rgba.h" #include "r_drawers.h" -namespace swrenderer +namespace swrenderer { WorkerThreadData DrawColumnRt1LLVMCommand::ThreadData(DrawerThread *thread) { diff --git a/src/r_main.cpp b/src/r_main.cpp index 5242f369f..17b8e682f 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -87,7 +87,7 @@ extern cycle_t FrameCycles; extern bool r_showviewer; -namespace swrenderer +namespace swrenderer { // MACROS ------------------------------------------------------------------ diff --git a/src/r_main.h b/src/r_main.h index c73b59d91..37ead76ce 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -35,7 +35,7 @@ extern int viewwindowy; typedef BYTE lighttable_t; // This could be wider for >8 bit display. -namespace swrenderer +namespace swrenderer { // diff --git a/src/r_plane.cpp b/src/r_plane.cpp index d897ff676..ef9a73540 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -70,7 +70,7 @@ CVAR(Bool, r_skyboxes, true, 0) EXTERN_CVAR(Int, r_skymode) -namespace swrenderer +namespace swrenderer { using namespace drawerargs; diff --git a/src/r_plane.h b/src/r_plane.h index 3a067b527..0e133a7cd 100644 --- a/src/r_plane.h +++ b/src/r_plane.h @@ -27,7 +27,7 @@ class ASkyViewpoint; -namespace swrenderer +namespace swrenderer { // diff --git a/src/r_segs.h b/src/r_segs.h index 6dc08d52c..8f552daee 100644 --- a/src/r_segs.h +++ b/src/r_segs.h @@ -23,7 +23,7 @@ #ifndef __R_SEGS_H__ #define __R_SEGS_H__ -namespace swrenderer +namespace swrenderer { struct drawseg_t; diff --git a/src/r_swrenderer.cpp b/src/r_swrenderer.cpp index 5d94e0442..77cbb28eb 100644 --- a/src/r_swrenderer.cpp +++ b/src/r_swrenderer.cpp @@ -67,7 +67,7 @@ CUSTOM_CVAR(Bool, r_polyrenderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOI } } -namespace swrenderer +namespace swrenderer { void R_SWRSetWindow(int windowSize, int fullWidth, int fullHeight, int stHeight, float trueratio); diff --git a/src/r_things.h b/src/r_things.h index f777488a5..c1ba2bc40 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -28,7 +28,7 @@ struct particle_t; struct FVoxel; -namespace swrenderer +namespace swrenderer { // A vissprite_t is a thing