frameworks/rs: fix typos and clang-tidy warnings

This change fixes a few typos and clang tidy warnings related to the
"llvm-namespace-comment" checks.

Bug: 26936282
Test: WITH_TIDY=1 WITH_TIDY_CHECKS="llvm-namespace-comment" mm
Change-Id: Ic65182e5b4999fbd48d6a8ad7172e4bfeeb541f4
diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h
index 9b703a4..ae7291a 100644
--- a/cpp/rsCppStructs.h
+++ b/cpp/rsCppStructs.h
@@ -3278,10 +3278,10 @@
      * @param TransA The type of transpose applied to matrix A.
      * @param TransB The type of transpose applied to matrix B.
      * @param alpha The scalar alpha.
-     * @param A The input allocation contains matrix A, supported elements type: {Element#F64_2
-     * @param B The input allocation contains matrix B, supported elements type: {Element#F64_2
+     * @param A The input allocation contains matrix A, supported elements type: {Element#F64_2}.
+     * @param B The input allocation contains matrix B, supported elements type: {Element#F64_2}.
      * @param beta The scalar beta.
-     * @param C The input allocation contains matrix C, supported elements type: {Element#F64_2
+     * @param C The input allocation contains matrix C, supported elements type: {Element#F64_2}.
      */
     void ZGEMM(RsBlasTranspose TransA, RsBlasTranspose TransB, Double2 alpha, const sp<Allocation>& A,
                       const sp<Allocation>& B, Double2 beta, const sp<Allocation>& C);
@@ -4351,8 +4351,8 @@
 
 };
 
-}
+} // namespace RSC
 
-}
+} // namespace android
 
 #endif
diff --git a/cpu_ref/rsCpuCore.h b/cpu_ref/rsCpuCore.h
index e33ea10..8c5653f 100644
--- a/cpu_ref/rsCpuCore.h
+++ b/cpu_ref/rsCpuCore.h
@@ -265,7 +265,7 @@
 };
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif
diff --git a/cpu_ref/rsCpuIntrinsic.h b/cpu_ref/rsCpuIntrinsic.h
index 3c0dca0..640a955 100644
--- a/cpu_ref/rsCpuIntrinsic.h
+++ b/cpu_ref/rsCpuIntrinsic.h
@@ -87,7 +87,7 @@
 
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif
diff --git a/cpu_ref/rsCpuIntrinsicBlend.cpp b/cpu_ref/rsCpuIntrinsicBlend.cpp
index 797bff0..1507d45 100644
--- a/cpu_ref/rsCpuIntrinsicBlend.cpp
+++ b/cpu_ref/rsCpuIntrinsicBlend.cpp
@@ -34,8 +34,8 @@
                        uint32_t xend, uint32_t outstep);
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 
 enum {
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index e9b1b0c..a57e359 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -997,5 +997,5 @@
                                   const RsScriptCall *sc) {}
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
diff --git a/cpu_ref/rsCpuScript.h b/cpu_ref/rsCpuScript.h
index d6d100c..c6f9624 100644
--- a/cpu_ref/rsCpuScript.h
+++ b/cpu_ref/rsCpuScript.h
@@ -28,7 +28,7 @@
 
 namespace bcinfo {
     class MetadataExtractor;
-}
+} // namespace bcinfo
 
 namespace android {
 namespace renderscript {
@@ -151,7 +151,7 @@
                                 const char *commandLine,
                                 const char ** bccFiles, size_t numFiles);
 
-}
+} // namespace renderscript
 
 #ifdef __LP64__
 #define SYSLIBPATH "/system/lib64"
@@ -167,6 +167,6 @@
 #define SYSLIBPATH_VENDOR "/system/vendor/lib"
 #endif
 
-}
+} // namespace android
 
 #endif  // RSD_CPU_SCRIPT_H
diff --git a/cpu_ref/rsCpuScriptGroup.h b/cpu_ref/rsCpuScriptGroup.h
index 810488a..a749ea4 100644
--- a/cpu_ref/rsCpuScriptGroup.h
+++ b/cpu_ref/rsCpuScriptGroup.h
@@ -56,7 +56,7 @@
     RsdCpuReferenceImpl *mCtx;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif // RSD_SCRIPT_GROUP_H
