From: dgregor_at_[hidden]
Date: 2008-04-11 11:39:41
Author: dgregor
Date: 2008-04-11 11:39:41 EDT (Fri, 11 Apr 2008)
New Revision: 44175
URL: http://svn.boost.org/trac/boost/changeset/44175
Log:
Fix some header-inclusion and header-ordering issues to get the MPI library compiling again.
Text files modified:
trunk/boost/archive/detail/basic_serializer.hpp | 8 +++++---
trunk/boost/archive/detail/basic_serializer_map.hpp | 2 ++
trunk/boost/archive/impl/archive_pointer_oserializer.ipp | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
Modified: trunk/boost/archive/detail/basic_serializer.hpp
==============================================================================
--- trunk/boost/archive/detail/basic_serializer.hpp (original)
+++ trunk/boost/archive/detail/basic_serializer.hpp 2008-04-11 11:39:41 EDT (Fri, 11 Apr 2008)
@@ -41,11 +41,13 @@
const boost::serialization::extended_type_info & get_eti() const {
return m_eti;
}
- bool operator<(const basic_serializer & rhs) const {
- return & m_eti < & rhs.get_eti();
- }
};
+inline bool
+operator<(const basic_serializer & lhs, const basic_serializer & rhs) {
+ return & lhs.get_eti() < & rhs.get_eti();
+}
+
class basic_serializer_arg : public basic_serializer {
public:
basic_serializer_arg(const serialization::extended_type_info & eti) :
Modified: trunk/boost/archive/detail/basic_serializer_map.hpp
==============================================================================
--- trunk/boost/archive/detail/basic_serializer_map.hpp (original)
+++ trunk/boost/archive/detail/basic_serializer_map.hpp 2008-04-11 11:39:41 EDT (Fri, 11 Apr 2008)
@@ -34,6 +34,8 @@
class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_serializer;
+bool operator<(const basic_serializer & lhs, const basic_serializer & rhs);
+
struct BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) type_info_pointer_compare
{
bool operator()(
Modified: trunk/boost/archive/impl/archive_pointer_oserializer.ipp
==============================================================================
--- trunk/boost/archive/impl/archive_pointer_oserializer.ipp (original)
+++ trunk/boost/archive/impl/archive_pointer_oserializer.ipp 2008-04-11 11:39:41 EDT (Fri, 11 Apr 2008)
@@ -15,6 +15,7 @@
#include <boost/archive/detail/archive_pointer_oserializer.hpp>
#include <boost/archive/detail/basic_serializer_map.hpp>
+#include <boost/serialization/singleton.hpp>
namespace boost {
namespace archive {