Commit ee16d6b5 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

include base64 headers to subsequently include necessary boost header files,...

include base64 headers to subsequently include necessary boost header files, instead of including them from our own header files directly.
this will fix build problems in different versions of boost.


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@2552 e5f2f494-b856-4b98-b285-d166d9295462
parent e3e8fd7f
......@@ -26,10 +26,8 @@ namespace std{
} // namespace std
#endif
#include <boost/serialization/pfto.hpp>
#include <boost/iterator/transform_iterator.hpp>
#include <boost/archive/iterators/dataflow_exception.hpp>
// See base32hex_from_binary.h for why we need base64_from...hpp here.
#include <boost/archive/iterators/base64_from_binary.hpp>
namespace boost {
namespace archive {
......
......@@ -26,10 +26,10 @@ namespace std{
} // namespace std
#endif
#include <boost/serialization/pfto.hpp>
#include <boost/iterator/transform_iterator.hpp>
#include <boost/archive/iterators/dataflow_exception.hpp>
// We use the same boost header files used in "base64_from_". Since the
// precise path to these headers may vary depending on the boost version we
// simply include the base64 header here.
#include <boost/archive/iterators/base64_from_binary.hpp>
namespace boost {
namespace archive {
......
......@@ -18,13 +18,8 @@
#include <cassert>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
#include <boost/serialization/throw_exception.hpp>
#include <boost/serialization/pfto.hpp>
#include <boost/static_assert.hpp>
#include <boost/iterator/transform_iterator.hpp>
#include <boost/archive/iterators/dataflow_exception.hpp>
// See binary_from_base32hex.h for why we need _from_base64.hpp here.
#include <boost/archive/iterators/binary_from_base64.hpp>
#include <exceptions/exceptions.h>
......
......@@ -18,13 +18,10 @@
#include <cassert>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
#include <boost/serialization/throw_exception.hpp>
#include <boost/serialization/pfto.hpp>
#include <boost/static_assert.hpp>
#include <boost/iterator/transform_iterator.hpp>
#include <boost/archive/iterators/dataflow_exception.hpp>
// We use the same boost header files used in "_from_base64". Since the
// precise path to these headers may vary depending on the boost version we
// simply include the base64 header here.
#include <boost/archive/iterators/binary_from_base64.hpp>
#include <exceptions/exceptions.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment