biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings for ICC 15
[alexxy/gromacs.git]
/
src
/
external
/
boost
/
boost
/
exception
/
exception.hpp
diff --git
a/src/external/boost/boost/exception/exception.hpp
b/src/external/boost/boost/exception/exception.hpp
index 31d43178df6c32f44920674c567509833d01c5d6..98b6083120a08fa31817c717bb41b69f0667b0b5 100644
(file)
--- 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
#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
#if (__GNUC__*100+__GNUC_MINOR__>301) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
#pragma GCC system_header
#endif