Merge branch 'develop'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
jzmaddock
2018-03-07 18:04:01 +00:00
2 changed files with 30 additions and 1 deletions

View File

@ -346,6 +346,9 @@
# if defined(BOOST_ASSERT_CONFIG)
# error "Boost.Config is older than your current compiler version."
# elif !defined(BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE)
BOOST_PRAGMA_MESSAGE("Info: Boost.Config is older than your compiler version - probably nothing bad will happen - but you may wish to look for an updated Boost version. Define BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE to suppress this message.")
//
// Disabled as of March 2018 - the pace of VS releases is hard to keep up with
// and in any case, we have relatively few defect macros defined now.
// BOOST_PRAGMA_MESSAGE("Info: Boost.Config is older than your compiler version - probably nothing bad will happen - but you may wish to look for an updated Boost version. Define BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE to suppress this message.")
# endif
#endif

View File

@ -228,6 +228,32 @@ void print_compiler_macros()
PRINT_MACRO(__CYGWIN__);
PRINT_MACRO(__MINGW32__);
PRINT_MACRO(__GXX_RTTI);
PRINT_MACRO(__alpha__);
PRINT_MACRO(__amd64__);
PRINT_MACRO(__arm__);
PRINT_MACRO(__aarch64__);
PRINT_MACRO(__bfin);
PRINT_MACRO(__convex__);
PRINT_MACRO(__epiphany__);
PRINT_MACRO(__hppa__);
PRINT_MACRO(__ia64__);
PRINT_MACRO(__IA64);
PRINT_MACRO(__IA64__);
PRINT_MACRO(__m68k__);
PRINT_MACRO(__mips__);
PRINT_MACRO(__powerpc);
PRINT_MACRO(__powerpc__);
PRINT_MACRO(__powerpc64__);
PRINT_MACRO(__POWERPC__);
PRINT_MACRO(__ppc__);
PRINT_MACRO(__ppc64__);
PRINT_MACRO(__PPC__);
PRINT_MACRO(__PPC64__);
PRINT_MACRO(_ARCH_PPC);
PRINT_MACRO(_ARCH_PPC64);
PRINT_MACRO(__sh__);
PRINT_MACRO(__370__);
PRINT_MACRO(__THW_370__);
// HP aCC:
PRINT_MACRO(__HP_aCC);
PRINT_MACRO(_HPACC_);