GPU: Use modern C++17 nested namespace definition where possible (not compiled by CUDA/OpenCL/AliRoot/ROOT5)

davidrohr · davidrohr · commit 67e9d9aceea7 · 2019-07-24T11:50:34.000+02:00
diff --git a/GPU/GPUTracking/Base/hip/GPUReconstructionHIP.h b/GPU/GPUTracking/Base/hip/GPUReconstructionHIP.h
@@ -22,9 +22,7 @@ extern "C" __declspec(dllexport) GPUCA_NAMESPACE::gpu::GPUReconstruction* GPURec
 extern "C" GPUCA_NAMESPACE::gpu::GPUReconstruction* GPUReconstruction_Create_HIP(const GPUCA_NAMESPACE::gpu::GPUSettingsProcessing& cfg);
 #endif
 
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
+namespace GPUCA_NAMESPACE::gpu
 {
 struct GPUReconstructionHIPInternals;
 
@@ -61,7 +59,6 @@ class GPUReconstructionHIPBackend : public GPUReconstructionDeviceBase
 };
 
 using GPUReconstructionHIP = GPUReconstructionKernels<GPUReconstructionHIPBackend>;
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
+} // namespace GPUCA_NAMESPACE::gpu
 
 #endif
diff --git a/GPU/GPUTracking/Base/hip/GPUReconstructionHIPInternals.h b/GPU/GPUTracking/Base/hip/GPUReconstructionHIPInternals.h
@@ -14,9 +14,7 @@
 #ifndef GPURECONSTRUCTIONHIPINTERNALS_H
 #define GPURECONSTRUCTIONHIPINTERNALS_H
 
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
+namespace GPUCA_NAMESPACE::gpu
 {
 struct GPUReconstructionHIPInternals {
   hipStream_t HIPStreams[GPUCA_MAX_STREAMS]; // Pointer to array of HIP Streams
@@ -43,7 +41,6 @@ static void GPUFailedMsgA(const long long int error, const char* file, int line)
 }
 
 static_assert(std::is_convertible<hipEvent_t, void*>::value, "HIP event type incompatible to deviceEvent");
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
+} // namespace GPUCA_NAMESPACE::gpu
 
 #endif
diff --git a/GPU/GPUTracking/Base/opencl/GPUReconstructionOCL.h b/GPU/GPUTracking/Base/opencl/GPUReconstructionOCL.h
@@ -22,9 +22,7 @@ extern "C" __declspec(dllexport) GPUCA_NAMESPACE::gpu::GPUReconstruction* GPURec
 extern "C" GPUCA_NAMESPACE::gpu::GPUReconstruction* GPUReconstruction_Create_OCL(const GPUCA_NAMESPACE::gpu::GPUSettingsProcessing& cfg);
 #endif
 
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
+namespace GPUCA_NAMESPACE::gpu
 {
 struct GPUReconstructionOCLInternals;
 
@@ -71,7 +69,6 @@ class GPUReconstructionOCLBackend : public GPUReconstructionDeviceBase
 };
 
 using GPUReconstructionOCL = GPUReconstructionKernels<GPUReconstructionOCLBackend>;
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
+} // namespace GPUCA_NAMESPACE::gpu
 
 #endif
diff --git a/GPU/GPUTracking/Base/opencl/GPUReconstructionOCLInternals.h b/GPU/GPUTracking/Base/opencl/GPUReconstructionOCLInternals.h
@@ -19,9 +19,7 @@
 #include <vector>
 #include <string>
 
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
+namespace GPUCA_NAMESPACE::gpu
 {
 static const char* opencl_error_string(int errorcode)
 {
@@ -178,7 +176,6 @@ struct GPUReconstructionOCLInternals {
 };
 
 static_assert(std::is_convertible<cl_event, void*>::value, "OpenCL event type incompatible to deviceEvent");
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
+} // namespace GPUCA_NAMESPACE::gpu
 
 #endif
diff --git a/GPU/GPUTracking/Global/GPUChainITS.h b/GPU/GPUTracking/Global/GPUChainITS.h
@@ -15,21 +15,16 @@
 #define GPUCHAINITS_H
 
 #include "GPUChain.h"
-namespace o2
-{
-namespace its
+namespace o2::its
 {
 class Cluster;
 class Road;
 class Cell;
 class TrackingFrameInfo;
 class TrackITSExt;
-} // namespace its
-} // namespace o2
+} // namespace o2::its
 
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
+namespace GPUCA_NAMESPACE::gpu
 {
 class GPUChainITS : public GPUChain
 {
@@ -58,7 +53,6 @@ class GPUChainITS : public GPUChain
 
   unsigned int mMaxTracks;
 };
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
+} // namespace GPUCA_NAMESPACE::gpu
 
 #endif
