Skip to content

Commit

Permalink
Merge 1a961d1 into 3cbdb9e
Browse files Browse the repository at this point in the history
  • Loading branch information
lballabio committed Jan 20, 2021
2 parents 3cbdb9e + 1a961d1 commit a0332c4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ql/config.msvc.hpp
Expand Up @@ -25,8 +25,8 @@
#include <ql/userconfig.hpp>

// first things first
#if (_MSC_VER < 1600)
# error "versions of Visual C++ prior to VC++10 (2010) are no longer supported"
#if (_MSC_VER < 1800)
# error "versions of Visual C++ prior to VC++12.0 (2013) are no longer supported"
#endif

/*******************************************
Expand Down
3 changes: 1 addition & 2 deletions ql/errors.hpp
Expand Up @@ -62,8 +62,7 @@ namespace QuantLib {
*/
#define MULTILINE_MACRO_BEGIN do {

#if defined(BOOST_MSVC) && BOOST_MSVC >= 1500
/* __pragma is available from VC++9 */
#if defined(BOOST_MSVC)
#define MULTILINE_MACRO_END \
__pragma(warning(push)) \
__pragma(warning(disable:4127)) \
Expand Down

0 comments on commit a0332c4

Please sign in to comment.