Extended ext::map with insert_or_assign member funciton.

alib2std/src/extensions/map.hpp

@@ -42,6 +42,23 @@ public:
 	using std::map < T, R, Cmp, Alloc >::operator =;
 #endif
+	using iterator = typename std::map<T, R, Cmp, Alloc>::iterator;
+	using key_type = typename std::map<T, R, Cmp, Alloc>::key_type;
+
+	// Follow interface from C++17
+	// TODO: Remove this member function after move to C++17
+	template < typename M >
+	pair < iterator, bool > insert_or_assign ( const key_type & k, M && obj ) {
+		iterator pos = this->find ( k );
+		if ( pos == this->end ( ) ) {
+			pos = this->insert ( ext::make_pair ( k, std::forward < M > ( obj ) ) ).first;
+			return ext::make_pair ( pos, true );
+		} else {
+			pos->second = std::forward < M > ( obj );
+			return ext::make_pair ( pos, false );
+		}
+	}
+
 };
 template< class T, class R, class ... Ts >

alib2std/test-src/extensions/MapTest.cpp

@@ -23,6 +23,10 @@ void MapTest::test3() {
 		map2.insert(std::move(moveablePair));
 	}
+	bool res = map2.insert_or_assign ( MapTest::Moveable ( moves, copies ), MapTest::Moveable ( moves, copies ) ).second;
+
+	CPPUNIT_ASSERT ( res == false );
+
 	CPPUNIT_ASSERT(copies == 0);
 }

alib2std/test-src/extensions/MapTest.h

@@ -28,6 +28,16 @@ public:
 		m_moves++;
 	}
+	Moveable & operator = ( const Moveable & ) {
+		m_copies ++;
+		return * this;
+	}
+
+	Moveable & operator = ( Moveable && ) {
+		m_moves ++;
+		return * this;
+	}
+
 	bool operator<(const Moveable&) const {
 		return false;
 	}