[Bf-blender-cvs] [25faee8d07f] master: Cleanup: IO, inline namespace declarations

[Sybren A. Stüvel]

Commit: 25faee8d07f5c358fbc9be934aaa1502622a4b9e
Author: Sybren A. Stüvel
Date:   Tue Sep 8 17:31:57 2020 +0200
Branches: master
https://developer.blender.org/rB25faee8d07f5c358fbc9be934aaa1502622a4b9e

Cleanup: IO, inline namespace declarations

Replace nested `namespace blender { namespace io {`
with `namespace blender::io {`.

No functional changes.

===================================================================

M	source/blender/io/common/IO_abstract_hierarchy_iterator.h
M	source/blender/io/common/intern/abstract_hierarchy_iterator.cc
M	source/blender/io/common/intern/object_identifier.cc

===================================================================

diff --git a/source/blender/io/common/IO_abstract_hierarchy_iterator.h b/source/blender/io/common/IO_abstract_hierarchy_iterator.h
index 1d78cc38746..e3ed3dd70a2 100644
--- a/source/blender/io/common/IO_abstract_hierarchy_iterator.h
+++ b/source/blender/io/common/IO_abstract_hierarchy_iterator.h
@@ -51,8 +51,7 @@ struct Object;
 struct ParticleSystem;
 struct ViewLayer;
 
-namespace blender {
-namespace io {
+namespace blender::io {
 
 class AbstractHierarchyWriter;
 class DupliParentFinder;
@@ -356,5 +355,4 @@ class AbstractHierarchyIterator {
   ExportChildren &graph_children(const HierarchyContext *parent_context);
 };
 
-}  // namespace io
-}  // namespace blender
+}  // namespace blender::io
diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
index d825625cafc..6e763c29631 100644
--- a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc
@@ -44,8 +44,7 @@
 
 #include "DEG_depsgraph_query.h"
 
-namespace blender {
-namespace io {
+namespace blender::io {
 
 const HierarchyContext *HierarchyContext::root()
 {
@@ -755,5 +754,4 @@ bool AbstractHierarchyIterator::should_visit_dupli_object(const DupliObject *dup
   return !dupli_object->no_draw;
 }
 
-}  // namespace io
-}  // namespace blender
+}  // namespace blender::io
diff --git a/source/blender/io/common/intern/object_identifier.cc b/source/blender/io/common/intern/object_identifier.cc
index 696bc5d2c34..a2d2d998bec 100644
--- a/source/blender/io/common/intern/object_identifier.cc
+++ b/source/blender/io/common/intern/object_identifier.cc
@@ -26,8 +26,7 @@ extern "C" {
 #include <cstring>
 #include <sstream>
 
-namespace blender {
-namespace io {
+namespace blender::io {
 
 ObjectIdentifier::ObjectIdentifier(Object *object,
                                    Object *duplicated_by,
@@ -112,5 +111,4 @@ bool operator==(const ObjectIdentifier &obj_ident_a, const ObjectIdentifier &obj
   return obj_ident_a.persistent_id == obj_ident_b.persistent_id;
 }
 
-}  // namespace io
-}  // namespace blender
+}  // namespace blender::io