tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable Value&& constructor for the String class on Windows 

refs #12555
This commit is contained in:
Gunnar Beutner 2016-08-31 13:38:55 +02:00
parent ba14c6e7ff
commit 2729e98c69
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/string.cpp
View File

@ -29,10 +29,12 @@ REGISTER_BUILTIN_TYPE(String, String::GetPrototype());
const String::SizeType String::NPos = std::string::npos; const String::SizeType String::NPos = std::string::npos;
#ifndef _MSC_VER
String::String(Value&& other) String::String(Value&& other)
{ {
*this = std::move(other); *this = std::move(other);
} }
#endif /* _MSC_VER */
String& String::operator=(Value&& other) String& String::operator=(Value&& other)
{ {

2
lib/base/string.hpp
View File

@ -85,7 +85,9 @@ public:
: m_Data(std::move(other.m_Data)) : m_Data(std::move(other.m_Data))
{ } { }
#ifndef _MSC_VER
String(Value&& other); String(Value&& other);
#endif /* _MSC_VER */
inline ~String(void) inline ~String(void)
{ } { }