Skip to content
Snippets Groups Projects
Commit 61ff3f09 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'coverity.Navigation-20170903' into 'master'

Navigation: Coverity 113434.

See merge request !4397
parents 90acb0b6 bfc7011c
No related branches found
No related tags found
No related merge requests found
...@@ -269,7 +269,7 @@ class NavigationToken : public INavigationToken ...@@ -269,7 +269,7 @@ class NavigationToken : public INavigationToken
// copy operator // copy operator
NavigationToken& operator=(const NavigationToken & anotherToken) NavigationToken& operator=(const NavigationToken & anotherToken)
{ {
if ( anotherToken.m_data != 0 ) if ( this != &anotherToken && anotherToken.m_data != 0 )
{ {
m_data = anotherToken.m_data; m_data = anotherToken.m_data;
m_navCondition = anotherToken.m_navCondition; m_navCondition = anotherToken.m_navCondition;
...@@ -278,6 +278,18 @@ class NavigationToken : public INavigationToken ...@@ -278,6 +278,18 @@ class NavigationToken : public INavigationToken
return *this; return *this;
} }
// move operator
NavigationToken& operator=(NavigationToken&& anotherToken)
{
if ( this != &anotherToken && anotherToken.m_data != 0 )
{
m_data = std::move (anotherToken.m_data);
m_navCondition = anotherToken.m_navCondition;
m_navSelector = anotherToken.m_navSelector;
}
return *this;
}
// dump // dump
void dumpStore(); void dumpStore();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment