From e8465f941cefe2cd408a5e9db97e9a9b3eef1d25 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey@blender.org>
Date: Tue, 19 Jul 2022 14:44:07 +0200
Subject: [PATCH] Depsgraph: Cleanup, use nested namespace definition

---
 source/blender/depsgraph/intern/debug/deg_debug.h          | 6 ++----
 source/blender/depsgraph/intern/debug/deg_time_average.h   | 6 ++----
 source/blender/depsgraph/intern/depsgraph.h                | 6 ++----
 source/blender/depsgraph/intern/depsgraph_physics.h        | 6 ++----
 source/blender/depsgraph/intern/depsgraph_registry.h       | 6 ++----
 source/blender/depsgraph/intern/depsgraph_relation.h       | 6 ++----
 source/blender/depsgraph/intern/depsgraph_tag.h            | 6 ++----
 source/blender/depsgraph/intern/depsgraph_type.h           | 6 ++----
 source/blender/depsgraph/intern/depsgraph_update.h         | 6 ++----
 source/blender/depsgraph/intern/eval/deg_eval.h            | 6 ++----
 .../blender/depsgraph/intern/eval/deg_eval_copy_on_write.h | 6 ++----
 source/blender/depsgraph/intern/eval/deg_eval_flush.h      | 6 ++----
 .../depsgraph/intern/eval/deg_eval_runtime_backup.h        | 6 ++----
 .../intern/eval/deg_eval_runtime_backup_animation.h        | 6 ++----
 .../intern/eval/deg_eval_runtime_backup_gpencil.h          | 6 ++----
 .../intern/eval/deg_eval_runtime_backup_modifier.h         | 6 ++----
 .../intern/eval/deg_eval_runtime_backup_movieclip.h        | 6 ++----
 .../depsgraph/intern/eval/deg_eval_runtime_backup_object.h | 6 ++----
 .../depsgraph/intern/eval/deg_eval_runtime_backup_pose.h   | 6 ++----
 .../depsgraph/intern/eval/deg_eval_runtime_backup_scene.h  | 6 ++----
 .../intern/eval/deg_eval_runtime_backup_sequence.h         | 6 ++----
 .../intern/eval/deg_eval_runtime_backup_sequencer.h        | 6 ++----
 .../depsgraph/intern/eval/deg_eval_runtime_backup_sound.h  | 6 ++----
 .../depsgraph/intern/eval/deg_eval_runtime_backup_volume.h | 6 ++----
 source/blender/depsgraph/intern/eval/deg_eval_stats.h      | 6 ++----
 source/blender/depsgraph/intern/node/deg_node.h            | 6 ++----
 source/blender/depsgraph/intern/node/deg_node_component.h  | 6 ++----
 source/blender/depsgraph/intern/node/deg_node_factory.h    | 7 ++-----
 .../blender/depsgraph/intern/node/deg_node_factory_impl.h  | 6 ++----
 source/blender/depsgraph/intern/node/deg_node_id.h         | 6 ++----
 source/blender/depsgraph/intern/node/deg_node_operation.h  | 6 ++----
 source/blender/depsgraph/intern/node/deg_node_time.h       | 6 ++----
 32 files changed, 64 insertions(+), 129 deletions(-)