diff --git a/cpu_ref/rsd_cpu.h b/cpu_ref/rsd_cpu.h
index 46c1743..130e6ac 100644
--- a/cpu_ref/rsd_cpu.h
+++ b/cpu_ref/rsd_cpu.h
@@ -148,7 +148,7 @@
 };
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif
diff --git a/driver/rsdMeshObj.h b/driver/rsdMeshObj.h
index 58eb1ae..79a1050 100644
--- a/driver/rsdMeshObj.h
+++ b/driver/rsdMeshObj.h
@@ -25,8 +25,8 @@
     class Mesh;
     class Element;
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #include "driver/rsdVertexArray.h"
 
diff --git a/driver/rsdShader.h b/driver/rsdShader.h
index dc31c24..1b5c010 100644
--- a/driver/rsdShader.h
+++ b/driver/rsdShader.h
@@ -27,8 +27,8 @@
 class Context;
 class Program;
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 class RsdShaderCache;
 
diff --git a/driver/rsdShaderCache.h b/driver/rsdShaderCache.h
index 884b1c8..94b66c4 100644
--- a/driver/rsdShaderCache.h
+++ b/driver/rsdShaderCache.h
@@ -22,8 +22,8 @@
 
 class Context;
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 
 #if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB)
diff --git a/driver/rsdVertexArray.h b/driver/rsdVertexArray.h
index 975121b..34a4663 100644
--- a/driver/rsdVertexArray.h
+++ b/driver/rsdVertexArray.h
@@ -24,8 +24,8 @@
 
 class Context;
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 // An element is a group of Components that occupies one cell in a structure.
 class RsdVertexArray {
diff --git a/rsAllocation.h b/rsAllocation.h
index 0f60150..ea9b6fd 100644
--- a/rsAllocation.h
+++ b/rsAllocation.h
@@ -253,6 +253,6 @@
     void packVec3Allocation(Context *rsc, OStream *stream) const;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
diff --git a/rsAnimation.h b/rsAnimation.h
index f77d3cb..6790379 100644
--- a/rsAnimation.h
+++ b/rsAnimation.h
@@ -61,7 +61,7 @@
     float mInputMax;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif //ANDROID_STRUCTURED_ELEMENT_H
 
diff --git a/rsComponent.h b/rsComponent.h
index 4d11718..ca01e68 100644
--- a/rsComponent.h
+++ b/rsComponent.h
@@ -65,8 +65,8 @@
     bool mIsPixel;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif
 
diff --git a/rsContext.h b/rsContext.h
index e36eddb..2755474 100644
--- a/rsContext.h
+++ b/rsContext.h
@@ -388,6 +388,6 @@
 
 void LF_ObjDestroy_handcode(const Context *rsc, RsAsyncVoidPtr objPtr);
 
-} // renderscript
-} // android
+} // namespace renderscript
+} // namespace android
 #endif
diff --git a/rsCppUtils.cpp b/rsCppUtils.cpp
index a92e642..bb63846 100644
--- a/rsCppUtils.cpp
+++ b/rsCppUtils.cpp
@@ -101,5 +101,5 @@
 }
 #endif // RS_COMPATIBILITY_LIB
 
-}
-}
+} // namespace renderscript
+} // namespace android
diff --git a/rsCppUtils.h b/rsCppUtils.h
index f207f2f..a65e877 100644
--- a/rsCppUtils.h
+++ b/rsCppUtils.h
@@ -156,7 +156,7 @@
         }
     };
 
-}
+} // namespace android
 
 typedef int64_t nsecs_t;  // nano-seconds
 
@@ -306,8 +306,8 @@
 #endif
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif //ANDROID_RS_OBJECT_BASE_H
 
diff --git a/rsDevice.h b/rsDevice.h
index ffb514b..be5d94f 100644
--- a/rsDevice.h
+++ b/rsDevice.h
@@ -39,6 +39,6 @@
     Vector<Context *> mContexts;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
diff --git a/rsElement.h b/rsElement.h
index d8f101b..cc1b5e4 100644
--- a/rsElement.h
+++ b/rsElement.h
@@ -174,6 +174,6 @@
 };
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif //ANDROID_STRUCTURED_ELEMENT_H
diff --git a/rsFBOCache.h b/rsFBOCache.h
index abb84de..07b830c 100644
--- a/rsFBOCache.h
+++ b/rsFBOCache.h
@@ -63,7 +63,7 @@
 
 };
 
