[Bf-blender-cvs] [dfdc955b1ca] functions: cleanup

[Jacques Lucke]

Commit: dfdc955b1ca14345398f68d261086cfddd790b38
Author: Jacques Lucke
Date:   Tue Feb 19 17:54:57 2019 +0100
Branches: functions
https://developer.blender.org/rBdfdc955b1ca14345398f68d261086cfddd790b38

cleanup

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

M	source/blender/functions/function_nodes/function_nodes.cpp
M	source/blender/functions/types/numeric.hpp
M	tests/gtests/blenlib/BLI_lazy_init_test.cc

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

diff --git a/source/blender/functions/function_nodes/function_nodes.cpp b/source/blender/functions/function_nodes/function_nodes.cpp
index fe173125192..bbe503191bb 100644
--- a/source/blender/functions/function_nodes/function_nodes.cpp
+++ b/source/blender/functions/function_nodes/function_nodes.cpp
@@ -61,10 +61,7 @@ namespace FN { namespace FunctionNodes {
 		}
 	}
 
-
-	struct Vector {
-		float x, y, z;
-	};
+	using Types::Vector;
 
 	class CombineVector : public FN::TupleCallBody {
 		void call(const FN::Tuple &fn_in, FN::Tuple &fn_out) const override
diff --git a/source/blender/functions/types/numeric.hpp b/source/blender/functions/types/numeric.hpp
index 7cf37ce2ac6..0850af0fa43 100644
--- a/source/blender/functions/types/numeric.hpp
+++ b/source/blender/functions/types/numeric.hpp
@@ -4,6 +4,10 @@
 
 namespace FN { namespace Types {
 
+	struct Vector {
+		float x, y, z;
+	};
+
 	SharedType &get_float_type();
 	SharedType &get_int32_type();
 	SharedType &get_fvec3_type();
diff --git a/tests/gtests/blenlib/BLI_lazy_init_test.cc b/tests/gtests/blenlib/BLI_lazy_init_test.cc
index bcb73dea949..892f25b4a8e 100644
--- a/tests/gtests/blenlib/BLI_lazy_init_test.cc
+++ b/tests/gtests/blenlib/BLI_lazy_init_test.cc
@@ -1,7 +1,7 @@
 #include "testing/testing.h"
 #include "BLI_lazy_init.hpp"
 
-LAZY_INIT_NO_ARG(void *, void *, get_single_pointer)
+LAZY_INIT__NO_ARG(void *, void *, get_single_pointer)
 {
 	return std::malloc(42);
 }