X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=boost%2Fserialization%2Fversion.hpp;h=21a74d73daa9886abc20d06819f5f49cd1820032;hb=08c1e93fa36a49f49325a07fe91ff92c964c2b6c;hp=ef3dff2f4729bd085b0b177dfdaf52e3af17a404;hpb=bb4dd8289b351fae6b55e303f189127a394a1edd;p=platform%2Fupstream%2Fboost.git diff --git a/boost/serialization/version.hpp b/boost/serialization/version.hpp index ef3dff2..21a74d7 100644 --- a/boost/serialization/version.hpp +++ b/boost/serialization/version.hpp @@ -2,7 +2,7 @@ #define BOOST_SERIALIZATION_VERSION_HPP // MS compatible compilers support #pragma once -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma once #endif @@ -37,14 +37,14 @@ struct version { template struct traits_class_version { - typedef BOOST_DEDUCED_TYPENAME U::version type; + typedef typename U::version type; }; typedef mpl::integral_c_tag tag; // note: at least one compiler complained w/o the full qualification // on basic traits below typedef - BOOST_DEDUCED_TYPENAME mpl::eval_if< + typename mpl::eval_if< is_base_and_derived, traits_class_version< T >, mpl::int_<0>