[Libreoffice-commits] core.git: Branch 'aoo/trunk' - stlport/systemstl

[Herbert Dürr]

 stlport/systemstl/functional |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 90c9dbcd8275e3a9253192ee5f1dc4b230630b3f
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu May 30 16:34:12 2013 +0000

    #i122378# disable workaround needed only for improperly installed MSVC versions
    
    after a security VS2008SP1 had known problems that are extensively
    documented in Microsoft's KB971092, KB974479, KB974223 and the blog post
    http://blogs.msdn.com/b/windowssdk/archive/2009/08/07/installing-windows-sdk-for-server-2008-v6-1-after-vs2008-sp1-causes-conflicts-with-security-update-kb971092.aspx
    
    The workaround is only needed for insufficiently patched development environments.
    This case should not assumed to be normal, so the workaround is now disabled by default.

diff --git a/stlport/systemstl/functional b/stlport/systemstl/functional
index 9f7ad1b..44c4429 100644
--- a/stlport/systemstl/functional
+++ b/stlport/systemstl/functional
@@ -28,7 +28,7 @@
 #elif defined(_MSC_VER)
 	#include <../../VC/include/functional>
 	namespace std { using tr1::hash; }
-#if 1 // TODO: enable only when std::_Swap_adl is not available
+#if 0 // TODO: enable only when std::_Swap_adl is not available
 	// note: VS2008SP1 has known problems after a security update (KB971092,KB974479,KB974223)
 	namespace std{ template<class _T> void _Swap_adl(_T& l, _T& r) {swap(l,r);} }
 #endif