diff --git a/source/blender/depsgraph/intern/debug/deg_debug.h b/source/blender/depsgraph/intern/debug/deg_debug.h
index ee6c5b046b7..8f18bd70d36 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug.h
+++ b/source/blender/depsgraph/intern/debug/deg_debug.h
@@ -14,8 +14,7 @@
 
 #include "DEG_depsgraph_debug.h"
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 class DepsgraphDebug {
  public:
@@ -74,5 +73,4 @@ bool terminal_do_color(void);
 string color_for_pointer(const void *pointer);
 string color_end(void);
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/debug/deg_time_average.h b/source/blender/depsgraph/intern/debug/deg_time_average.h
index cc47f03b221..d4eb05a9ddb 100644
--- a/source/blender/depsgraph/intern/debug/deg_time_average.h
+++ b/source/blender/depsgraph/intern/debug/deg_time_average.h
@@ -7,8 +7,7 @@
 
 #pragma once
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 /* Utility class which takes care of calculating average of time series, such as FPS counters. */
 template<int MaxSamples> class AveragedTimeSampler {
@@ -52,5 +51,4 @@ template<int MaxSamples> class AveragedTimeSampler {
   int next_sample_index_;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h
index ca4ce058904..fc92580f5f5 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.h
@@ -31,8 +31,7 @@ struct ID;
 struct Scene;
 struct ViewLayer;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct IDNode;
 struct Node;
@@ -162,5 +161,4 @@ struct Depsgraph {
   MEM_CXX_CLASS_ALLOC_FUNCS("Depsgraph");
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/depsgraph_physics.h b/source/blender/depsgraph/intern/depsgraph_physics.h
index a8d37f76b09..2105eb62ce1 100644
--- a/source/blender/depsgraph/intern/depsgraph_physics.h
+++ b/source/blender/depsgraph/intern/depsgraph_physics.h
@@ -10,8 +10,7 @@
 struct Collection;
 struct ListBase;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -21,5 +20,4 @@ ListBase *build_collision_relations(Depsgraph *graph,
                                     unsigned int modifier_type);
 void clear_physics_relations(Depsgraph *graph);
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/depsgraph_registry.h b/source/blender/depsgraph/intern/depsgraph_registry.h
index 2746f17590a..4ab63dcc77d 100644
--- a/source/blender/depsgraph/intern/depsgraph_registry.h
+++ b/source/blender/depsgraph/intern/depsgraph_registry.h
@@ -11,8 +11,7 @@
 
 struct Main;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -20,5 +19,4 @@ void register_graph(Depsgraph *depsgraph);
 void unregister_graph(Depsgraph *depsgraph);
 Span<Depsgraph *> get_all_registered_graphs(Main *bmain);
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/depsgraph_relation.h b/source/blender/depsgraph/intern/depsgraph_relation.h
index 4d51ad85878..1bacb9abfa6 100644
--- a/source/blender/depsgraph/intern/depsgraph_relation.h
+++ b/source/blender/depsgraph/intern/depsgraph_relation.h
@@ -9,8 +9,7 @@
 
 #include "MEM_guardedalloc.h"
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Node;
 
@@ -49,5 +48,4 @@ struct Relation {
   MEM_CXX_CLASS_ALLOC_FUNCS("Relation");
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.h b/source/blender/depsgraph/intern/depsgraph_tag.h
index a0518420bfb..b722aab5719 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.h
+++ b/source/blender/depsgraph/intern/depsgraph_tag.h
@@ -10,8 +10,7 @@
 struct ID;
 struct Main;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -29,5 +28,4 @@ void graph_id_tag_update(
  * Will do nothing if the graph is not tagged for visibility update. */
 void graph_tag_ids_for_visible_update(Depsgraph *graph);
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/depsgraph_type.h b/source/blender/depsgraph/intern/depsgraph_type.h
index 9cf14a831bc..9e21d124f83 100644
--- a/source/blender/depsgraph/intern/depsgraph_type.h
+++ b/source/blender/depsgraph/intern/depsgraph_type.h
@@ -34,8 +34,7 @@ struct Depsgraph;
 
 struct CustomData_MeshMasks;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 /* Commonly used types. */
 using std::deque;
@@ -153,5 +152,4 @@ struct DEGCustomDataMeshMasks {
   }
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/depsgraph_update.h b/source/blender/depsgraph/intern/depsgraph_update.h
index 18f8e6acab6..c5a72157bd2 100644
--- a/source/blender/depsgraph/intern/depsgraph_update.h
+++ b/source/blender/depsgraph/intern/depsgraph_update.h
@@ -10,12 +10,10 @@
 struct DEGEditorUpdateContext;
 struct ID;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 void deg_editors_id_update(const DEGEditorUpdateContext *update_ctx, struct ID *id);
 
 void deg_editors_scene_update(const DEGEditorUpdateContext *update_ctx, bool updated);
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.h b/source/blender/depsgraph/intern/eval/deg_eval.h
index ba86e1a349d..6937231d81a 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval.h
@@ -9,8 +9,7 @@
 
 #pragma once
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -23,5 +22,4 @@ struct Depsgraph;
  */
 void deg_evaluate_on_refresh(Depsgraph *graph);
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h
index 29322d58218..cbf450aa3f1 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h
@@ -27,8 +27,7 @@ struct ID;
 
 struct Depsgraph;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 class DepsgraphNodeBuilder;
@@ -77,5 +76,4 @@ bool deg_copy_on_write_is_expanded(const struct ID *id_cow);
 bool deg_copy_on_write_is_needed(const ID *id_orig);
 bool deg_copy_on_write_is_needed(const ID_Type id_type);
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.h b/source/blender/depsgraph/intern/eval/deg_eval_flush.h
index 6eb232e76e5..614ca66faed 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.h
@@ -9,8 +9,7 @@
 
 #pragma once
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -24,5 +23,4 @@ void deg_graph_flush_updates(struct Depsgraph *graph);
  */
 void deg_graph_clear_tags(struct Depsgraph *graph);
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.h
index deb21715a28..3d9b308c5ad 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup.h
@@ -17,8 +17,7 @@
 #include "intern/eval/deg_eval_runtime_backup_sound.h"
 #include "intern/eval/deg_eval_runtime_backup_volume.h"
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -59,5 +58,4 @@ class RuntimeBackup {
   GPencilBackup gpencil_backup;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h
index 92847b330e8..807cc91242e 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_animation.h
@@ -11,8 +11,7 @@
 
 #include "intern/depsgraph_type.h"
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -46,5 +45,4 @@ class AnimationBackup {
   Vector<AnimationValueBackup> values_backup;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.h
index 68eff01fd60..95c0ca3a2fe 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.h
@@ -9,8 +9,7 @@
 
 struct bGPdata;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -25,5 +24,4 @@ class GPencilBackup {
   const Depsgraph *depsgraph;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.h
index faec8f7c065..ee51204b24c 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_modifier.h
@@ -11,8 +11,7 @@
 
 struct ModifierData;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 class ModifierDataBackup {
  public:
@@ -22,5 +21,4 @@ class ModifierDataBackup {
   void *runtime;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.h
index 0e826e8f72a..aa13914d8c8 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.h
@@ -11,8 +11,7 @@ struct MovieClip;
 struct MovieClipCache;
 struct anim;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -30,5 +29,4 @@ class MovieClipBackup {
   struct MovieClipCache *cache;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h
index 3b138feec0b..c9cc167d927 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_object.h
@@ -17,8 +17,7 @@
 
 struct Object;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -46,5 +45,4 @@ class ObjectRuntimeBackup {
   Map<SessionUUID, bPoseChannel_Runtime> pose_channel_runtime_data;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.h
index 8fd5de44001..2f6a3dd4371 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_pose.h
@@ -11,8 +11,6 @@
 
 #include "DNA_action_types.h"
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
-}
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.h
index 17683966a22..155cb42a96d 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.h
@@ -11,8 +11,7 @@
 
 struct Scene;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -40,5 +39,4 @@ class SceneBackup {
   SequencerBackup sequencer_backup;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.h
index 95fbd2a3e4e..f97b6b200e9 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequence.h
@@ -11,8 +11,7 @@
 
 struct Sequence;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -32,5 +31,4 @@ class SequenceBackup {
   ListBase anims;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h
index 19e1a63ab4c..38fb8e81cc3 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sequencer.h
@@ -16,8 +16,7 @@
 
 struct Scene;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -34,5 +33,4 @@ class SequencerBackup {
   Map<SessionUUID, SequenceBackup> sequences_backup;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.h
index c4267be1421..9e1d15251e8 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_sound.h
@@ -9,8 +9,7 @@
 
 struct bSound;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -29,5 +28,4 @@ class SoundBackup {
   void *playback_handle;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.h
index bc263cc58f8..60cba64f120 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_volume.h
@@ -10,8 +10,7 @@
 struct Volume;
 struct VolumeGridVector;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
@@ -27,5 +26,4 @@ class VolumeBackup {
   char filepath[1024]; /* FILE_MAX */
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_stats.h b/source/blender/depsgraph/intern/eval/deg_eval_stats.h
index a1e3cdaca76..c24c5f07135 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_stats.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_stats.h
@@ -7,13 +7,11 @@
 
 #pragma once
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 
 /* Aggregate operation timings to overall component and ID nodes timing. */
 void deg_eval_stats_aggregate(Depsgraph *graph);
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/node/deg_node.h b/source/blender/depsgraph/intern/node/deg_node.h
index 509867ad47a..5b33528df33 100644
--- a/source/blender/depsgraph/intern/node/deg_node.h
+++ b/source/blender/depsgraph/intern/node/deg_node.h
@@ -18,8 +18,7 @@
 struct ID;
 struct Scene;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct Depsgraph;
 struct OperationNode;
@@ -217,5 +216,4 @@ struct Node {
 
 void deg_register_base_depsnodes();
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/node/deg_node_component.h b/source/blender/depsgraph/intern/node/deg_node_component.h
index fd6af43f40e..375a26ab49b 100644
--- a/source/blender/depsgraph/intern/node/deg_node_component.h
+++ b/source/blender/depsgraph/intern/node/deg_node_component.h
@@ -22,8 +22,7 @@
 struct ID;
 struct bPoseChannel;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct BoneComponentNode;
 struct Depsgraph;
@@ -249,5 +248,4 @@ struct ParametersComponentNode : public ComponentNode {
 
 void deg_register_component_depsnodes();
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/node/deg_node_factory.h b/source/blender/depsgraph/intern/node/deg_node_factory.h
index 6caf99ac9ba..ec5029e8352 100644
--- a/source/blender/depsgraph/intern/node/deg_node_factory.h
+++ b/source/blender/depsgraph/intern/node/deg_node_factory.h
@@ -14,9 +14,7 @@
 
 struct ID;
 
-namespace blender {
-namespace deg {
-
+namespace blender::deg {
 struct DepsNodeFactory {
   virtual NodeType type() const = 0;
   virtual const char *type_name() const = 0;
@@ -41,7 +39,6 @@ void register_node_typeinfo(DepsNodeFactory *factory);
 /* Get typeinfo for specified type */
 DepsNodeFactory *type_get_factory(NodeType type);
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
 
 #include "intern/node/deg_node_factory_impl.h"
diff --git a/source/blender/depsgraph/intern/node/deg_node_factory_impl.h b/source/blender/depsgraph/intern/node/deg_node_factory_impl.h
index 76a91860cc1..d9d0a1c1e3e 100644
--- a/source/blender/depsgraph/intern/node/deg_node_factory_impl.h
+++ b/source/blender/depsgraph/intern/node/deg_node_factory_impl.h
@@ -11,8 +11,7 @@
 
 struct ID;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 template<class ModeObjectType> NodeType DepsNodeFactoryImpl<ModeObjectType>::type() const
 {
@@ -48,5 +47,4 @@ Node *DepsNodeFactoryImpl<ModeObjectType>::create_node(const ID *id,
   return node;
 }
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/node/deg_node_id.h b/source/blender/depsgraph/intern/node/deg_node_id.h
index a8b6294b482..406ca828049 100644
--- a/source/blender/depsgraph/intern/node/deg_node_id.h
+++ b/source/blender/depsgraph/intern/node/deg_node_id.h
@@ -12,8 +12,7 @@
 #include "DNA_ID.h"
 #include "intern/node/deg_node.h"
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct ComponentNode;
 
@@ -117,5 +116,4 @@ struct IDNode : public Node {
   DEG_DEPSNODE_DECLARE;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.h
index 4808e004dc2..fd772fbce9d 100644
--- a/source/blender/depsgraph/intern/node/deg_node_operation.h
+++ b/source/blender/depsgraph/intern/node/deg_node_operation.h
@@ -13,8 +13,7 @@
 
 struct Depsgraph;
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 struct ComponentNode;
 
@@ -272,5 +271,4 @@ struct OperationNode : public Node {
 
 void deg_register_operation_depsnodes();
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg
diff --git a/source/blender/depsgraph/intern/node/deg_node_time.h b/source/blender/depsgraph/intern/node/deg_node_time.h
index fcfe9a0fa80..3946b63384d 100644
--- a/source/blender/depsgraph/intern/node/deg_node_time.h
+++ b/source/blender/depsgraph/intern/node/deg_node_time.h
@@ -9,8 +9,7 @@
 
 #include "intern/node/deg_node.h"
 
-namespace blender {
-namespace deg {
+namespace blender::deg {
 
 /* Time Source Node. */
 struct TimeSourceNode : public Node {
@@ -25,5 +24,4 @@ struct TimeSourceNode : public Node {
   DEG_DEPSNODE_DECLARE;
 };
 
-}  // namespace deg
-}  // namespace blender
+}  // namespace blender::deg