cid#1555847 COPY_INSTEAD_OF_MOVE
and cid#1555851 COPY_INSTEAD_OF_MOVE Change-Id: I826dbd7810398bf60be64702f11b912200f16b09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172226 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
@@ -67,8 +67,8 @@ public:
|
|||||||
{ other._pMapping = nullptr; }
|
{ other._pMapping = nullptr; }
|
||||||
inline ~Mapping();
|
inline ~Mapping();
|
||||||
inline Mapping & operator = ( uno_Mapping * pMapping );
|
inline Mapping & operator = ( uno_Mapping * pMapping );
|
||||||
Mapping & operator = ( const Mapping & rMapping )
|
// move variant is sufficient
|
||||||
{ return operator = ( rMapping._pMapping ); }
|
Mapping & operator = ( const Mapping & rMapping ) = delete;
|
||||||
Mapping & operator =(Mapping && other) noexcept {
|
Mapping & operator =(Mapping && other) noexcept {
|
||||||
if (_pMapping != nullptr) {
|
if (_pMapping != nullptr) {
|
||||||
(*_pMapping->release)(_pMapping);
|
(*_pMapping->release)(_pMapping);
|
||||||
@@ -554,10 +554,10 @@ static Mapping getMediateMapping(
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
aUno2To = aAnUno2Uno;
|
aUno2To = std::move(aAnUno2Uno);
|
||||||
// : ano_uno <-> to (i.e., uno)
|
// : ano_uno <-> to (i.e., uno)
|
||||||
}
|
}
|
||||||
aUno = aAnUno;
|
aUno = std::move(aAnUno);
|
||||||
}
|
}
|
||||||
|
|
||||||
Mapping aFrom2Uno( getDirectMapping( rFrom, aUno ) );
|
Mapping aFrom2Uno( getDirectMapping( rFrom, aUno ) );
|
||||||
|
Reference in New Issue
Block a user