diff --git a/deque.h b/deque.h index 805247cc..bf7cb736 100644 --- a/deque.h +++ b/deque.h @@ -83,7 +83,7 @@ namespace etl deque() : ideque(reinterpret_cast(&buffer[0]), MAX_SIZE, BUFFER_SIZE) { - initialise(); + ideque::initialise(); } //************************************************************************* @@ -92,7 +92,6 @@ namespace etl deque(const deque& other) : ideque(reinterpret_cast(&buffer[0]), MAX_SIZE, BUFFER_SIZE) { - initialise(); ideque::assign(other.begin(), other.end()); } @@ -103,7 +102,6 @@ namespace etl deque(TIterator begin, TIterator end) : ideque(reinterpret_cast(&buffer[0]), MAX_SIZE, BUFFER_SIZE) { - initialise(); ideque::assign(begin, end); } @@ -113,7 +111,6 @@ namespace etl explicit deque(size_t n, typename ideque::parameter_t value = value_type()) : ideque(reinterpret_cast(&buffer[0]), MAX_SIZE, BUFFER_SIZE) { - initialise(); ideque::assign(n, value); } diff --git a/forward_list.h b/forward_list.h index 4bdffb2a..ea61e215 100644 --- a/forward_list.h +++ b/forward_list.h @@ -71,7 +71,7 @@ namespace etl forward_list() : iforward_list(node_pool, MAX_SIZE) { - initialise(); + iforward_list::initialise(); } //************************************************************************* @@ -80,7 +80,6 @@ namespace etl explicit forward_list(size_t initialSize, typename iforward_list::parameter_t value = T()) : iforward_list(node_pool, MAX_SIZE) { - initialise(); iforward_list::assign(initialSize, value); } @@ -90,7 +89,6 @@ namespace etl forward_list(const forward_list& other) : iforward_list(node_pool, MAX_SIZE) { - initialise(); iforward_list::assign(other.cbegin(), other.cend()); } @@ -101,7 +99,6 @@ namespace etl forward_list(TIterator first, TIterator last) : iforward_list(node_pool, MAX_SIZE) { - initialise(); iforward_list::assign(first, last); } diff --git a/list.h b/list.h index 3e9e5e7d..b61e0f74 100644 --- a/list.h +++ b/list.h @@ -71,7 +71,7 @@ namespace etl list() : ilist(node_pool, MAX_SIZE) { - initialise(); + ilist::initialise(); } //************************************************************************* @@ -80,7 +80,6 @@ namespace etl explicit list(size_t initialSize) : ilist(node_pool, MAX_SIZE) { - initialise(); ilist::assign(initialSize, T()); } @@ -90,7 +89,6 @@ namespace etl list(size_t initialSize, typename ilist::parameter_t value) : ilist(node_pool, MAX_SIZE) { - initialise(); ilist::assign(initialSize, value); } @@ -100,7 +98,6 @@ namespace etl list(const list& other) : ilist(node_pool, MAX_SIZE) { - initialise(); ilist::assign(other.cbegin(), other.cend()); } @@ -111,7 +108,6 @@ namespace etl list(TIterator first, TIterator last) : ilist(node_pool, MAX_SIZE) { - initialise(); ilist::assign(first, last); } diff --git a/map.h b/map.h index c3b57782..9ec0c71e 100644 --- a/map.h +++ b/map.h @@ -63,7 +63,7 @@ namespace etl map() : imap(node_pool, MAX_SIZE) { - initialise(); + imap::initialise(); } //************************************************************************* @@ -72,7 +72,6 @@ namespace etl map(const map& other) : imap(node_pool, MAX_SIZE) { - initialise(); imap::assign(other.cbegin(), other.cend()); } @@ -86,8 +85,7 @@ namespace etl map(TIterator first, TIterator last) : imap(node_pool, MAX_SIZE) { - initialise(); - imap::insert(first, last); + imap::assign(first, last); } //************************************************************************* diff --git a/multimap.h b/multimap.h index f98b8431..06658b4b 100644 --- a/multimap.h +++ b/multimap.h @@ -62,7 +62,7 @@ namespace etl multimap() : imultimap(node_pool, MAX_SIZE) { - initialise(); + imultimap::initialise(); } //************************************************************************* @@ -71,7 +71,6 @@ namespace etl explicit multimap(const multimap& other) : imultimap(node_pool, MAX_SIZE) { - initialise(); imultimap::assign(other.cbegin(), other.cend()); } @@ -85,8 +84,7 @@ namespace etl multimap(TIterator first, TIterator last) : imultimap(node_pool, MAX_SIZE) { - initialise(); - imultimap::insert(first, last); + imultimap::assign(first, last); } //************************************************************************* diff --git a/multiset.h b/multiset.h index 3983caa8..e3ba00e0 100644 --- a/multiset.h +++ b/multiset.h @@ -62,7 +62,7 @@ namespace etl multiset() : imultiset(node_pool, MAX_SIZE) { - initialise(); + imultiset::initialise(); } //************************************************************************* @@ -71,7 +71,6 @@ namespace etl explicit multiset(const multiset& other) : imultiset(node_pool, MAX_SIZE) { - initialise(); imultiset::assign(other.cbegin(), other.cend()); } @@ -85,8 +84,7 @@ namespace etl multiset(TIterator first, TIterator last) : imultiset(node_pool, MAX_SIZE) { - initialise(); - imultiset::insert(first, last); + imultiset::assign(first, last); } //************************************************************************* diff --git a/set.h b/set.h index 52f02600..3fb2ec2f 100644 --- a/set.h +++ b/set.h @@ -63,7 +63,7 @@ namespace etl set() : iset(node_pool, MAX_SIZE) { - initialise(); + iset::initialise(); } //************************************************************************* @@ -72,7 +72,6 @@ namespace etl explicit set(const set& other) : iset(node_pool, MAX_SIZE) { - initialise(); iset::assign(other.cbegin(), other.cend()); } @@ -86,8 +85,7 @@ namespace etl set(TIterator first, TIterator last) : iset(node_pool, MAX_SIZE) { - initialise(); - iset::insert(first, last); + iset::assign(first, last); } //************************************************************************* diff --git a/vector.h b/vector.h index 468ac8d2..9dd0e38a 100644 --- a/vector.h +++ b/vector.h @@ -67,7 +67,7 @@ namespace etl vector() : ivector(reinterpret_cast(&buffer), MAX_SIZE) { - initialise(); + ivector::initialise(); } //************************************************************************* @@ -77,7 +77,7 @@ namespace etl explicit vector(size_t initialSize) : ivector(reinterpret_cast(&buffer), MAX_SIZE) { - initialise(); + ivector::initialise(); ivector::resize(initialSize); } @@ -89,7 +89,7 @@ namespace etl vector(size_t initialSize, typename ivector::parameter_t value) : ivector(reinterpret_cast(&buffer), MAX_SIZE) { - initialise(); + ivector::initialise(); ivector::resize(initialSize, value); } @@ -103,7 +103,6 @@ namespace etl vector(TIterator first, TIterator last) : ivector(reinterpret_cast(&buffer), MAX_SIZE) { - initialise(); ivector::assign(first, last); }