[svn] commit: r2552 - in /trunk/src/lib/dns/util: base16_from_binary.h base32hex_from_binary.h binary_from_base16.h binary_from_base32hex.h
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Jul 20 22:27:43 UTC 2010
Author: jinmei
Date: Tue Jul 20 22:27:42 2010
New Revision: 2552
Log:
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.
Modified:
trunk/src/lib/dns/util/base16_from_binary.h
trunk/src/lib/dns/util/base32hex_from_binary.h
trunk/src/lib/dns/util/binary_from_base16.h
trunk/src/lib/dns/util/binary_from_base32hex.h
Modified: trunk/src/lib/dns/util/base16_from_binary.h
==============================================================================
--- trunk/src/lib/dns/util/base16_from_binary.h (original)
+++ trunk/src/lib/dns/util/base16_from_binary.h Tue Jul 20 22:27:42 2010
@@ -26,10 +26,8 @@
} // 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 {
Modified: trunk/src/lib/dns/util/base32hex_from_binary.h
==============================================================================
--- trunk/src/lib/dns/util/base32hex_from_binary.h (original)
+++ trunk/src/lib/dns/util/base32hex_from_binary.h Tue Jul 20 22:27:42 2010
@@ -26,10 +26,10 @@
} // 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 {
Modified: trunk/src/lib/dns/util/binary_from_base16.h
==============================================================================
--- trunk/src/lib/dns/util/binary_from_base16.h (original)
+++ trunk/src/lib/dns/util/binary_from_base16.h Tue Jul 20 22:27:42 2010
@@ -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>
Modified: trunk/src/lib/dns/util/binary_from_base32hex.h
==============================================================================
--- trunk/src/lib/dns/util/binary_from_base32hex.h (original)
+++ trunk/src/lib/dns/util/binary_from_base32hex.h Tue Jul 20 22:27:42 2010
@@ -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>
More information about the bind10-changes
mailing list