Fix rebase issue

This commit is contained in:
Baptiste Wicht 2016-09-28 11:00:46 +02:00
parent bb28e0a6ee
commit 3286725ccc
No known key found for this signature in database
GPG Key ID: C5566B6C7F884532

View File

@ -156,6 +156,11 @@ struct unique_ptr {
std::get<0>(_data) = p;
}
private:
using data_impl = tuple<pointer_type, deleter_type>; ///< The type of internal data
data_impl _data; ///< The internal data storage
};
/*!