summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-01-15 12:09:01 +0100
committerJose <jose@zeroc.com>2016-01-15 12:09:01 +0100
commitd0ee4f20364a0abf5392519bf9c4586d38e02cd1 (patch)
treed7bfedf0bb88347770e9dec702d582a68b1ee98d /cpp
parentmove C++98 global checkedCast/uncheckedCast to Ice namespace (diff)
downloadice-d0ee4f20364a0abf5392519bf9c4586d38e02cd1.tar.bz2
ice-d0ee4f20364a0abf5392519bf9c4586d38e02cd1.tar.xz
ice-d0ee4f20364a0abf5392519bf9c4586d38e02cd1.zip
Define ICE_HAS_THREAD_SAFE_LOCAL_STATIC with VC140
Diffstat (limited to 'cpp')
-rw-r--r--cpp/include/IceUtil/Config.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 317ae0fca92..d9224d94b4e 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -96,7 +96,7 @@
// Support for thread-safe function local static initialization
// (a.k.a. "magic statics")
//
-#if defined(__GNUC__) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__) || (defined(_MSC_VER) && (_MSC_VER >= 1900))
# define ICE_HAS_THREAD_SAFE_LOCAL_STATIC
#endif