[Bf-blender-cvs] [a90d5cd] master: Cycles: Remove workaround for MSVC2010 and Boost

Sergey Sharybin noreply at git.blender.org
Sat Feb 6 16:00:04 CET 2016


Commit: a90d5cd6929d2f3e052a7bd2f1a13a18fa025a91
Author: Sergey Sharybin
Date:   Sat Feb 6 15:56:47 2016 +0100
Branches: master
https://developer.blender.org/rBa90d5cd6929d2f3e052a7bd2f1a13a18fa025a91

Cycles: Remove workaround for MSVC2010 and Boost

We've upgraded to Boost-1.60 and MSVC2013 since the workaround
was originally committed. After checks with current compiler and
libraries the original bug is no longer happening.

This will make string comparison much faster in Windows, solving
synchronization bottlenecks of fewzillion objects.

Thanks Martin Felke (aka scorpion81) for the tests!

===================================================================

M	intern/cycles/util/util_path.cpp

===================================================================

diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp
index e8f1ec8..06be607 100644
--- a/intern/cycles/util/util_path.cpp
+++ b/intern/cycles/util/util_path.cpp
@@ -66,11 +66,6 @@ void path_init(const string& path, const string& user_path)
 {
 	cached_path = path;
 	cached_user_path = user_path;
-
-#ifdef _MSC_VER
-	// fix for https://svn.boost.org/trac/boost/ticket/6320
-	boost::filesystem::path::imbue( std::locale( "" ) );
-#endif
 }
 
 string path_get(const string& sub)




More information about the Bf-blender-cvs mailing list