summaryrefslogtreecommitdiff
path: root/boost/archive/detail/basic_iarchive.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/archive/detail/basic_iarchive.hpp')
-rw-r--r--boost/archive/detail/basic_iarchive.hpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/boost/archive/detail/basic_iarchive.hpp b/boost/archive/detail/basic_iarchive.hpp
index fdafbbf841..ce8dbc0793 100644
--- a/boost/archive/detail/basic_iarchive.hpp
+++ b/boost/archive/detail/basic_iarchive.hpp
@@ -17,10 +17,10 @@
// See http://www.boost.org for updates, documentation, and revision history.
// can't use this - much as I'd like to as borland doesn't support it
-// #include <boost/scoped_ptr.hpp>
#include <boost/config.hpp>
#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
#include <boost/serialization/tracking_enum.hpp>
#include <boost/archive/basic_archive.hpp>
@@ -47,9 +47,7 @@ class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iarchive :
{
friend class basic_iarchive_impl;
// hide implementation of this class to minimize header conclusion
- // in client code. I couldn't used scoped pointer with borland
- // boost::scoped_ptr<basic_iarchive_impl> pimpl;
- basic_iarchive_impl * pimpl;
+ boost::scoped_ptr<basic_iarchive_impl> pimpl;
virtual void vload(version_type &t) = 0;
virtual void vload(object_id_type &t) = 0;
@@ -59,12 +57,12 @@ class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iarchive :
virtual void vload(tracking_type &t) = 0;
protected:
basic_iarchive(unsigned int flags);
+public:
// account for bogus gcc warning
#if defined(__GNUC__)
virtual
#endif
~basic_iarchive();
-public:
// note: NOT part of the public API.
void next_object_pointer(void *t);
void register_basic_serializer(