Skip to content

Commit cba90d9

Browse files
committed
Fix warning: extra tokens at end of #else or #endif directive
1 parent 8e3d1c6 commit cba90d9

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#ifndef STEP_JOINT_INTERNAL_H
22
#define STEP_JOINT_INTERNAL_H
33
void dInternalStepJointContact (dxWorld * world, dxBody * body[2], dReal * GI[2], dReal * GinvI[2], dxJoint * joint, dxJoint::Info1 info, dxJoint::Info2 Jinfo, dReal stepsize);
4-
#endif STEP_JOINT_INTERNAL_H
4+
#endif // STEP_JOINT_INTERNAL_H

src/Layers/xrRender/FSkinned.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ void CSkeletonX_ext::_FillVertices(const Fmatrix& view, CSkeletonWallmark& wm, c
13821382
u16* indices = nullptr;
13831383
#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
13841384
indices = *m_Indices;
1385-
#else // USE_DX10
1385+
#else // USE_DX10
13861386
CHK_DX(V->p_rm_Indices->Lock(0, V->dwPrimitives * 3, (void**)&indices, D3DLOCK_READONLY));
13871387
// fill vertices
13881388
switch (RenderMode)
@@ -1549,7 +1549,7 @@ void CSkeletonX_ext::_EnumBoneVertices(SEnumVerticesCallback& C, Fvisual* V, u16
15491549
#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
15501550
VERIFY(*m_Indices);
15511551
indices = *m_Indices;
1552-
#else USE_DX10
1552+
#else // USE_DX10
15531553
CHK_DX(V->p_rm_Indices->Lock(0, V->dwPrimitives * 3, (void**)&indices, D3DLOCK_READONLY));
15541554
// fill vertices
15551555
void* vertices = nullptr;
@@ -1558,7 +1558,7 @@ void CSkeletonX_ext::_EnumBoneVertices(SEnumVerticesCallback& C, Fvisual* V, u16
15581558
switch (RenderMode)
15591559
{
15601560
case RM_SKINNING_SOFT:
1561-
#endif // USE_DX10
1561+
#endif // USE_DX10
15621562
{
15631563
if (*Vertices1W)
15641564
TEnumBoneVertices(Vertices1W, indices + iBase, *faces, C);

src/Layers/xrRender/R_Backend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,4 +208,4 @@ void CBackend::DestroyConstantBuffers()
208208
_RELEASE(m_pPixelConstants);
209209
}
210210
*/
211-
#endif USE_DX10
211+
#endif // USE_DX10

src/Layers/xrRender/R_Backend_Runtime.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#if defined(USE_DX10) || defined(USE_DX11)
1414
#include "Layers/xrRenderDX10/StateManager/dx10StateManager.h"
1515
#include "Layers/xrRenderDX10/StateManager/dx10ShaderResourceStateCache.h"
16-
#endif USE_DX10
16+
#endif // USE_DX10
1717

1818
void CBackend::OnFrameEnd()
1919
{

src/Layers/xrRender/SkeletonX.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ BOOL pick_bone(CKinematics* Parent, IKinematics::pick_result& r, float dist, con
165165
VERIFY(!"Not implemented");
166166
return FALSE;
167167
}
168-
#else USE_DX10
168+
#else // USE_DX10
169169
template <typename T>
170170
BOOL pick_bone(CKinematics* Parent, IKinematics::pick_result& r, float dist, const Fvector& S, const Fvector& D,
171171
Fvisual* V, u16* indices, CBoneData::FacesVec& faces)

0 commit comments

Comments
 (0)