Use std::map<K, V> rather than std::map<K, std::unique_ptr<V>>