Merge pull request #1425 from CosminCremarenco-Murex/fix-rvo-sunstudi…

…o124 Workaround bug in SolarisStudio 12.4 on RVO-ed objects.
pocoproject · Nov 8, 2017 · 18a70a4 · 18a70a4
2 parents ad7c166 + 92e49d7
commit 18a70a4
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Foundation/include/Poco/String.h b/Foundation/include/Poco/String.h
@@ -402,7 +402,13 @@ S translateInPlace(S& str, const typename S::value_type* from, const typename S:
 	poco_check_ptr (from);
 	poco_check_ptr (to);
 	str = translate(str, S(from), S(to));
+#if defined(__SUNPRO_CC)
+   // Fix around the RVO bug in SunStudio 12.4
+   S ret(str);
+   return ret;
+#else
 	return str;
+#endif
 }