From 60a6678eeed6b36f9d12fda64706c8599f8c32e4 Mon Sep 17 00:00:00 2001 From: Roman Lygin Date: Fri, 11 Mar 2016 17:44:55 +0400 Subject: [PATCH] 0027254: [Regression] 7.0 types initialization mechanism is not thread-safe on VS2013 The code in Standard_Type::type_instance::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. --- src/Standard/Standard_Type.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Standard/Standard_Type.hxx b/src/Standard/Standard_Type.hxx index c6819aa5bd..243d3c3689 100644 --- a/src/Standard/Standard_Type.hxx +++ b/src/Standard/Standard_Type.hxx @@ -184,7 +184,7 @@ namespace opencascade { template const Handle(Standard_Type)& type_instance::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(__clang__) && ! defined(__INTEL_COMPILER)) // 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". // 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). -#if (defined(_MSC_VER) && _MSC_VER < 1800) || \ +#if (defined(_MSC_VER) && _MSC_VER < 1900) || \ (defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)) && \ ! defined(__clang__) && ! defined(__INTEL_COMPILER))