]> granicus.if.org Git - icinga2/commitdiff
Disable Value&& constructor for the String class on Windows
authorGunnar Beutner <gunnar.beutner@netways.de>
Wed, 31 Aug 2016 11:38:55 +0000 (13:38 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Wed, 31 Aug 2016 11:38:55 +0000 (13:38 +0200)
refs #12555

lib/base/string.cpp
lib/base/string.hpp

index 45da41099e5d785c2e9ba4a7da6376d0dbd37733..4474e4d6bde1056ed967111baabbca28dcb566dc 100644 (file)
@@ -29,10 +29,12 @@ REGISTER_BUILTIN_TYPE(String, String::GetPrototype());
 
 const String::SizeType String::NPos = std::string::npos;
 
+#ifndef _MSC_VER
 String::String(Value&& other)
 {
        *this = std::move(other);
 }
+#endif /* _MSC_VER */
 
 String& String::operator=(Value&& other)
 {
index ea1fc837bc53ec01d2f162bb8f3c53473471bb78..2d418c9dad68bea3716fb823aa856476fc087d37 100644 (file)
@@ -85,7 +85,9 @@ public:
                : m_Data(std::move(other.m_Data))
        { }
 
+#ifndef _MSC_VER
        String(Value&& other);
+#endif /* _MSC_VER */
 
        inline ~String(void)
        { }