From 2729e98c69bd74f6abe363eda21365905d48fcc7 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Wed, 31 Aug 2016 13:38:55 +0200
Subject: [PATCH] Disable Value&& constructor for the String class on Windows

refs #12555
---
 lib/base/string.cpp | 2 ++
 lib/base/string.hpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lib/base/string.cpp b/lib/base/string.cpp
index 45da41099..4474e4d6b 100644
--- a/lib/base/string.cpp
+++ b/lib/base/string.cpp
@@ -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)
 {
diff --git a/lib/base/string.hpp b/lib/base/string.hpp
index ea1fc837b..2d418c9da 100644
--- a/lib/base/string.hpp
+++ b/lib/base/string.hpp
@@ -85,7 +85,9 @@ public:
 		: m_Data(std::move(other.m_Data))
 	{ }
 
+#ifndef _MSC_VER
 	String(Value&& other);
+#endif /* _MSC_VER */
 
 	inline ~String(void)
 	{ }