[Bf-blender-cvs] [a15e6315376] master: Cycles: Cleanup, remove unneeded manual constructors specification
Sergey Sharybin
noreply at git.blender.org
Fri Nov 9 14:33:41 CET 2018
Commit: a15e63153760d8ea8c6ccf45d82a8c740d4941e0
Author: Sergey Sharybin
Date: Fri Nov 9 11:44:33 2018 +0100
Branches: master
https://developer.blender.org/rBa15e63153760d8ea8c6ccf45d82a8c740d4941e0
Cycles: Cleanup, remove unneeded manual constructors specification
===================================================================
M intern/cycles/util/util_vector.h
===================================================================
diff --git a/intern/cycles/util/util_vector.h b/intern/cycles/util/util_vector.h
index df576f710a9..0df490a5ef4 100644
--- a/intern/cycles/util/util_vector.h
+++ b/intern/cycles/util/util_vector.h
@@ -43,20 +43,8 @@ class vector : public std::vector<value_type, allocator_type>
public:
typedef std::vector<value_type, allocator_type> BaseClass;
- /* Default constructor. */
- explicit vector() : std::vector<value_type, allocator_type>() { }
-
- /* Fill constructor. */
- explicit vector(size_t n, const value_type& val = value_type())
- : std::vector<value_type, allocator_type>(n, val) { }
-
- /* Range constructor. */
- template <class InputIterator>
- vector(InputIterator first, InputIterator last)
- : std::vector<value_type, allocator_type>(first, last) { }
-
- /* Copy constructor. */
- vector(const vector &x) : std::vector<value_type, allocator_type>(x) { }
+ /* Inherit all constructors from base class. */
+ using BaseClass::vector;
void free_memory(void)
{
More information about the Bf-blender-cvs
mailing list