[Bf-blender-cvs] [f31dc22ebb8] functions: fix some warnings

[Jacques Lucke]

Commit: f31dc22ebb8df3646cb39c6eec058ba855ff9210
Author: Jacques Lucke
Date:   Sat Dec 14 18:25:42 2019 +0100
Branches: functions
https://developer.blender.org/rBf31dc22ebb8df3646cb39c6eec058ba855ff9210

fix some warnings

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

M       source/blender/blenlib/BLI_monotonic_allocator.h
M       
source/blender/functions/intern/inlined_tree_multi_function_network/builder.h
M       source/blender/functions/intern/multi_functions/mixed.cc
M       source/blender/functions/intern/multi_functions/mixed.h

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

diff --git a/source/blender/blenlib/BLI_monotonic_allocator.h 
b/source/blender/blenlib/BLI_monotonic_allocator.h
index cbc4c54eaf1..0ab468e419f 100644
--- a/source/blender/blenlib/BLI_monotonic_allocator.h
+++ b/source/blender/blenlib/BLI_monotonic_allocator.h
@@ -43,11 +43,9 @@ class MonotonicAllocator : NonCopyable, NonMovable {
   AlignedBuffer<N, 8> m_inline_buffer;
 
  public:
-  MonotonicAllocator()
-      : m_current_buffer(m_inline_buffer.ptr()),
-        m_remaining_capacity(N),
-        m_next_min_alloc_size(std::max<uint>(N * 2, 16))
+  MonotonicAllocator() : m_remaining_capacity(N), 
m_next_min_alloc_size(std::max<uint>(N * 2, 16))
   {
+    m_current_buffer = m_inline_buffer.ptr();
   }
 
   ~MonotonicAllocator()
diff --git 
a/source/blender/functions/intern/inlined_tree_multi_function_network/builder.h 
b/source/blender/functions/intern/inlined_tree_multi_function_network/builder.h
index 061446e1561..8b4921727cd 100644
--- 
a/source/blender/functions/intern/inlined_tree_multi_function_network/builder.h
+++ 
b/source/blender/functions/intern/inlined_tree_multi_function_network/builder.h
@@ -15,12 +15,11 @@ using BLI::MultiMap;
 
 class PreprocessedVTreeMFData {
  private:
-  const InlinedNodeTree &m_inlined_tree;
   Array<Optional<MFDataType>> m_data_type_by_xsocket_id;
   Array<Optional<MFDataType>> m_data_type_by_group_input_id;
 
  public:
-  PreprocessedVTreeMFData(const InlinedNodeTree &inlined_tree) : 
m_inlined_tree(inlined_tree)
+  PreprocessedVTreeMFData(const InlinedNodeTree &inlined_tree)
   {
     auto &mappings = get_inlined_tree_multi_function_mappings();
 
diff --git a/source/blender/functions/intern/multi_functions/mixed.cc 
b/source/blender/functions/intern/multi_functions/mixed.cc
index 9faaecaae14..cd84e30bd4f 100644
--- a/source/blender/functions/intern/multi_functions/mixed.cc
+++ b/source/blender/functions/intern/multi_functions/mixed.cc
@@ -305,7 +305,7 @@ void MF_SwitchVector::call(MFMask mask, MFParams params, 
MFContext UNUSED(contex
   }
 }
 
-MF_SelectSingle::MF_SelectSingle(const CPPType &type, uint inputs) : 
m_type(type), m_inputs(inputs)
+MF_SelectSingle::MF_SelectSingle(const CPPType &type, uint inputs) : 
m_inputs(inputs)
 {
   MFSignatureBuilder signature = this->get_builder("Select Single: " + 
type.name());
   signature.single_input<int>("Select");
@@ -334,8 +334,7 @@ void MF_SelectSingle::call(MFMask mask, MFParams params, 
MFContext UNUSED(contex
   }
 }
 
-MF_SelectVector::MF_SelectVector(const CPPType &base_type, uint inputs)
-    : m_base_type(base_type), m_inputs(inputs)
+MF_SelectVector::MF_SelectVector(const CPPType &base_type, uint inputs) : 
m_inputs(inputs)
 {
   MFSignatureBuilder signature = this->get_builder("Select Vector: " + 
base_type.name() + " List");
   signature.single_input<int>("Select");
diff --git a/source/blender/functions/intern/multi_functions/mixed.h 
b/source/blender/functions/intern/multi_functions/mixed.h
index 2887a948083..458103a80a6 100644
--- a/source/blender/functions/intern/multi_functions/mixed.h
+++ b/source/blender/functions/intern/multi_functions/mixed.h
@@ -98,7 +98,6 @@ class MF_SwitchVector final : public MultiFunction {
 
 class MF_SelectSingle final : public MultiFunction {
  private:
-  const CPPType &m_type;
   uint m_inputs;
 
  public:
@@ -108,7 +107,6 @@ class MF_SelectSingle final : public MultiFunction {
 
 class MF_SelectVector final : public MultiFunction {
  private:
-  const CPPType &m_base_type;
   uint m_inputs;
 
  public:

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs