tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-21 12:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use 'default' for move constructors

Browse Source 
refs #12555
This commit is contained in:
Gunnar Beutner 2016-08-27 11:39:08 +02:00
parent 7c273d7748
commit 170c3624e3
4 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/array.cpp
View File

@ -90,7 +90,7 @@ void Array::Add(Value&& value)
{ {
ObjectLock olock(this); ObjectLock olock(this);
m_Data.push_back(value); m_Data.push_back(std::move(value));
} }
/** /**

16
lib/base/string.hpp
View File

@ -77,13 +77,8 @@ public:
: m_Data(n, c) : m_Data(n, c)
{ } { }
inline String(const String& other) String(const String& other) = default;
: m_Data(other.m_Data) String(String&& other) = default;
{ }
inline String(String&& other)
: m_Data(other)
{ }
inline ~String(void) inline ~String(void)
{ } { }
@ -93,11 +88,8 @@ public:
: m_Data(begin, end) : m_Data(begin, end)
{ } { }
inline String& operator=(const String& rhs) String& operator=(const String& rhs) = default;
{ String& operator=(String&& rhs) = default;
m_Data = rhs.m_Data;
return *this;
}
inline String& operator=(const std::string& rhs) inline String& operator=(const std::string& rhs)
{ {

6
lib/base/value-operators.cpp
View File

@ -94,12 +94,6 @@ std::istream& icinga::operator>>(std::istream& stream, Value& value)
return stream; return stream;
} }
Value& Value::operator=(const Value& other)
{
m_Value = other.m_Value;
return *this;
}
bool Value::operator==(bool rhs) const bool Value::operator==(bool rhs) const
{ {
return *this == Value(rhs); return *this == Value(rhs);

12
lib/base/value.hpp
View File

@ -99,13 +99,8 @@ public:
: m_Value(String(value)) : m_Value(String(value))
{ } { }
inline Value(const Value& other) Value(const Value& other) = default;
: m_Value(other.m_Value) Value(Value&& other) = default;
{ }
inline Value(Value&& other)
: m_Value(other.m_Value)
{ }
inline Value(Object *value) inline Value(Object *value)
{ {
@ -129,7 +124,8 @@ public:
operator double(void) const; operator double(void) const;
operator String(void) const; operator String(void) const;
Value& operator=(const Value& other); Value& operator=(const Value& other) = default;
Value& operator=(Value&& other) = default;
bool operator==(bool rhs) const; bool operator==(bool rhs) const;
bool operator!=(bool rhs) const; bool operator!=(bool rhs) const;