[icinga-checkins] icinga.org: icinga2/feature/choco: Disable Value&& constructor for the String class on Windows

git at icinga.org git at icinga.org
Wed Aug 31 13:41:17 CEST 2016


Module: icinga2
Branch: feature/choco
Commit: 2729e98c69bd74f6abe363eda21365905d48fcc7
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=2729e98c69bd74f6abe363eda21365905d48fcc7

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Wed Aug 31 13:38:55 2016 +0200

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 45da410..4474e4d 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 ea1fc83..2d418c9 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)
 	{ }



More information about the icinga-checkins mailing list