From a5f0bb54d4fde502e65db91249f3b477e3021661 Mon Sep 17 00:00:00 2001
From: Andrey Semashev <Lastique@users.noreply.github.com>
Date: Sun, 4 Apr 2021 17:29:02 +0300
Subject: [PATCH] Update concurrent_map.h

---
 include/oneapi/tbb/concurrent_map.h | 32 +++++++++--------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/include/oneapi/tbb/concurrent_map.h b/include/oneapi/tbb/concurrent_map.h
index 7cc314698f..52122699b5 100644
--- a/include/oneapi/tbb/concurrent_map.h
+++ b/include/oneapi/tbb/concurrent_map.h
@@ -93,17 +93,6 @@ class concurrent_map : public concurrent_skip_list<map_traits<Key, Value, Compar
     // Include constructors of base type
     using base_type::base_type;
 
-    concurrent_map() = default;
-    concurrent_map(const concurrent_map&) = default;
-    concurrent_map(concurrent_map&&) = default;
-
-    concurrent_map& operator= (const concurrent_map&) = default;
-    concurrent_map& operator= (concurrent_map&&) = default;
-    concurrent_map& operator= (std::initializer_list<value_type> il) {
-        base_type::operator= (il);
-        return *this;
-    }
-
     // Required for implicit deduction guides
     concurrent_map() = default;
     concurrent_map( const concurrent_map& ) = default;
@@ -114,6 +103,11 @@ class concurrent_map : public concurrent_skip_list<map_traits<Key, Value, Compar
     concurrent_map& operator=( const concurrent_map& ) = default;
     concurrent_map& operator=( concurrent_map&& ) = default;
 
+    concurrent_map& operator=( std::initializer_list<value_type> il ) {
+        base_type::operator= (il);
+        return *this;
+    }
+
     // Observers
     mapped_type& at(const key_type& key) {
         iterator it = this->find(key);
@@ -250,17 +244,6 @@ class concurrent_multimap : public concurrent_skip_list<map_traits<Key, Value, C
     using base_type::base_type;
     using base_type::insert;
 
-    concurrent_multimap() = default;
-    concurrent_multimap(const concurrent_multimap&) = default;
-    concurrent_multimap(concurrent_multimap&&) = default;
-
-    concurrent_multimap& operator= (const concurrent_multimap&) = default;
-    concurrent_multimap& operator= (concurrent_multimap&&) = default;
-    concurrent_multimap& operator= (std::initializer_list<value_type> il) {
-        base_type::operator= (il);
-        return *this;
-    }
-
     // Required for implicit deduction guides
     concurrent_multimap() = default;
     concurrent_multimap( const concurrent_multimap& ) = default;
@@ -271,6 +254,11 @@ class concurrent_multimap : public concurrent_skip_list<map_traits<Key, Value, C
     concurrent_multimap& operator=( const concurrent_multimap& ) = default;
     concurrent_multimap& operator=( concurrent_multimap&& ) = default;
 
+    concurrent_multimap& operator=( std::initializer_list<value_type> il ) {
+        base_type::operator= (il);
+        return *this;
+    }
+
     template <typename P>
     typename std::enable_if<std::is_constructible<value_type, P&&>::value,
                             std::pair<iterator, bool>>::type insert( P&& value )