[Bf-blender-cvs] [c3b7bfbded4] functions: use allowed namespace definition syntax only
Jacques Lucke
noreply at git.blender.org
Mon Feb 18 16:00:52 CET 2019
Commit: c3b7bfbded44d1b724121d7e412bcf7d821cd94a
Author: Jacques Lucke
Date: Mon Feb 18 14:59:46 2019 +0100
Branches: functions
https://developer.blender.org/rBc3b7bfbded44d1b724121d7e412bcf7d821cd94a
use allowed namespace definition syntax only
===================================================================
M source/blender/functions/function_nodes/function_nodes.cpp
M source/blender/functions/function_nodes/function_nodes.hpp
M source/blender/functions/types/numeric.cpp
M source/blender/functions/types/numeric.hpp
===================================================================
diff --git a/source/blender/functions/function_nodes/function_nodes.cpp b/source/blender/functions/function_nodes/function_nodes.cpp
index 215a3299b64..fe173125192 100644
--- a/source/blender/functions/function_nodes/function_nodes.cpp
+++ b/source/blender/functions/function_nodes/function_nodes.cpp
@@ -9,7 +9,7 @@
#include "DNA_object_types.h"
-namespace FN::FunctionNodes {
+namespace FN { namespace FunctionNodes {
using SocketMap = SmallMap<bNodeSocket *, Socket>;
typedef void (*InsertInGraphFunction)(
@@ -354,4 +354,4 @@ namespace FN::FunctionNodes {
return fgraph;
}
-} /* FN::FunctionNodes */
\ No newline at end of file
+} } /* FN::FunctionNodes */
\ No newline at end of file
diff --git a/source/blender/functions/function_nodes/function_nodes.hpp b/source/blender/functions/function_nodes/function_nodes.hpp
index e78530ae4f2..50e79efa7c1 100644
--- a/source/blender/functions/function_nodes/function_nodes.hpp
+++ b/source/blender/functions/function_nodes/function_nodes.hpp
@@ -2,7 +2,7 @@
#include "DNA_node_types.h"
#include "BLI_listbase_wrapper.hpp"
-namespace FN::FunctionNodes {
+namespace FN { namespace FunctionNodes {
using bNodeList = ListBaseWrapper<bNode, true>;
using bLinkList = ListBaseWrapper<bNodeLink, true>;
@@ -34,4 +34,4 @@ namespace FN::FunctionNodes {
FunctionGraph to_function_graph() const;
};
-} /* namespace FN::FunctionNodes */
\ No newline at end of file
+} } /* namespace FN::FunctionNodes */
\ No newline at end of file
diff --git a/source/blender/functions/types/numeric.cpp b/source/blender/functions/types/numeric.cpp
index c5d1e5d10a9..b617c810566 100644
--- a/source/blender/functions/types/numeric.cpp
+++ b/source/blender/functions/types/numeric.cpp
@@ -1,7 +1,8 @@
#include "numeric.hpp"
#include "BLI_lazy_init.hpp"
-namespace FN::Types {
+namespace FN { namespace Types {
+
struct Vector {
float x, y, z;
@@ -36,4 +37,4 @@ namespace FN::Types {
return type;
}
-} /* namespace FN::Types */
\ No newline at end of file
+} } /* namespace FN::Types */
\ No newline at end of file
diff --git a/source/blender/functions/types/numeric.hpp b/source/blender/functions/types/numeric.hpp
index 08f9d19ce27..7cf37ce2ac6 100644
--- a/source/blender/functions/types/numeric.hpp
+++ b/source/blender/functions/types/numeric.hpp
@@ -2,11 +2,11 @@
#include "../FN_functions.hpp"
-namespace FN::Types {
+namespace FN { namespace Types {
SharedType &get_float_type();
SharedType &get_int32_type();
SharedType &get_fvec3_type();
SharedType &get_float_list_type();
-} /* namespace FN::Types */
\ No newline at end of file
+} } /* namespace FN::Types */
\ No newline at end of file
More information about the Bf-blender-cvs
mailing list