From d9ec475d945d3035377a0d89ed42e382d8988891 Mon Sep 17 00:00:00 2001
From: DongHun Kwak <dh0128.kwak@samsung.com>
Date: Thu, 6 Oct 2016 10:33:54 +0900
Subject: Imported Upstream version 1.60.0

Change-Id: Ie709530d6d5841088ceaba025cbe175a4ef43050
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
---
 boost/variant/variant.hpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'boost/variant/variant.hpp')

diff --git a/boost/variant/variant.hpp b/boost/variant/variant.hpp
index c4857edb26..fa09eb5641 100644
--- a/boost/variant/variant.hpp
+++ b/boost/variant/variant.hpp
@@ -1352,7 +1352,10 @@ public: // structors
         destroy_content();
     }
 
-    variant() BOOST_NOEXCEPT_IF(boost::has_nothrow_constructor<internal_T0>::value)
+    variant() 
+#if !(defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, <= 0x5130))
+              BOOST_NOEXCEPT_IF(boost::has_nothrow_constructor<internal_T0>::value)
+#endif
     {
 #ifdef _MSC_VER
 #pragma warning( push )
-- 
cgit v1.2.3