Skip to content

Commit bbba978

Browse files
committed
Fixed -Wreserved-identifier warnings with clang v13
1 parent e2532ab commit bbba978

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

Inc/DirectXCollision.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ namespace DirectX
185185
BoundingOrientedBox(BoundingOrientedBox&&) = default;
186186
BoundingOrientedBox& operator=(BoundingOrientedBox&&) = default;
187187

188-
constexpr BoundingOrientedBox(_In_ const XMFLOAT3& _Center, _In_ const XMFLOAT3& _Extents, _In_ const XMFLOAT4& _Orientation) noexcept
189-
: Center(_Center), Extents(_Extents), Orientation(_Orientation) {}
188+
constexpr BoundingOrientedBox(_In_ const XMFLOAT3& center, _In_ const XMFLOAT3& extents, _In_ const XMFLOAT4& orientation) noexcept
189+
: Center(center), Extents(extents), Orientation(orientation) {}
190190

191191
// Methods
192192
void XM_CALLCONV Transform(_Out_ BoundingOrientedBox& Out, _In_ FXMMATRIX M) const noexcept;
@@ -254,12 +254,12 @@ namespace DirectX
254254
BoundingFrustum(BoundingFrustum&&) = default;
255255
BoundingFrustum& operator=(BoundingFrustum&&) = default;
256256

257-
constexpr BoundingFrustum(_In_ const XMFLOAT3& _Origin, _In_ const XMFLOAT4& _Orientation,
258-
_In_ float _RightSlope, _In_ float _LeftSlope, _In_ float _TopSlope, _In_ float _BottomSlope,
259-
_In_ float _Near, _In_ float _Far) noexcept
260-
: Origin(_Origin), Orientation(_Orientation),
261-
RightSlope(_RightSlope), LeftSlope(_LeftSlope), TopSlope(_TopSlope), BottomSlope(_BottomSlope),
262-
Near(_Near), Far(_Far) {}
257+
constexpr BoundingFrustum(_In_ const XMFLOAT3& origin, _In_ const XMFLOAT4& orientation,
258+
_In_ float rightSlope, _In_ float leftSlope, _In_ float topSlope, _In_ float bottomSlope,
259+
_In_ float nearPlane, _In_ float farPlane) noexcept
260+
: Origin(origin), Orientation(orientation),
261+
RightSlope(rightSlope), LeftSlope(leftSlope), TopSlope(topSlope), BottomSlope(bottomSlope),
262+
Near(nearPlane), Far(farPlane) {}
263263
BoundingFrustum(_In_ CXMMATRIX Projection, bool rhcoords = false) noexcept;
264264

265265
// Methods

SHMath/DirectXSHD3D11.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ namespace
9898
#pragma warning(disable : 6101)
9999
#endif
100100
_Success_(return)
101-
bool _LoadScanline(
101+
bool LoadScanline(
102102
_Out_writes_(count) DirectX::XMVECTOR* pDestination,
103103
size_t count,
104104
_In_reads_bytes_(size) LPCVOID pSource,
@@ -214,7 +214,7 @@ HRESULT DirectX::SHProjectCubeMap(
214214
case DXGI_FORMAT_R16G16_FLOAT:
215215
case DXGI_FORMAT_R32_FLOAT:
216216
case DXGI_FORMAT_R16_FLOAT:
217-
// See _LoadScanline to support more pixel formats
217+
// See LoadScanline to support more pixel formats
218218
break;
219219

220220
default:
@@ -293,7 +293,7 @@ HRESULT DirectX::SHProjectCubeMap(
293293
for (UINT y = 0; y < desc.Height; ++y)
294294
{
295295
XMVECTOR* ptr = scanline.get();
296-
if (!_LoadScanline(ptr, desc.Width, pSrc, mapped.RowPitch, desc.Format))
296+
if (!LoadScanline(ptr, desc.Width, pSrc, mapped.RowPitch, desc.Format))
297297
{
298298
context->Unmap(texture, dindex);
299299
return E_FAIL;

SHMath/DirectXSHD3D12.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ namespace
9393
#pragma warning(disable : 6101)
9494
#endif
9595
_Success_(return)
96-
bool _LoadScanline(
96+
bool LoadScanline(
9797
_Out_writes_(count) DirectX::XMVECTOR* pDestination,
9898
size_t count,
9999
_In_reads_bytes_(size) LPCVOID pSource,
@@ -204,7 +204,7 @@ HRESULT DirectX::SHProjectCubeMap(
204204
case DXGI_FORMAT_R16G16_FLOAT:
205205
case DXGI_FORMAT_R32_FLOAT:
206206
case DXGI_FORMAT_R16_FLOAT:
207-
// See _LoadScanline to support more pixel formats
207+
// See LoadScanline to support more pixel formats
208208
break;
209209

210210
default:
@@ -252,7 +252,7 @@ HRESULT DirectX::SHProjectCubeMap(
252252
for (UINT y = 0; y < desc.Height; ++y)
253253
{
254254
XMVECTOR* ptr = scanline.get();
255-
if (!_LoadScanline(ptr, static_cast<size_t>(desc.Width), pSrc, static_cast<size_t>(cubeMap[face].RowPitch), desc.Format))
255+
if (!LoadScanline(ptr, static_cast<size_t>(desc.Width), pSrc, static_cast<size_t>(cubeMap[face].RowPitch), desc.Format))
256256
{
257257
return E_FAIL;
258258
}

0 commit comments

Comments
 (0)