OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0027254: [Regression] 7.0 types initialization mechanism is not thread-safe on VS2013

Browse Source 
The code in Standard_Type::type_instance<T>::get() distinguishes between compilers supporting and not supporting N2660. VS2013 was incorrectly considered as supporting, although the comment stated the opposite.

The fix makes VS2013 treated as not supporting N2660.
This commit is contained in:
Roman Lygin 2016-03-11 17:44:55 +04:00 committed by abv
parent 41c012f076
commit 60a6678eee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Standard/Standard_Type.hxx
View File

@ -184,7 +184,7 @@ namespace opencascade {
template <typename T> template <typename T>
const Handle(Standard_Type)& type_instance<T>::get () const Handle(Standard_Type)& type_instance<T>::get ()
{ {
#if (defined(_MSC_VER) && _MSC_VER < 1800) || \ #if (defined(_MSC_VER) && _MSC_VER < 1900) || \
(defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)) && \ (defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)) && \
! defined(__clang__) && ! defined(__INTEL_COMPILER)) ! defined(__clang__) && ! defined(__INTEL_COMPILER))
// ensure that myInstance is instantiated // ensure that myInstance is instantiated
@ -207,7 +207,7 @@ namespace opencascade {
// and is claimed to support N2660 on Linux and on Windows "in VS2015 mode". // and is claimed to support N2660 on Linux and on Windows "in VS2015 mode".
// CLang should support N2660 since version 2.9, but it is not clear how to // CLang should support N2660 since version 2.9, but it is not clear how to
// check its version reliably (on Linux it says it is GCC 4.2). // check its version reliably (on Linux it says it is GCC 4.2).
#if (defined(_MSC_VER) && _MSC_VER < 1800) || \ #if (defined(_MSC_VER) && _MSC_VER < 1900) || \
(defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)) && \ (defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)) && \
! defined(__clang__) && ! defined(__INTEL_COMPILER)) ! defined(__clang__) && ! defined(__INTEL_COMPILER))