Merge branch 'bugfix/clang_extension_warning' into develop

This commit is contained in:
morinmorin
2014-10-26 12:28:11 +09:00

View File

@@ -217,7 +217,7 @@
# define BOOST_NO_CXX14_AGGREGATE_NSDMI # define BOOST_NO_CXX14_AGGREGATE_NSDMI
#endif #endif
#if !(__has_feature(cxx_init_captures) || __has_extension(cxx_init_captures)) #if !__has_feature(cxx_init_captures)
# define BOOST_NO_CXX14_INITIALIZED_LAMBDA_CAPTURES # define BOOST_NO_CXX14_INITIALIZED_LAMBDA_CAPTURES
#endif #endif
@@ -248,7 +248,7 @@
# define BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION # define BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION
#endif #endif
#if !(__has_feature(cxx_variable_templates) || __has_extension(cxx_variable_templates)) #if !__has_feature(cxx_variable_templates)
# define BOOST_NO_CXX14_VARIABLE_TEMPLATES # define BOOST_NO_CXX14_VARIABLE_TEMPLATES
#endif #endif