diff --git a/src/basic_oserializer.cpp b/src/basic_oserializer.cpp index 19d28bb4..17188bf1 100644 --- a/src/basic_oserializer.cpp +++ b/src/basic_oserializer.cpp @@ -17,9 +17,9 @@ namespace detail { BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oserializer::basic_oserializer( - const boost::serialization::extended_type_info & type_ + const boost::serialization::extended_type_info & eti ) : - basic_serializer(type_), + basic_serializer(eti), bpos(NULL) {} diff --git a/src/basic_pointer_iserializer.cpp b/src/basic_pointer_iserializer.cpp index 0a135bbe..fac766fd 100644 --- a/src/basic_pointer_iserializer.cpp +++ b/src/basic_pointer_iserializer.cpp @@ -17,9 +17,9 @@ namespace detail { BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_iserializer::basic_pointer_iserializer( - const boost::serialization::extended_type_info & type_ + const boost::serialization::extended_type_info & eti ) : - basic_serializer(type_) + basic_serializer(eti) {} BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) diff --git a/src/basic_pointer_oserializer.cpp b/src/basic_pointer_oserializer.cpp index 9cad5a38..9e9f1dd1 100644 --- a/src/basic_pointer_oserializer.cpp +++ b/src/basic_pointer_oserializer.cpp @@ -17,9 +17,9 @@ namespace detail { BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_oserializer::basic_pointer_oserializer( - const boost::serialization::extended_type_info & type_ + const boost::serialization::extended_type_info & eti ) : - basic_serializer(type_) + basic_serializer(eti) {} BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) diff --git a/src/basic_serializer_map.cpp b/src/basic_serializer_map.cpp index a2e634d5..b2c95aaf 100644 --- a/src/basic_serializer_map.cpp +++ b/src/basic_serializer_map.cpp @@ -43,9 +43,9 @@ public: BOOST_ARCHIVE_DECL(const basic_serializer *) basic_serializer_map::tfind( - const boost::serialization::extended_type_info & type_ + const boost::serialization::extended_type_info & eti ) const { - const basic_serializer_arg bs(type_); + const basic_serializer_arg bs(eti); map_type::const_iterator it; it = map.find(& bs); if(it == map.end()) diff --git a/src/extended_type_info_typeid.cpp b/src/extended_type_info_typeid.cpp index 8362825b..78dd9f61 100644 --- a/src/extended_type_info_typeid.cpp +++ b/src/extended_type_info_typeid.cpp @@ -19,8 +19,8 @@ namespace detail { BOOST_SERIALIZATION_DECL(bool) extended_type_info_typeid_0::less_than(const extended_type_info &rhs) const { - return 0 != get_type().before( - static_cast(rhs).get_type() + return 0 != get_eti().before( + static_cast(rhs).get_eti() ); } @@ -39,7 +39,7 @@ class extended_type_info_typeid_arg : { private: const std::type_info & ti; - virtual const std::type_info &get_type() const + virtual const std::type_info &get_eti() const { return ti; }