-} // renderscript
-} // android
+} // namespace renderscript
+} // namespace android
 
 #endif //ANDROID_FRAME_BUFFER_OBJECT_CACHE_H
diff --git a/rsFifo.h b/rsFifo.h
index 911f446..cebfc79 100644
--- a/rsFifo.h
+++ b/rsFifo.h
@@ -44,6 +44,6 @@
 
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
diff --git a/rsFifoSocket.h b/rsFifoSocket.h
index cac0a75..758a4d3 100644
--- a/rsFifoSocket.h
+++ b/rsFifoSocket.h
@@ -48,7 +48,7 @@
     bool mShutdown;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif
diff --git a/rsFileA3D.h b/rsFileA3D.h
index bb272e6..dde2c9a 100644
--- a/rsFileA3D.h
+++ b/rsFileA3D.h
@@ -94,8 +94,8 @@
 };
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif //ANDROID_RS_FILE_A3D_H
 
 
diff --git a/rsFont.cpp b/rsFont.cpp
index 903328b..cd186c2 100644
--- a/rsFont.cpp
+++ b/rsFont.cpp
@@ -875,5 +875,5 @@
     return newFont;
 }
 
-} // renderscript
-} // android
+} // namespace renderscript
+} // namespace android
diff --git a/rsFont.h b/rsFont.h
index 3be5c3c..84223e6 100644
--- a/rsFont.h
+++ b/rsFont.h
@@ -253,7 +253,7 @@
                         float u4, float v4);
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif
diff --git a/rsMatrix2x2.h b/rsMatrix2x2.h
index f908c0c..cff2c35 100644
--- a/rsMatrix2x2.h
+++ b/rsMatrix2x2.h
@@ -46,7 +46,7 @@
     }
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif  // ANDROID_RS_MATRIX_2x2_H
diff --git a/rsMatrix3x3.h b/rsMatrix3x3.h
index 5c10846..e17e1b3 100644
--- a/rsMatrix3x3.h
+++ b/rsMatrix3x3.h
@@ -46,7 +46,7 @@
     }
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif  // ANDROID_RS_MATRIX_3x3_H
diff --git a/rsMatrix4x4.h b/rsMatrix4x4.h
index 8e4a586..7ea45ba 100644
--- a/rsMatrix4x4.h
+++ b/rsMatrix4x4.h
@@ -78,7 +78,7 @@
     }
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif  // ANDROID_RS_MATRIX_4x4_H
diff --git a/rsMesh.h b/rsMesh.h
index 6c60555..e0ce062 100644
--- a/rsMesh.h
+++ b/rsMesh.h
@@ -98,8 +98,8 @@
     }
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif //ANDROID_RS_MESH_H
 
 
diff --git a/rsMutex.h b/rsMutex.h
index 47725d7..3b5d616 100644
--- a/rsMutex.h
+++ b/rsMutex.h
@@ -36,8 +36,8 @@
     pthread_mutex_t mMutex;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif
 
diff --git a/rsObjectBase.h b/rsObjectBase.h
index 4f29e57..d937ecf 100644
--- a/rsObjectBase.h
+++ b/rsObjectBase.h
@@ -162,8 +162,8 @@
     T * mRef;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif //ANDROID_RS_OBJECT_BASE_H
 
diff --git a/rsProgram.h b/rsProgram.h
index 53f1207..59f0a33 100644
--- a/rsProgram.h
+++ b/rsProgram.h
@@ -83,8 +83,8 @@
     void initMemberVars();
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif // ANDROID_RS_PROGRAM_H
 
 
diff --git a/rsProgramBase.h b/rsProgramBase.h
index aeee5c1..246e685 100644
--- a/rsProgramBase.h
+++ b/rsProgramBase.h
@@ -36,8 +36,8 @@
     mutable bool mDirty;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif // ANDROID_RS_PROGRAM_BASE_H
 
 
diff --git a/rsProgramFragment.h b/rsProgramFragment.h
index e7456b9..61cce91 100644
--- a/rsProgramFragment.h
+++ b/rsProgramFragment.h
@@ -60,8 +60,8 @@
     ObjectBaseRef<ProgramFragment> mLast;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
 
 
