[Bf-blender-cvs] [84baab05b2e] functions-experimental-refactor: remove unused code
Jacques Lucke
noreply at git.blender.org
Fri Oct 18 17:53:40 CEST 2019
Commit: 84baab05b2ebf91bdc7a34063b95b14483cd9567
Author: Jacques Lucke
Date: Fri Oct 18 17:46:51 2019 +0200
Branches: functions-experimental-refactor
https://developer.blender.org/rB84baab05b2ebf91bdc7a34063b95b14483cd9567
remove unused code
===================================================================
M source/blender/blenkernel/BKE_generic_array_ref.h
M source/blender/blenkernel/intern/generic_array_ref.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_generic_array_ref.h b/source/blender/blenkernel/BKE_generic_array_ref.h
index b18ba151dd8..4ab6b59ac7a 100644
--- a/source/blender/blenkernel/BKE_generic_array_ref.h
+++ b/source/blender/blenkernel/BKE_generic_array_ref.h
@@ -186,47 +186,6 @@ class GenericMutableArrayRef {
}
};
-class ArrayRefCPPType final : public CPPType {
- private:
- CPPType &m_base_type;
-
- public:
- ArrayRefCPPType(CPPType &base_type);
-
- static void ConstructDefaultCB(const CPPType *self, void *ptr)
- {
- const ArrayRefCPPType *self_ = dynamic_cast<const ArrayRefCPPType *>(self);
- new (ptr) GenericArrayRef(self_->m_base_type);
- }
-};
-
-class MutableArrayRefCPPType final : public CPPType {
- private:
- CPPType &m_base_type;
-
- public:
- MutableArrayRefCPPType(CPPType &base_type);
-
- static void ConstructDefaultCB(const CPPType *self, void *ptr)
- {
- const MutableArrayRefCPPType *self_ = dynamic_cast<const MutableArrayRefCPPType *>(self);
- new (ptr) GenericMutableArrayRef(&self_->m_base_type);
- }
-};
-
-ArrayRefCPPType &GET_TYPE_array_ref(CPPType &base);
-MutableArrayRefCPPType &GET_TYPE_mutable_array_ref(CPPType &base);
-
-template<typename T> ArrayRefCPPType &GET_TYPE_array_ref()
-{
- return GET_TYPE_array_ref(GET_TYPE<T>());
-}
-
-template<typename T> MutableArrayRefCPPType &GET_TYPE_mutable_array_ref()
-{
- return GET_TYPE_mutable_array_ref(GET_TYPE<T>());
-}
-
} // namespace BKE
#endif /* __BKE_GENERIC_ARRAY_REF_H__ */
diff --git a/source/blender/blenkernel/intern/generic_array_ref.cc b/source/blender/blenkernel/intern/generic_array_ref.cc
index cec8e39f077..42eec0237d9 100644
--- a/source/blender/blenkernel/intern/generic_array_ref.cc
+++ b/source/blender/blenkernel/intern/generic_array_ref.cc
@@ -7,65 +7,4 @@
namespace BKE {
-using BLI::Map;
-
-using ArrayRefTypeMapping = Map<const CPPType *, std::unique_ptr<ArrayRefCPPType>>;
-using MutableArrayRefTypeMapping = Map<const CPPType *, std::unique_ptr<MutableArrayRefCPPType>>;
-
-BLI_LAZY_INIT_STATIC(ArrayRefTypeMapping, get_type_mapping)
-{
- return ArrayRefTypeMapping{};
-}
-
-BLI_LAZY_INIT_STATIC(MutableArrayRefTypeMapping, get_mutable_type_mapping)
-{
- return MutableArrayRefTypeMapping{};
-}
-
-static std::mutex map_mutex__immutable;
-static std::mutex map_mutex__mutable;
-
-ArrayRefCPPType &GET_TYPE_array_ref(CPPType &base)
-{
- std::lock_guard<std::mutex> lock(map_mutex__immutable);
-
- ArrayRefTypeMapping &mapping = get_type_mapping();
-
- auto &type = mapping.lookup_or_add(&base, [&]() {
- ArrayRefCPPType *new_type = new ArrayRefCPPType(base);
- return std::unique_ptr<ArrayRefCPPType>(new_type);
- });
- return *type;
-}
-
-MutableArrayRefCPPType &GET_TYPE_mutable_array_ref(CPPType &base)
-{
- std::lock_guard<std::mutex> lock(map_mutex__mutable);
-
- MutableArrayRefTypeMapping &mapping = get_mutable_type_mapping();
-
- auto &type = mapping.lookup_or_add(&base, [&]() {
- MutableArrayRefCPPType *new_type = new MutableArrayRefCPPType(base);
- return std::unique_ptr<MutableArrayRefCPPType>(new_type);
- });
-
- return *type;
-}
-
-ArrayRefCPPType::ArrayRefCPPType(CPPType &base_type)
- : CPPType("GenericArrayRef for " + base_type.name(),
- GET_TYPE<GenericArrayRef>(),
- ArrayRefCPPType::ConstructDefaultCB),
- m_base_type(base_type)
-{
-}
-
-MutableArrayRefCPPType::MutableArrayRefCPPType(CPPType &base_type)
- : CPPType("GenericMutableArrayRef for " + base_type.name(),
- GET_TYPE<GenericMutableArrayRef>(),
- MutableArrayRefCPPType::ConstructDefaultCB),
- m_base_type(base_type)
-{
-}
-
-} // namespace BKE
\ No newline at end of file
+} // namespace BKE
More information about the Bf-blender-cvs
mailing list