X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fexternal%2Fboost%2Fboost%2Fexception%2Fexception.hpp;h=98b6083120a08fa31817c717bb41b69f0667b0b5;hb=d28edf2a07dcf11;hp=31d43178df6c32f44920674c567509833d01c5d6;hpb=4acad365c0d7ef71ff7936246562cd6c861e3ec0;p=alexxy%2Fgromacs.git

diff --git a/src/external/boost/boost/exception/exception.hpp b/src/external/boost/boost/exception/exception.hpp
index 31d43178df..98b6083120 100644
--- a/src/external/boost/boost/exception/exception.hpp
+++ b/src/external/boost/boost/exception/exception.hpp
@@ -5,6 +5,9 @@
 
 #ifndef UUID_274DA366004E11DCB1DDFE2E56D89593
 #define UUID_274DA366004E11DCB1DDFE2E56D89593
+#if defined(__ICC) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(disable:367) //GMX: For ICC15 "disable duplicate friend declaration" warning
+#endif
 #if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
 #pragma GCC system_header
 #endif