diff --git a/rsProgramRaster.h b/rsProgramRaster.h
index e9a524b..a0ec1db 100644
--- a/rsProgramRaster.h
+++ b/rsProgramRaster.h
@@ -79,8 +79,8 @@
 };
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
 
 
diff --git a/rsProgramStore.h b/rsProgramStore.h
index 9a7f7f1..b9463ec 100644
--- a/rsProgramStore.h
+++ b/rsProgramStore.h
@@ -95,8 +95,8 @@
     Vector<ProgramStore *> mStorePrograms;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
 
 
diff --git a/rsProgramVertex.cpp b/rsProgramVertex.cpp
index 933ff22..384849a 100644
--- a/rsProgramVertex.cpp
+++ b/rsProgramVertex.cpp
@@ -251,5 +251,5 @@
     return pv;
 }
 
-}
-}
+} // namespace renderscript
+} // namespace android
diff --git a/rsProgramVertex.h b/rsProgramVertex.h
index 9070b9a..c231aa8 100644
--- a/rsProgramVertex.h
+++ b/rsProgramVertex.h
@@ -60,8 +60,8 @@
     ObjectBaseRef<Allocation> mDefaultAlloc;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
 
 
diff --git a/rsRuntime.h b/rsRuntime.h
index 152db93..466196d 100644
--- a/rsRuntime.h
+++ b/rsRuntime.h
@@ -226,5 +226,5 @@
 void rsrMatrixTranspose_3x3(rs_matrix3x3 *m);
 void rsrMatrixTranspose_2x2(rs_matrix2x2 *m);
 
-}
-}
+} // namespace renderscript
+} // namespace android
diff --git a/rsSampler.h b/rsSampler.h
index c63a4a8..8af83f1 100644
--- a/rsSampler.h
+++ b/rsSampler.h
@@ -99,8 +99,8 @@
     Vector<Sampler *> mAllSamplers;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif //ANDROID_RS_SAMPLER_H
 
 
diff --git a/rsScript.h b/rsScript.h
index 39620c1..a4cd9c8 100644
--- a/rsScript.h
+++ b/rsScript.h
@@ -160,6 +160,6 @@
 };
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index 96ba192..70da651 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -467,5 +467,5 @@
     return s;
 }
 
-}
-}
+} // namespace renderscript
+} // namespace android
diff --git a/rsScriptC.h b/rsScriptC.h
index 3c342d4..a45fc5a 100644
--- a/rsScriptC.h
+++ b/rsScriptC.h
@@ -67,6 +67,6 @@
 #endif
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
diff --git a/rsScriptC_Lib.cpp b/rsScriptC_Lib.cpp
index cad0adf..25fd4e0 100644
--- a/rsScriptC_Lib.cpp
+++ b/rsScriptC_Lib.cpp
@@ -364,5 +364,5 @@
     return rsi_AllocationCreateTyped(rsc, type, mipmaps, usages, ptr);
 }
 
-}
-}
+} // namespace renderscript
+} // namespace android
diff --git a/rsScriptC_LibGL.cpp b/rsScriptC_LibGL.cpp
index e7ad56d..8678097 100644
--- a/rsScriptC_LibGL.cpp
+++ b/rsScriptC_LibGL.cpp
@@ -267,5 +267,5 @@
     rsc->mStateFont.setFontColor(r, g, b, a);
 }
 
-}
-}
+} // namespace renderscript
+} // namespace android
diff --git a/rsScriptGroup.h b/rsScriptGroup.h
index 835d8c0..a3801df 100644
--- a/rsScriptGroup.h
+++ b/rsScriptGroup.h
@@ -107,7 +107,7 @@
 };
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
 
diff --git a/rsScriptIntrinsic.h b/rsScriptIntrinsic.h
index cd8253d..6104a60 100644
--- a/rsScriptIntrinsic.h
+++ b/rsScriptIntrinsic.h
@@ -63,6 +63,6 @@
 };
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
diff --git a/rsSignal.h b/rsSignal.h
index adeb662..e02295f 100644
--- a/rsSignal.h
+++ b/rsSignal.h
@@ -40,8 +40,8 @@
     pthread_cond_t mCondition;
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #endif
 
diff --git a/rsStream.h b/rsStream.h
index d0ed62e..7ad0d0a 100644
--- a/rsStream.h
+++ b/rsStream.h
@@ -155,8 +155,8 @@
 };
 
 
