From eddae9798380ca152f8a1571fc20a6f31b8643cd Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Tue, 10 Jan 2006 13:53:48 +0000 Subject: [PATCH] boost/pending/property_serialize.hpp: - Moved serialization code here boost/pending/property.hpp: - From here boost/graph/adj_list_serialize.hpp: - Include the new property_serialization header [SVN r32275] --- include/boost/graph/adj_list_serialize.hpp | 2 +- include/boost/pending/property.hpp | 22 +--------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/include/boost/graph/adj_list_serialize.hpp b/include/boost/graph/adj_list_serialize.hpp index ba76f6a4..94f6d759 100644 --- a/include/boost/graph/adj_list_serialize.hpp +++ b/include/boost/graph/adj_list_serialize.hpp @@ -2,7 +2,7 @@ #define ADJ_LIST_SERIALIZE_HPP #include - +#include #include #include diff --git a/include/boost/pending/property.hpp b/include/boost/pending/property.hpp index 25cc1cea..f4d2cb91 100644 --- a/include/boost/pending/property.hpp +++ b/include/boost/pending/property.hpp @@ -8,14 +8,6 @@ #include -#if ! BOOST_WORKAROUND (__GNUC__, < 3) -// Wierd, I get compilation errors if the following include is -// removed, but it shouldn't be needed. Some kind of strange -// include dependency in the serialization library. -#include -#include -#endif - namespace boost { struct no_property { @@ -24,12 +16,8 @@ namespace boost { typedef no_property value_type; enum { num = 0 }; typedef void kind; - -#if ! BOOST_WORKAROUND (__GNUC__, < 3) - template - void serialize(Archive & ar, const unsigned int version) { } -#endif }; + template struct property : public Base { typedef Base next_type; @@ -44,14 +32,6 @@ namespace boost { property(const T& v, const Base& b) : Base(b), m_value(v) { } // copy constructor and assignment operator will be generated by compiler -#if ! BOOST_WORKAROUND (__GNUC__, < 3) - template - void serialize(Archive & ar, const unsigned int version) { - ar & boost::serialization::base_object(*this); - ar & m_value; - } -#endif - T m_value; };