[all] Apply nested namespaces (sofa-framework#4482)

* [all] Apply nested namespaces * Fix compilation * Revert nested namespaces on .cu files to fix compilation * Fix bad refactoring
bakpaul · Feb 22, 2024 · 57e91ce · 57e91ce
1 parent ce4dcc2
commit 57e91ce
Show file tree

Hide file tree

Showing 288 changed files with 827 additions and 2,162 deletions.
diff --git a/Sofa/framework/Core/src/sofa/core/ConstraintParams.cpp b/Sofa/framework/Core/src/sofa/core/ConstraintParams.cpp
@@ -25,10 +25,8 @@
 #include <cassert>
 #include <iostream>
 
-namespace sofa
-{
 
-namespace core
+namespace sofa::core
 {
 
 ConstraintParams::ConstraintParams(const sofa::core::ExecParams& p)
@@ -62,6 +60,6 @@ const ConstraintParams* ConstraintParams::defaultInstance()
     return ptr;
 }
 
-} // namespace core
+} // namespace sofa::core
+
 
-} // namespace sofa
diff --git a/Sofa/framework/Core/src/sofa/core/DevBaseMonitor.h b/Sofa/framework/Core/src/sofa/core/DevBaseMonitor.h
@@ -25,10 +25,8 @@
 
 #include <sofa/core/objectmodel/BaseObject.h>
 
-namespace sofa
-{
 
-namespace core
+namespace sofa::core
 {
 
 /**
@@ -49,7 +47,7 @@ class DevBaseMonitor : public virtual objectmodel::BaseObject
     virtual void eval() = 0;
 };
 
-} // namespace core
-} // namespace sofa
+} // namespace sofa::core
+
 
 #endif //SOFA_CORE_DEVBASEMONITOR_H
diff --git a/Sofa/framework/Core/src/sofa/core/ExecParams.cpp b/Sofa/framework/Core/src/sofa/core/ExecParams.cpp
@@ -22,10 +22,8 @@
 #include <sofa/core/ExecParams.h>
 #include <sofa/helper/logging/Messaging.h>
 
-namespace sofa
-{
 
-namespace core
+namespace sofa::core
 {
 
 std::atomic<int> ExecParams::g_nbThreads(0);
@@ -74,6 +72,6 @@ void ExecParams::update()
     storage = threadStorage();
 }
 
-} // namespace core
+} // namespace sofa::core
+
 
-} // namespace sofa
diff --git a/Sofa/framework/Core/src/sofa/core/MechanicalParams.cpp b/Sofa/framework/Core/src/sofa/core/MechanicalParams.cpp
@@ -25,10 +25,8 @@
 #include <cassert>
 #include <iostream>
 
-namespace sofa
-{
 
-namespace core
+namespace sofa::core
 {
 
 MechanicalParams::MechanicalParams(const sofa::core::ExecParams& p)
@@ -107,6 +105,6 @@ const MechanicalParams* MechanicalParams::defaultInstance()
     return ptr;
 }
 
-} // namespace core
+} // namespace sofa::core
+
 
-} // namespace sofa
diff --git a/Sofa/framework/Core/src/sofa/core/behavior/OdeSolver.cpp b/Sofa/framework/Core/src/sofa/core/behavior/OdeSolver.cpp
@@ -24,13 +24,8 @@
 #include <cmath>
 #include <sofa/core/objectmodel/BaseNode.h>
 
-namespace sofa
-{
-
-namespace core
-{
 
-namespace behavior
+namespace sofa::core::behavior
 {
 
 OdeSolver::OdeSolver()
@@ -61,9 +56,9 @@ bool OdeSolver::removeInNode( objectmodel::BaseNode* node )
 }
 
 
-} // namespace behavior
+} // namespace sofa::core::behavior
+
+
 
-} // namespace core
 
-} // namespace sofa
 
diff --git a/Sofa/framework/Core/src/sofa/core/behavior/RotationFinder.h b/Sofa/framework/Core/src/sofa/core/behavior/RotationFinder.h
@@ -26,13 +26,7 @@
 #include <sofa/type/Mat.h>
 
 
-namespace sofa
-{
-
-namespace core
-{
-
-namespace behavior
+namespace sofa::core::behavior
 {
 
 template <class DataTypes>
@@ -50,10 +44,7 @@ class RotationFinder : public BaseRotationFinder
     virtual const type::vector< Mat3x3 >& getRotations() = 0;
 };
 
-} // namespace behavior
-
-} // namespace core
+} // namespace sofa::core::behavior
 
-} // namespace sofa
 
 #endif // SOFA_CORE_BEHAVIOR_ROTATIONFINDER_H
diff --git a/Sofa/framework/Core/src/sofa/core/collision/Contact.cpp b/Sofa/framework/Core/src/sofa/core/collision/Contact.cpp
@@ -23,13 +23,8 @@
 #include <sofa/helper/Factory.inl>
 #include <sofa/helper/logging/Messaging.h>
 
-namespace sofa
-{
-
-namespace core
-{
 
-namespace collision
+namespace sofa::core::collision
 {
 
 using namespace sofa::defaulttype;
@@ -86,9 +81,9 @@ Contact::SPtr Contact::Create(const std::string& type, core::CollisionModel* mod
     }
 }
 
-} // namespace collision
+} // namespace sofa::core::collision
+
+
 
-} // namespace core
 
-} // namespace sofa
 
diff --git a/Sofa/framework/Core/src/sofa/core/loader/MeshLoader.cpp b/Sofa/framework/Core/src/sofa/core/loader/MeshLoader.cpp
@@ -27,13 +27,8 @@
 
 #include <cstdlib>
 
-namespace sofa
-{
-
-namespace core
-{
 
-namespace loader
+namespace sofa::core::loader
 {
 
 using namespace sofa::defaulttype;
@@ -930,9 +925,9 @@ void MeshLoader::copyMeshToData(sofa::helper::io::Mesh& _mesh)
     d_highOrderQuadPositions.setValue(_mesh.getHighOrderQuadPositions());
 }
 
-} // namespace loader
+} // namespace sofa::core::loader
+
+
 
-} // namespace core
 
-} // namespace sofa
 
diff --git a/Sofa/framework/Core/src/sofa/core/loader/SceneLoader.cpp b/Sofa/framework/Core/src/sofa/core/loader/SceneLoader.cpp
@@ -21,13 +21,8 @@
 ******************************************************************************/
 #include <sofa/core/loader/SceneLoader.h>
 
-namespace sofa
-{
-
-namespace core
-{
 
-namespace loader
+namespace sofa::core::loader
 {
 
 using namespace sofa::defaulttype;
@@ -57,9 +52,9 @@ bool SceneLoader::canLoad()
     return BaseLoader::canLoad();
 }
 
-} // namespace loader
+} // namespace sofa::core::loader
+
+
 
-} // namespace core
 
-} // namespace sofa
 