-} // renderscript
-} // android
+} // namespace renderscript
+} // namespace android
 #endif //ANDROID_RS_STREAM_H
 
 
diff --git a/rsThreadIO.h b/rsThreadIO.h
index ca58254..23c5d42 100644
--- a/rsThreadIO.h
+++ b/rsThreadIO.h
@@ -90,7 +90,7 @@
 };
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif
 
diff --git a/rsType.h b/rsType.h
index 6e260fa..07c04ed 100644
--- a/rsType.h
+++ b/rsType.h
@@ -165,6 +165,6 @@
 };
 
 
-}
-}
+} // namespace renderscript
+} // namespace android
 #endif //ANDROID_STRUCTURED_TYPE
diff --git a/rs_hal.h b/rs_hal.h
index 34c6eae..4534126 100644
--- a/rs_hal.h
+++ b/rs_hal.h
@@ -491,8 +491,8 @@
     RS_HAL_GRAPHICS_STORE_DESTROY                           = 106002,
 };
 
-}
-}
+} // namespace renderscript
+} // namespace android
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/rsov/compiler/GlobalMergePass.cpp b/rsov/compiler/GlobalMergePass.cpp
index e177de8..1570dbc 100644
--- a/rsov/compiler/GlobalMergePass.cpp
+++ b/rsov/compiler/GlobalMergePass.cpp
@@ -134,7 +134,7 @@
     return !Globals.empty();
   }
 };
-}
+} // namespace
 
 char GlobalMergePass::ID = 0;
 
diff --git a/rsov/compiler/GlobalMergePass.h b/rsov/compiler/GlobalMergePass.h
index c402e59..4baaedf 100644
--- a/rsov/compiler/GlobalMergePass.h
+++ b/rsov/compiler/GlobalMergePass.h
@@ -19,7 +19,7 @@
 
 namespace llvm {
 class ModulePass;
-}
+} // namespace llvm
 
 namespace rs2spirv {
 
diff --git a/rsov/compiler/InlinePreparationPass.cpp b/rsov/compiler/InlinePreparationPass.cpp
index 9e016fa..70ff659 100644
--- a/rsov/compiler/InlinePreparationPass.cpp
+++ b/rsov/compiler/InlinePreparationPass.cpp
@@ -75,7 +75,7 @@
     return true;
   }
 };
-}
+} // namespace
 
 char InlinePreparationPass::ID = 0;
 
diff --git a/rsov/compiler/InlinePreparationPass.h b/rsov/compiler/InlinePreparationPass.h
index 28f2a74..aa85c43 100644
--- a/rsov/compiler/InlinePreparationPass.h
+++ b/rsov/compiler/InlinePreparationPass.h
@@ -19,11 +19,11 @@
 
 namespace llvm {
 class ModulePass;
-}
+} // namespace llvm
 
 namespace bcinfo {
 class MetadataExtractor;
-}
+} // namespace bcinfo
 
 namespace rs2spirv {
 
diff --git a/rsov/compiler/KernelSignature.cpp b/rsov/compiler/KernelSignature.cpp
index f9f2480..6367ed4 100644
--- a/rsov/compiler/KernelSignature.cpp
+++ b/rsov/compiler/KernelSignature.cpp
@@ -56,7 +56,7 @@
   badNameStream << ']';
   return badNameStream.str();
 }
-}
+} // namespace
 
 namespace rs2spirv {
 
diff --git a/rsov/compiler/RSAllocationUtils.cpp b/rsov/compiler/RSAllocationUtils.cpp
index dbcb2a8..7676b27 100644
--- a/rsov/compiler/RSAllocationUtils.cpp
+++ b/rsov/compiler/RSAllocationUtils.cpp
@@ -192,4 +192,4 @@
   return true;
 }
 
-} // rs2spirv
+} // namespace rs2spirv
diff --git a/rsov/compiler/RSAllocationUtils.h b/rsov/compiler/RSAllocationUtils.h
index 5b5b818..4eae084 100644
--- a/rsov/compiler/RSAllocationUtils.h
+++ b/rsov/compiler/RSAllocationUtils.h
@@ -26,7 +26,7 @@
 class GlobalVariable;
 class Module;
 class Type;
