[Bf-blender-cvs] [3d85989efa9] functions: rename
Jacques Lucke
noreply at git.blender.org
Fri Sep 6 16:55:50 CEST 2019
Commit: 3d85989efa91735db9c22eaeba4d57c43af88316
Author: Jacques Lucke
Date: Fri Sep 6 12:26:36 2019 +0200
Branches: functions
https://developer.blender.org/rB3d85989efa91735db9c22eaeba4d57c43af88316
rename
===================================================================
M source/blender/functions/backends/cpp/cpp_type_info.hpp
M source/blender/functions/backends/llvm/llvm_type_info.hpp
M source/blender/functions/types/falloff.cpp
M source/blender/functions/types/falloff.hpp
===================================================================
diff --git a/source/blender/functions/backends/cpp/cpp_type_info.hpp b/source/blender/functions/backends/cpp/cpp_type_info.hpp
index 86eda883e86..af6e2544281 100644
--- a/source/blender/functions/backends/cpp/cpp_type_info.hpp
+++ b/source/blender/functions/backends/cpp/cpp_type_info.hpp
@@ -190,20 +190,20 @@ template<typename T> class CPPTypeInfoForType : public CPPTypeInfo {
/**
* The class has to have a clone() method.
*/
-template<typename T> class OwningPointerWrapper {
+template<typename T> class UniqueVirtualPointerWrapper {
private:
T *m_ptr;
public:
- OwningPointerWrapper() : m_ptr(nullptr)
+ UniqueVirtualPointerWrapper() : m_ptr(nullptr)
{
}
- OwningPointerWrapper(T *ptr) : m_ptr(ptr)
+ UniqueVirtualPointerWrapper(T *ptr) : m_ptr(ptr)
{
}
- OwningPointerWrapper(const OwningPointerWrapper &other)
+ UniqueVirtualPointerWrapper(const UniqueVirtualPointerWrapper &other)
{
if (other.m_ptr == nullptr) {
m_ptr = nullptr;
@@ -213,31 +213,31 @@ template<typename T> class OwningPointerWrapper {
}
}
- OwningPointerWrapper(OwningPointerWrapper &&other)
+ UniqueVirtualPointerWrapper(UniqueVirtualPointerWrapper &&other)
{
m_ptr = other.m_ptr;
other.m_ptr = nullptr;
}
- OwningPointerWrapper &operator=(const OwningPointerWrapper &other)
+ UniqueVirtualPointerWrapper &operator=(const UniqueVirtualPointerWrapper &other)
{
if (this == &other) {
return *this;
}
- this->~OwningPointerWrapper();
- new (this) OwningPointerWrapper(other);
+ this->~UniqueVirtualPointerWrapper();
+ new (this) UniqueVirtualPointerWrapper(other);
return *this;
}
- OwningPointerWrapper &operator=(OwningPointerWrapper &&other)
+ UniqueVirtualPointerWrapper &operator=(UniqueVirtualPointerWrapper &&other)
{
if (this == &other) {
return *this;
}
- this->~OwningPointerWrapper();
- new (this) OwningPointerWrapper(std::move(other));
+ this->~UniqueVirtualPointerWrapper();
+ new (this) UniqueVirtualPointerWrapper(std::move(other));
return *this;
}
diff --git a/source/blender/functions/backends/llvm/llvm_type_info.hpp b/source/blender/functions/backends/llvm/llvm_type_info.hpp
index c34e14cdeac..21c9cbfc545 100644
--- a/source/blender/functions/backends/llvm/llvm_type_info.hpp
+++ b/source/blender/functions/backends/llvm/llvm_type_info.hpp
@@ -234,7 +234,7 @@ template<typename T> class SharedImmutablePointerLLVMTypeInfo : public LLVMTypeI
/**
* The type has to implement a clone() method.
*/
-template<typename T> class UniquePointerLLVMTypeInfo : public LLVMTypeInfo {
+template<typename T> class UniqueVirtualPointerLLVMTypeInfo : public LLVMTypeInfo {
private:
static T *copy_value(const T *value)
{
diff --git a/source/blender/functions/types/falloff.cpp b/source/blender/functions/types/falloff.cpp
index f4bf5945296..8fc722a7564 100644
--- a/source/blender/functions/types/falloff.cpp
+++ b/source/blender/functions/types/falloff.cpp
@@ -14,7 +14,7 @@ void INIT_falloff(Vector<Type *> &types_to_free)
{
TYPE_falloff = new Type("Falloff");
TYPE_falloff->add_extension<CPPTypeInfoForType<FalloffW>>();
- TYPE_falloff->add_extension<UniquePointerLLVMTypeInfo<BKE::Falloff>>();
+ TYPE_falloff->add_extension<UniqueVirtualPointerLLVMTypeInfo<BKE::Falloff>>();
TYPE_falloff_list = new_list_type(TYPE_falloff);
diff --git a/source/blender/functions/types/falloff.hpp b/source/blender/functions/types/falloff.hpp
index 5607edcacde..88ab7681daf 100644
--- a/source/blender/functions/types/falloff.hpp
+++ b/source/blender/functions/types/falloff.hpp
@@ -10,7 +10,7 @@ class Falloff;
namespace FN {
namespace Types {
-using FalloffW = OwningPointerWrapper<BKE::Falloff>;
+using FalloffW = UniqueVirtualPointerWrapper<BKE::Falloff>;
void INIT_falloff(Vector<Type *> &types_to_free);
More information about the Bf-blender-cvs
mailing list