diff --git a/GPU/GPUTracking/Interface/GPUO2Interface.h b/GPU/GPUTracking/Interface/GPUO2Interface.h
@@ -28,18 +28,13 @@
 #include <memory>
 #include "GPUCommonDef.h"
 #include "GPUDataTypes.h"
-namespace o2
-{
-namespace tpc
+namespace o2::tpc
 {
 struct ClusterNativeAccess;
 struct ClusterNative;
-} // namespace tpc
-} // namespace o2
+} // namespace o2::tpc
 
-namespace o2
-{
-namespace gpu
+namespace o2::gpu
 {
 class GPUReconstruction;
 class GPUChainTracking;
@@ -73,7 +68,6 @@ class GPUTPCO2Interface
   GPUChainTracking* mChain = nullptr;
   std::unique_ptr<GPUO2InterfaceConfiguration> mConfig;
 };
-} // namespace gpu
-} // namespace o2
+} // namespace o2::gpu
 
 #endif
diff --git a/GPU/GPUTracking/Standalone/display/GPUDisplayBackendGlfw.h b/GPU/GPUTracking/Standalone/display/GPUDisplayBackendGlfw.h
@@ -19,9 +19,7 @@
 
 struct GLFWwindow;
 
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
+namespace GPUCA_NAMESPACE::gpu
 {
 class GPUDisplayBackendGlfw : public GPUDisplayBackend
 {
@@ -59,7 +57,6 @@ class GPUDisplayBackendGlfw : public GPUDisplayBackend
   int mWindowWidth = INIT_WIDTH;
   int mWindowHeight = INIT_HEIGHT;
 };
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
+} // namespace GPUCA_NAMESPACE::gpu
 
 #endif
diff --git a/GPU/GPUTracking/Standalone/display/GPUDisplayBackendGlut.h b/GPU/GPUTracking/Standalone/display/GPUDisplayBackendGlut.h
@@ -17,9 +17,7 @@
 #include "GPUDisplayBackend.h"
 #include <pthread.h>
 
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
+namespace GPUCA_NAMESPACE::gpu
 {
 class GPUDisplayBackendGlut : public GPUDisplayBackend
 {
@@ -57,7 +55,6 @@ class GPUDisplayBackendGlut : public GPUDisplayBackend
   int mHeight = INIT_HEIGHT;
   bool mFullScreen = false;
 };
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
+} // namespace GPUCA_NAMESPACE::gpu
 
 #endif
diff --git a/GPU/GPUTracking/Standalone/display/GPUDisplayBackendNone.h b/GPU/GPUTracking/Standalone/display/GPUDisplayBackendNone.h
@@ -16,9 +16,7 @@
 
 #include "GPUDisplayBackend.h"
 
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
+namespace GPUCA_NAMESPACE::gpu
 {
 class GPUDisplayBackendNone : public GPUDisplayBackend
 {
@@ -32,7 +30,6 @@ class GPUDisplayBackendNone : public GPUDisplayBackend
   void SetVSync(bool enable) override {}
   void OpenGLPrint(const char* s, float x, float y, float r, float g, float b, float a, bool fromBotton = true) override {}
 };
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
+} // namespace GPUCA_NAMESPACE::gpu
 
 #endif
diff --git a/GPU/GPUTracking/Standalone/display/GPUDisplayBackendWindows.h b/GPU/GPUTracking/Standalone/display/GPUDisplayBackendWindows.h
@@ -16,9 +16,7 @@
 
 #include "GPUDisplayBackend.h"
 
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
+namespace GPUCA_NAMESPACE::gpu
 {
 class GPUDisplayBackendWindows : public GPUDisplayBackend
 {
@@ -36,7 +34,6 @@ class GPUDisplayBackendWindows : public GPUDisplayBackend
  private:
   int OpenGLMain() override;
 };
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
+} // namespace GPUCA_NAMESPACE::gpu
 
 #endif
diff --git a/GPU/GPUTracking/Standalone/display/GPUDisplayBackendX11.h b/GPU/GPUTracking/Standalone/display/GPUDisplayBackendX11.h
@@ -20,9 +20,7 @@
 #include <unistd.h>
 #include <GL/glxext.h>
 
-namespace GPUCA_NAMESPACE
-{
-namespace gpu
+namespace GPUCA_NAMESPACE::gpu
 {
 class GPUDisplayBackendX11 : public GPUDisplayBackend
 {
@@ -52,7 +50,6 @@ class GPUDisplayBackendX11 : public GPUDisplayBackend
 
   PFNGLXSWAPINTERVALEXTPROC mGlXSwapIntervalEXT = nullptr;
 };
-} // namespace gpu
-} // namespace GPUCA_NAMESPACE
+} // namespace GPUCA_NAMESPACE::gpu
 
 #endif
