Daniela Engert wrote:
I've reworked my pull-request by incorporating your suggestions with some minor additional tweaks required to make it work.
+#if !defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES) +# define BOOST_TYPEOF_DECLTYPE +# if !defined(BOOST_TYPEOF_EMULATION) && !defined(BOOST_TYPEOF_NATIVE) +# define BOOST_TYPEOF_NATIVE +# endif +#endif + #if defined(__COMO__)
I'd think that if we hit the decltype case, we no longer need to enter the compiler-specific branches below that. So #if !defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES) && !defined(BOOST_TYPEOF_EMULATION) # define BOOST_TYPEOF_DECLTYPE # if !defined(BOOST_TYPEOF_NATIVE) # define BOOST_TYPEOF_NATIVE # endif #elif defined(__COMO__) perhaps? Tested as before.