From 07f00243cf7028d8c7b696a89c7f98291aa71dc5 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Sun, 5 May 2019 10:40:55 +0700 Subject: [PATCH] make default move/copy ctors and operator= --- flat_map.hpp | 24 ++++-------------------- flat_set.hpp | 24 ++++-------------------- 2 files changed, 8 insertions(+), 40 deletions(-) diff --git a/flat_map.hpp b/flat_map.hpp index 2116937..e33244a 100644 --- a/flat_map.hpp +++ b/flat_map.hpp @@ -133,27 +133,11 @@ namespace flat_hpp insert(ilist); } - flat_map(flat_map&& other) - : data_(std::move(other.data_)) - , compare_(std::move(other.compare_)) {} + flat_map(flat_map&& other) = default; + flat_map(const flat_map& other) = default; - flat_map(const flat_map& other) - : data_(other.data_) - , compare_(other.compare_) {} - - flat_map& operator=(flat_map&& other) { - if ( this != &other ) { - flat_map(std::move(other)).swap(*this); - } - return *this; - } - - flat_map& operator=(const flat_map& other) { - if ( this != &other ) { - flat_map(other).swap(*this); - } - return *this; - } + flat_map& operator=(flat_map&& other) = default; + flat_map& operator=(const flat_map& other) = default; flat_map& operator=(std::initializer_list ilist) { flat_map(ilist).swap(*this); diff --git a/flat_set.hpp b/flat_set.hpp index da77c6f..dcc4d23 100644 --- a/flat_set.hpp +++ b/flat_set.hpp @@ -111,27 +111,11 @@ namespace flat_hpp insert(ilist); } - flat_set(flat_set&& other) - : data_(std::move(other.data_)) - , compare_(std::move(other.compare_)) {} + flat_set(flat_set&& other) = default; + flat_set(const flat_set& other) = default; - flat_set(const flat_set& other) - : data_(other.data_) - , compare_(other.compare_) {} - - flat_set& operator=(flat_set&& other) { - if ( this != &other ) { - flat_set(std::move(other)).swap(*this); - } - return *this; - } - - flat_set& operator=(const flat_set& other) { - if ( this != &other ) { - flat_set(other).swap(*this); - } - return *this; - } + flat_set& operator=(flat_set&& other) = default; + flat_set& operator=(const flat_set& other) = default; flat_set& operator=(std::initializer_list ilist) { flat_set(ilist).swap(*this);