-}
+} // namespace llvm
 
 namespace rs2spirv {
 
diff --git a/rsov/compiler/RSSPIRVWriter.cpp b/rsov/compiler/RSSPIRVWriter.cpp
index 968828d..1671cee 100644
--- a/rsov/compiler/RSSPIRVWriter.cpp
+++ b/rsov/compiler/RSSPIRVWriter.cpp
@@ -44,7 +44,7 @@
 
 namespace llvm {
 FunctionPass *createPromoteMemoryToRegisterPass();
-}
+} // namespace llvm
 
 namespace rs2spirv {
 
diff --git a/rsov/compiler/RSSPIRVWriter.h b/rsov/compiler/RSSPIRVWriter.h
index 1851ff3..91fe4d0 100644
--- a/rsov/compiler/RSSPIRVWriter.h
+++ b/rsov/compiler/RSSPIRVWriter.h
@@ -22,7 +22,7 @@
 namespace llvm {
 class Module;
 class raw_ostream;
-}
+} // namespace llvm
 
 namespace rs2spirv {
 
diff --git a/rsov/compiler/ReflectionPass.cpp b/rsov/compiler/ReflectionPass.cpp
index f7aabd1..ae0e895 100644
--- a/rsov/compiler/ReflectionPass.cpp
+++ b/rsov/compiler/ReflectionPass.cpp
@@ -287,7 +287,8 @@
     {RSType::rs_uchar4, {RSType::rs_uchar4, true, 4, "%uchar", "Rgba8ui"}},
     {RSType::rs_int4, {RSType::rs_int4, true, 4, "%uint", "Rgba32i"}},
     {RSType::rs_float4, {RSType::rs_float4, true, 4, "%float", "Rgba32f"}}};
-};
+
+} // namespace
 
 char ReflectionPass::ID = 0;
 
diff --git a/rsov/compiler/ReflectionPass.h b/rsov/compiler/ReflectionPass.h
index 6770eaf..3691009 100644
--- a/rsov/compiler/ReflectionPass.h
+++ b/rsov/compiler/ReflectionPass.h
@@ -23,11 +23,11 @@
 
 namespace llvm {
 class ModulePass;
-}
+} // namespace llvm
 
 namespace bcinfo {
 class MetadataExtractor;
-}
+} // namespace bcinfo
 
 namespace rs2spirv {
 
@@ -36,4 +36,4 @@
 
 } // namespace rs2spirv
 
-#endif
\ No newline at end of file
+#endif
diff --git a/rsov/compiler/RemoveNonkernelsPass.cpp b/rsov/compiler/RemoveNonkernelsPass.cpp
index fb2d9ea..1ffe9f1 100644
--- a/rsov/compiler/RemoveNonkernelsPass.cpp
+++ b/rsov/compiler/RemoveNonkernelsPass.cpp
@@ -84,7 +84,7 @@
     return true;
   }
 };
-}
+} // namespace
 
 char RemoveNonkernelsPass::ID = 0;
 
diff --git a/rsov/compiler/RemoveNonkernelsPass.h b/rsov/compiler/RemoveNonkernelsPass.h
index ec2a561..aa91c91 100644
--- a/rsov/compiler/RemoveNonkernelsPass.h
+++ b/rsov/compiler/RemoveNonkernelsPass.h
@@ -19,11 +19,11 @@
 
 namespace llvm {
 class ModulePass;
-}
+} // namespace llvm
 
 namespace bcinfo {
 class MetadataExtractor;
-}
+} // namespace bcinfo
 
 namespace rs2spirv {
 
diff --git a/rsov/compiler/rs2spirv.cpp b/rsov/compiler/rs2spirv.cpp
index b9328ff..c32b7f0 100644
--- a/rsov/compiler/rs2spirv.cpp
+++ b/rsov/compiler/rs2spirv.cpp
@@ -37,7 +37,7 @@
 
 namespace kExt {
 const char SPIRVBinary[] = ".spv";
-}
+} // namespace kExt
 
 using namespace llvm;
 
@@ -74,7 +74,7 @@
 
 namespace SPIRV {
 extern bool SPIRVUseTextFormat;
-}
+} // namespace SPIRV
 
 static std::string removeExt(const std::string &FileName) {
   size_t Pos = FileName.find_last_of(".");