diff --git a/include/etl/circular_buffer.h b/include/etl/circular_buffer.h index bc91fbdc..7d514a6d 100644 --- a/include/etl/circular_buffer.h +++ b/include/etl/circular_buffer.h @@ -188,14 +188,6 @@ namespace etl return *this; } - //************************************************************************* - /// * operator - //************************************************************************* - reference operator *() - { - return picb->pbuffer[current]; - } - //************************************************************************* /// * operator //************************************************************************* @@ -204,14 +196,6 @@ namespace etl return picb->pbuffer[current]; } - //************************************************************************* - /// -> operator - //************************************************************************* - pointer operator ->() - { - return picb->pbuffer[current]; - } - //************************************************************************* /// -> operator //************************************************************************* diff --git a/include/etl/deque.h b/include/etl/deque.h index 6206ac67..dc54f9ac 100644 --- a/include/etl/deque.h +++ b/include/etl/deque.h @@ -356,24 +356,12 @@ namespace etl return previous; } - //*************************************************** - reference operator *() - { - return p_buffer[index]; - } - //*************************************************** reference operator *() const { return p_buffer[index]; } - //*************************************************** - pointer operator ->() - { - return &p_buffer[index]; - } - //*************************************************** pointer operator ->() const { diff --git a/include/etl/forward_list.h b/include/etl/forward_list.h index 27fb980f..d0fe8992 100644 --- a/include/etl/forward_list.h +++ b/include/etl/forward_list.h @@ -439,31 +439,16 @@ namespace etl return *this; } - reference operator *() - { - return iforward_list::data_cast(p_node)->value; - } - reference operator *() const { return iforward_list::data_cast(p_node)->value; } - pointer operator &() - { - return &(iforward_list::data_cast(p_node)->value); - } - pointer operator &() const { return &(iforward_list::data_cast(p_node)->value); } - pointer operator ->() - { - return &(iforward_list::data_cast(p_node)->value); - } - pointer operator ->() const { return &(iforward_list::data_cast(p_node)->value); diff --git a/include/etl/indirect_vector.h b/include/etl/indirect_vector.h index 947c1b9d..ece8c5af 100644 --- a/include/etl/indirect_vector.h +++ b/include/etl/indirect_vector.h @@ -240,31 +240,16 @@ namespace etl return *this; } - reference operator *() - { - return **lookup_itr; - } - reference operator *() const { return **lookup_itr; } - pointer operator &() - { - return &(**lookup_itr); - } - pointer operator &() const { return &(**lookup_itr); } - pointer operator ->() - { - return &(**lookup_itr); - } - pointer operator ->() const { return &(**lookup_itr); diff --git a/include/etl/intrusive_forward_list.h b/include/etl/intrusive_forward_list.h index b9706675..098a6985 100644 --- a/include/etl/intrusive_forward_list.h +++ b/include/etl/intrusive_forward_list.h @@ -368,31 +368,16 @@ namespace etl return *this; } - reference operator *() - { - return *p_value; - } - reference operator *() const { return *p_value; } - pointer operator &() - { - return p_value; - } - pointer operator &() const { return p_value; } - pointer operator ->() - { - return p_value; - } - pointer operator ->() const { return p_value; diff --git a/include/etl/intrusive_list.h b/include/etl/intrusive_list.h index 2f7fc1c3..f667bb57 100644 --- a/include/etl/intrusive_list.h +++ b/include/etl/intrusive_list.h @@ -438,31 +438,16 @@ namespace etl return *this; } - reference operator *() - { - return *p_value; - } - reference operator *() const { return *p_value; } - pointer operator &() - { - return p_value; - } - pointer operator &() const { return p_value; } - pointer operator ->() - { - return p_value; - } - pointer operator ->() const { return p_value; diff --git a/include/etl/list.h b/include/etl/list.h index 37ca40f1..18581b85 100644 --- a/include/etl/list.h +++ b/include/etl/list.h @@ -533,31 +533,16 @@ namespace etl return *this; } - reference operator *() - { - return ilist::data_cast(p_node)->value; - } - reference operator *() const { return ilist::data_cast(p_node)->value; } - pointer operator &() - { - return &(ilist::data_cast(p_node)->value); - } - pointer operator &() const { return &(ilist::data_cast(p_node)->value); } - pointer operator ->() - { - return &(ilist::data_cast(p_node)->value); - } - pointer operator ->() const { return &(ilist::data_cast(p_node)->value); diff --git a/include/etl/map.h b/include/etl/map.h index 31777e18..cba0081c 100644 --- a/include/etl/map.h +++ b/include/etl/map.h @@ -641,31 +641,16 @@ namespace etl return *this; } - reference operator *() - { - return imap::data_cast(p_node)->value; - } - reference operator *() const { return imap::data_cast(p_node)->value; } - pointer operator &() - { - return &(imap::data_cast(p_node)->value); - } - pointer operator &() const { return &(imap::data_cast(p_node)->value); } - pointer operator ->() - { - return &(imap::data_cast(p_node)->value); - } - pointer operator ->() const { return &(imap::data_cast(p_node)->value); diff --git a/include/etl/multimap.h b/include/etl/multimap.h index 74caef83..0b61482e 100644 --- a/include/etl/multimap.h +++ b/include/etl/multimap.h @@ -799,31 +799,16 @@ namespace etl return *this; } - reference operator *() - { - return imultimap::data_cast(p_node)->value; - } - reference operator *() const { return imultimap::data_cast(p_node)->value; } - pointer operator &() - { - return &(imultimap::data_cast(p_node)->value); - } - pointer operator &() const { return &(imultimap::data_cast(p_node)->value); } - pointer operator ->() - { - return &(imultimap::data_cast(p_node)->value); - } - pointer operator ->() const { return &(imultimap::data_cast(p_node)->value); diff --git a/include/etl/multiset.h b/include/etl/multiset.h index 44666f9f..faa1f9af 100644 --- a/include/etl/multiset.h +++ b/include/etl/multiset.h @@ -781,31 +781,16 @@ namespace etl return *this; } - reference operator *() - { - return imultiset::data_cast(p_node)->value; - } - reference operator *() const { return imultiset::data_cast(p_node)->value; } - pointer operator &() - { - return &(imultiset::data_cast(p_node)->value); - } - pointer operator &() const { return &(imultiset::data_cast(p_node)->value); } - pointer operator ->() - { - return &(imultiset::data_cast(p_node)->value); - } - pointer operator ->() const { return &(imultiset::data_cast(p_node)->value); diff --git a/include/etl/reference_flat_map.h b/include/etl/reference_flat_map.h index 7974234f..87cc0e79 100644 --- a/include/etl/reference_flat_map.h +++ b/include/etl/reference_flat_map.h @@ -178,27 +178,12 @@ namespace etl return temp; } - reference operator *() - { - return *(*ilookup); - } - reference operator *() const { return *(*ilookup); } - pointer operator &() - { - return etl::addressof(*(*ilookup)); - } - pointer operator &() const - { - return &(*(*ilookup)); - } - - pointer operator ->() { return etl::addressof(*(*ilookup)); } diff --git a/include/etl/reference_flat_multimap.h b/include/etl/reference_flat_multimap.h index 2151a73b..2caa18ae 100644 --- a/include/etl/reference_flat_multimap.h +++ b/include/etl/reference_flat_multimap.h @@ -151,27 +151,12 @@ namespace etl return temp; } - reference operator *() - { - return *(*ilookup); - } - reference operator *() const { return *(*ilookup); } - pointer operator &() - { - return etl::addressof(*(*ilookup)); - } - pointer operator &() const - { - return &(*(*ilookup)); - } - - pointer operator ->() { return etl::addressof(*(*ilookup)); } diff --git a/include/etl/reference_flat_multiset.h b/include/etl/reference_flat_multiset.h index 3bf3e348..a7506255 100644 --- a/include/etl/reference_flat_multiset.h +++ b/include/etl/reference_flat_multiset.h @@ -168,27 +168,12 @@ namespace etl return temp; } - reference operator *() - { - return *(*ilookup); - } - reference operator *() const { return *(*ilookup); } - pointer operator &() - { - return etl::addressof(*(*ilookup)); - } - pointer operator &() const - { - return &(*(*ilookup)); - } - - pointer operator ->() { return etl::addressof(*(*ilookup)); } diff --git a/include/etl/reference_flat_set.h b/include/etl/reference_flat_set.h index d574694d..1f9e65d2 100644 --- a/include/etl/reference_flat_set.h +++ b/include/etl/reference_flat_set.h @@ -170,27 +170,12 @@ namespace etl return temp; } - reference operator *() - { - return *(*ilookup); - } - reference operator *() const { return *(*ilookup); } - pointer operator &() - { - return etl::addressof(*(*ilookup)); - } - pointer operator &() const - { - return &(*(*ilookup)); - } - - pointer operator ->() { return etl::addressof(*(*ilookup)); } diff --git a/include/etl/set.h b/include/etl/set.h index f1b9895e..d202600b 100644 --- a/include/etl/set.h +++ b/include/etl/set.h @@ -619,31 +619,16 @@ namespace etl return *this; } - reference operator *() - { - return iset::data_cast(p_node)->value; - } - reference operator *() const { return iset::data_cast(p_node)->value; } - pointer operator &() - { - return &(iset::data_cast(p_node)->value); - } - pointer operator &() const { return &(iset::data_cast(p_node)->value); } - pointer operator ->() - { - return &(iset::data_cast(p_node)->value); - } - pointer operator ->() const { return &(iset::data_cast(p_node)->value); diff --git a/include/etl/unordered_map.h b/include/etl/unordered_map.h index fc1ae499..1973ecfd 100644 --- a/include/etl/unordered_map.h +++ b/include/etl/unordered_map.h @@ -246,36 +246,18 @@ namespace etl return *this; } - //********************************* - reference operator *() - { - return inode->key_value_pair; - } - //********************************* reference operator *() const { return inode->key_value_pair; } - //********************************* - pointer operator &() - { - return &(inode->key_value_pair); - } - //********************************* pointer operator &() const { return &(inode->key_value_pair); } - //********************************* - pointer operator ->() - { - return &(inode->key_value_pair); - } - //********************************* pointer operator ->() const { diff --git a/include/etl/unordered_multimap.h b/include/etl/unordered_multimap.h index 21a3b5e1..20acad84 100644 --- a/include/etl/unordered_multimap.h +++ b/include/etl/unordered_multimap.h @@ -244,36 +244,18 @@ namespace etl return *this; } - //********************************* - reference operator *() - { - return inode->key_value_pair; - } - //********************************* reference operator *() const { return inode->key_value_pair; } - //********************************* - pointer operator &() - { - return &(inode->key_value_pair); - } - //********************************* pointer operator &() const { return &(inode->key_value_pair); } - //********************************* - pointer operator ->() - { - return &(inode->key_value_pair); - } - //********************************* pointer operator ->() const { diff --git a/include/etl/unordered_multiset.h b/include/etl/unordered_multiset.h index 95ee19b5..0476e9ac 100644 --- a/include/etl/unordered_multiset.h +++ b/include/etl/unordered_multiset.h @@ -241,36 +241,18 @@ namespace etl return *this; } - //********************************* - reference operator *() - { - return inode->key; - } - //********************************* reference operator *() const { return inode->key; } - //********************************* - pointer operator &() - { - return &(inode->key); - } - //********************************* pointer operator &() const { return &(inode->key); } - //********************************* - pointer operator ->() - { - return &(inode->key); - } - //********************************* pointer operator ->() const { diff --git a/include/etl/unordered_set.h b/include/etl/unordered_set.h index 69a02728..f15d8847 100644 --- a/include/etl/unordered_set.h +++ b/include/etl/unordered_set.h @@ -242,36 +242,18 @@ namespace etl return *this; } - //********************************* - reference operator *() - { - return inode->key; - } - //********************************* reference operator *() const { return inode->key; } - //********************************* - pointer operator &() - { - return &(inode->key); - } - //********************************* pointer operator &() const { return &(inode->key); } - //********************************* - pointer operator ->() - { - return &(inode->key); - } - //********************************* pointer operator ->() const {