diff --git a/Sofa/framework/Core/src/sofa/core/loader/VoxelLoader.cpp b/Sofa/framework/Core/src/sofa/core/loader/VoxelLoader.cpp
@@ -30,13 +30,8 @@
 #include <map>
 #include <algorithm>
 
-namespace sofa
-{
-
-namespace core
-{
 
-namespace loader
+namespace sofa::core::loader
 {
 
 using namespace sofa::defaulttype;
@@ -67,9 +62,9 @@ void VoxelLoader::addHexahedron(type::vector< type::fixed_array<unsigned int,8>
     pHexahedra->push_back(p);
 }
 
-} // namespace loader
+} // namespace sofa::core::loader
+
+
 
-} // namespace core
 
-} // namespace sofa
 
diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/AspectPool.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/AspectPool.cpp
@@ -24,13 +24,8 @@
 #include <sofa/helper/system/thread/CircularQueue.inl>
 #include <iostream>
 
-namespace sofa
-{
-
-namespace core
-{
 
-namespace objectmodel
+namespace sofa::core::objectmodel
 {
 
 /**
@@ -225,8 +220,8 @@ bool AspectBuffer::pop(AspectRef& id)
     return true;
 }
 
-} // namespace objectmodel
+} // namespace sofa::core::objectmodel
+
+
 
-} // namespace core
 
-} // namespace sofa
diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseClass.cpp
@@ -21,13 +21,8 @@
 ******************************************************************************/
 #include <sofa/core/objectmodel/BaseClass.h>
 
-namespace sofa
-{
-
-namespace core
-{
 
-namespace objectmodel
+namespace sofa::core::objectmodel
 {
 
 BaseClass* DeprecatedBaseClass::GetSingleton()
@@ -54,9 +49,9 @@ DeprecatedBaseClass::DeprecatedBaseClass()
 }
 
 
-} // namespace objectmodel
+} // namespace sofa::core::objectmodel
+
+
 
-} // namespace core
 
-} // namespace sofa
 
diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseNode.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseNode.cpp
@@ -26,13 +26,8 @@
 #include <sofa/core/collision/Pipeline.h>
 #include <sofa/core/visual/VisualLoop.h>
 
-namespace sofa
-{
-
-namespace core
-{
 
-namespace objectmodel
+namespace sofa::core::objectmodel
 {
 
 BaseNode::BaseNode()
@@ -121,8 +116,8 @@ std::string BaseNode::getRootPath() const {
     return str;
 }
 
-} // namespace objectmodel
+} // namespace sofa::core::objectmodel
+
+
 
-} // namespace core
 
-} // namespace sofa
diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseObject.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseObject.cpp
@@ -29,13 +29,7 @@
 #include <iostream>
 
 
-namespace sofa
-{
-
-namespace core
-{
-
-namespace objectmodel
+namespace sofa::core::objectmodel
 {
 
 BaseObject::BaseObject()
@@ -373,9 +367,9 @@ std::string BaseObject::getPathName() const {
     return result;
 }
 
-} // namespace objectmodel
+} // namespace sofa::core::objectmodel
+
+
 
-} // namespace core
 
-} // namespace sofa
 
diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/ClassInfo.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/ClassInfo.cpp
@@ -21,13 +21,8 @@
 ******************************************************************************/
 #include <sofa/core/objectmodel/ClassInfo.h>
 
-namespace sofa
-{
-
-namespace core
-{
 
-namespace objectmodel
+namespace sofa::core::objectmodel
 {
 
 std::map<sofa::helper::TypeInfo, ClassInfo*> ClassInfo::classes;
@@ -43,9 +38,9 @@ ClassInfo::~ClassInfo()
 }
 
 
-} // namespace objectmodel
+} // namespace sofa::core::objectmodel
+
+
 
-} // namespace core
 
-} // namespace sofa