From 395b294b614f43faac0ffaef167aed1b94a53b8e Mon Sep 17 00:00:00 2001
From: Jacques Lucke <jacques@blender.org>
Date: Fri, 3 Jul 2020 14:25:20 +0200
Subject: Cleanup: use nested namespaces

---
 source/blender/functions/intern/attributes_ref.cc                   | 6 ++----
 source/blender/functions/intern/cpp_types.cc                        | 6 ++----
 source/blender/functions/intern/multi_function.cc                   | 6 ++----
 source/blender/functions/intern/multi_function_network.cc           | 6 ++----
 .../blender/functions/intern/multi_function_network_evaluation.cc   | 6 ++----
 5 files changed, 10 insertions(+), 20 deletions(-)

(limited to 'source/blender/functions/intern')

diff --git a/source/blender/functions/intern/attributes_ref.cc b/source/blender/functions/intern/attributes_ref.cc
index 047fa12adb4..f61a9165c47 100644
--- a/source/blender/functions/intern/attributes_ref.cc
+++ b/source/blender/functions/intern/attributes_ref.cc
@@ -16,8 +16,7 @@
 
 #include "FN_attributes_ref.hh"
 
-namespace blender {
-namespace fn {
+namespace blender::fn {
 
 AttributesInfoBuilder::~AttributesInfoBuilder()
 {
@@ -68,5 +67,4 @@ AttributesInfo::~AttributesInfo()
   }
 }
 
-}  // namespace fn
-}  // namespace blender
+}  // namespace blender::fn
diff --git a/source/blender/functions/intern/cpp_types.cc b/source/blender/functions/intern/cpp_types.cc
index cb4b065e5bc..052278afd65 100644
--- a/source/blender/functions/intern/cpp_types.cc
+++ b/source/blender/functions/intern/cpp_types.cc
@@ -21,8 +21,7 @@
 #include "BLI_float3.hh"
 #include "BLI_float4x4.hh"
 
-namespace blender {
-namespace fn {
+namespace blender::fn {
 
 MAKE_CPP_TYPE(bool, bool)
 
@@ -39,5 +38,4 @@ MAKE_CPP_TYPE(Color4b, blender::Color4b)
 
 MAKE_CPP_TYPE(string, std::string)
 
-}  // namespace fn
-}  // namespace blender
+}  // namespace blender::fn
diff --git a/source/blender/functions/intern/multi_function.cc b/source/blender/functions/intern/multi_function.cc
index 8eb5355511d..a41c6bdf3cd 100644
--- a/source/blender/functions/intern/multi_function.cc
+++ b/source/blender/functions/intern/multi_function.cc
@@ -16,8 +16,7 @@
 
 #include "FN_multi_function.hh"
 
-namespace blender {
-namespace fn {
+namespace blender::fn {
 
 class DummyMultiFunction : public MultiFunction {
  public:
@@ -36,5 +35,4 @@ class DummyMultiFunction : public MultiFunction {
 static DummyMultiFunction dummy_multi_function_;
 const MultiFunction &dummy_multi_function = dummy_multi_function_;
 
-}  // namespace fn
-}  // namespace blender
+}  // namespace blender::fn
diff --git a/source/blender/functions/intern/multi_function_network.cc b/source/blender/functions/intern/multi_function_network.cc
index f2a28776660..5df70d92a4e 100644
--- a/source/blender/functions/intern/multi_function_network.cc
+++ b/source/blender/functions/intern/multi_function_network.cc
@@ -17,8 +17,7 @@
 #include "BLI_dot_export.hh"
 #include "FN_multi_function_network.hh"
 
-namespace blender {
-namespace fn {
+namespace blender::fn {
 
 MFNetwork::~MFNetwork()
 {
@@ -274,5 +273,4 @@ std::string MFNetwork::to_dot() const
   return digraph.to_dot_string();
 }
 
-}  // namespace fn
-}  // namespace blender
+}  // namespace blender::fn
diff --git a/source/blender/functions/intern/multi_function_network_evaluation.cc b/source/blender/functions/intern/multi_function_network_evaluation.cc
index 187af4c8aa6..08a254dc300 100644
--- a/source/blender/functions/intern/multi_function_network_evaluation.cc
+++ b/source/blender/functions/intern/multi_function_network_evaluation.cc
@@ -39,8 +39,7 @@
 
 #include "BLI_stack.hh"
 
-namespace blender {
-namespace fn {
+namespace blender::fn {
 
 struct Value;
 
@@ -1059,5 +1058,4 @@ GVArraySpan MFNetworkEvaluationStorage::get_vector_input__single(const MFInputSo
 
 /** \} */
 
-}  // namespace fn
-}  // namespace blender
+}  // namespace blender::fn
-- 
cgit v1.2.3