From b526e19c6ee18af5627176fd40df8f871816694c Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Mon, 5 Jul 2010 15:54:39 +0200
Subject: [PATCH] COMP: revert changes made to boost BGL by changesets
81509cbf3b59 and f27861ffe0c6
---
.../boost/archive/impl/basic_xml_grammar.hpp | 2 +-
Utilities/BGL/boost/bexception/all.hpp | 36 -------------------
Utilities/BGL/boost/current_function.hpp | 2 +-
Utilities/BGL/boost/detail/call_traits.hpp | 2 +-
.../BGL/boost/detail/compressed_pair.hpp | 2 +-
Utilities/BGL/boost/detail/identifier.hpp | 2 +-
Utilities/BGL/boost/detail/ob_call_traits.hpp | 2 +-
.../BGL/boost/detail/ob_compressed_pair.hpp | 2 +-
Utilities/BGL/boost/exception/all.hpp | 36 +++++++++++++++++++
.../current_exception_cast.hpp | 0
.../detail/attribute_noreturn.hpp | 0
.../detail/error_info_impl.hpp | 0
.../detail/exception_ptr.hpp | 8 ++---
.../detail/is_output_streamable.hpp | 0
.../detail/object_hex_dump.hpp | 2 +-
.../detail/type_info.hpp | 0
.../diagnostic_information.hpp | 6 ++--
.../enable_current_exception.hpp | 2 +-
.../enable_error_info.hpp | 2 +-
.../errinfo_api_function.hpp | 2 +-
.../errinfo_at_line.hpp | 0
.../errinfo_errno.hpp | 2 +-
.../errinfo_file_handle.hpp | 0
.../errinfo_file_name.hpp | 0
.../errinfo_file_open_mode.hpp | 0
.../errinfo_nested_exception.hpp | 0
.../errinfo_type_info_name.hpp | 0
.../{bexception => exception}/error_info.hpp | 0
.../{bexception => exception}/exception.hpp | 0
.../get_error_info.hpp | 6 ++--
.../boost/{bexception => exception}/info.hpp | 6 ++--
.../{bexception => exception}/info_tuple.hpp | 2 +-
.../{bexception => exception}/to_string.hpp | 4 +--
.../to_string_stub.hpp | 4 +--
.../BGL/boost/function/function_base.hpp | 2 +-
.../detail/container_fwd.hpp | 0
.../{bfunctional => functional}/hash.hpp | 2 +-
.../hash/detail/float_functions.hpp | 0
.../hash/detail/hash_float.hpp | 10 +++---
.../hash/detail/hash_float_generic.hpp | 4 +--
.../hash/detail/hash_float_x86.hpp | 0
.../hash/detail/limits.hpp | 0
.../hash/extensions.hpp | 2 +-
.../{bfunctional => functional}/hash/hash.hpp | 6 ++--
.../hash/hash_fwd.hpp | 0
.../{bfunctional => functional}/hash_fwd.hpp | 2 +-
.../graph/compressed_sparse_row_graph.hpp | 2 +-
.../detail/compressed_sparse_row_struct.hpp | 2 +-
.../graph/distributed/mpi_process_group.hpp | 2 +-
.../boost/graph/distributed/named_graph.hpp | 2 +-
Utilities/BGL/boost/graph/lookup_edge.hpp | 2 +-
Utilities/BGL/boost/graph/overloading.hpp | 2 +-
Utilities/BGL/boost/mpl/for_each.hpp | 2 +-
.../BGL/boost/multi_index/composite_key.hpp | 4 +--
.../multi_index/detail/hash_index_args.hpp | 2 +-
.../BGL/boost/multi_index/global_fun.hpp | 2 +-
Utilities/BGL/boost/multi_index/identity.hpp | 2 +-
Utilities/BGL/boost/multi_index/mem_fun.hpp | 2 +-
Utilities/BGL/boost/multi_index/member.hpp | 2 +-
Utilities/BGL/boost/multi_index_container.hpp | 2 +-
Utilities/BGL/boost/operators.hpp | 2 +-
Utilities/BGL/boost/optional/optional.hpp | 2 +-
Utilities/BGL/boost/optional/optional_io.hpp | 2 +-
.../BGL/boost/parameter/aux_/result_of0.hpp | 4 +--
Utilities/BGL/boost/parameter/name.hpp | 2 +-
.../BGL/boost/python/detail/enable_if.hpp | 2 +-
.../BGL/boost/python/object/value_holder.hpp | 2 +-
Utilities/BGL/boost/ref.hpp | 2 +-
Utilities/BGL/boost/throw_exception.hpp | 6 ++--
Utilities/BGL/boost/unordered/detail/move.hpp | 2 +-
.../BGL/boost/unordered/unordered_map.hpp | 2 +-
.../BGL/boost/unordered/unordered_map_fwd.hpp | 2 +-
.../BGL/boost/unordered/unordered_set.hpp | 2 +-
.../BGL/boost/unordered/unordered_set_fwd.hpp | 2 +-
.../boost/{butility => utility}/addressof.hpp | 0
.../base_from_member.hpp | 2 +-
.../boost/{butility => utility}/binary.hpp | 0
.../compare_pointees.hpp | 0
.../detail/in_place_factory_prefix.hpp | 0
.../detail/in_place_factory_suffix.hpp | 0
.../detail/result_of_iterate.hpp | 0
.../boost/{butility => utility}/enable_if.hpp | 0
.../in_place_factory.hpp | 6 ++--
.../boost/{butility => utility}/result_of.hpp | 2 +-
.../BGL/boost/{butility => utility}/swap.hpp | 0
.../typed_in_place_factory.hpp | 6 ++--
.../{butility => utility}/value_init.hpp | 2 +-
87 files changed, 121 insertions(+), 121 deletions(-)
delete mode 100644 Utilities/BGL/boost/bexception/all.hpp
create mode 100644 Utilities/BGL/boost/exception/all.hpp
rename Utilities/BGL/boost/{bexception => exception}/current_exception_cast.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/detail/attribute_noreturn.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/detail/error_info_impl.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/detail/exception_ptr.hpp (98%)
rename Utilities/BGL/boost/{bexception => exception}/detail/is_output_streamable.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/detail/object_hex_dump.hpp (96%)
rename Utilities/BGL/boost/{bexception => exception}/detail/type_info.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/diagnostic_information.hpp (97%)
rename Utilities/BGL/boost/{bexception => exception}/enable_current_exception.hpp (83%)
rename Utilities/BGL/boost/{bexception => exception}/enable_error_info.hpp (83%)
rename Utilities/BGL/boost/{bexception => exception}/errinfo_api_function.hpp (93%)
rename Utilities/BGL/boost/{bexception => exception}/errinfo_at_line.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/errinfo_errno.hpp (96%)
rename Utilities/BGL/boost/{bexception => exception}/errinfo_file_handle.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/errinfo_file_name.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/errinfo_file_open_mode.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/errinfo_nested_exception.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/errinfo_type_info_name.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/error_info.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/exception.hpp (100%)
rename Utilities/BGL/boost/{bexception => exception}/get_error_info.hpp (95%)
rename Utilities/BGL/boost/{bexception => exception}/info.hpp (96%)
rename Utilities/BGL/boost/{bexception => exception}/info_tuple.hpp (98%)
rename Utilities/BGL/boost/{bexception => exception}/to_string.hpp (95%)
rename Utilities/BGL/boost/{bexception => exception}/to_string_stub.hpp (96%)
rename Utilities/BGL/boost/{bfunctional => functional}/detail/container_fwd.hpp (100%)
rename Utilities/BGL/boost/{bfunctional => functional}/hash.hpp (81%)
rename Utilities/BGL/boost/{bfunctional => functional}/hash/detail/float_functions.hpp (100%)
rename Utilities/BGL/boost/{bfunctional => functional}/hash/detail/hash_float.hpp (87%)
rename Utilities/BGL/boost/{bfunctional => functional}/hash/detail/hash_float_generic.hpp (96%)
rename Utilities/BGL/boost/{bfunctional => functional}/hash/detail/hash_float_x86.hpp (100%)
rename Utilities/BGL/boost/{bfunctional => functional}/hash/detail/limits.hpp (100%)
rename Utilities/BGL/boost/{bfunctional => functional}/hash/extensions.hpp (99%)
rename Utilities/BGL/boost/{bfunctional => functional}/hash/hash.hpp (98%)
rename Utilities/BGL/boost/{bfunctional => functional}/hash/hash_fwd.hpp (100%)
rename Utilities/BGL/boost/{bfunctional => functional}/hash_fwd.hpp (80%)
rename Utilities/BGL/boost/{butility => utility}/addressof.hpp (100%)
rename Utilities/BGL/boost/{butility => utility}/base_from_member.hpp (97%)
rename Utilities/BGL/boost/{butility => utility}/binary.hpp (100%)
rename Utilities/BGL/boost/{butility => utility}/compare_pointees.hpp (100%)
rename Utilities/BGL/boost/{butility => utility}/detail/in_place_factory_prefix.hpp (100%)
rename Utilities/BGL/boost/{butility => utility}/detail/in_place_factory_suffix.hpp (100%)
rename Utilities/BGL/boost/{butility => utility}/detail/result_of_iterate.hpp (100%)
rename Utilities/BGL/boost/{butility => utility}/enable_if.hpp (100%)
rename Utilities/BGL/boost/{butility => utility}/in_place_factory.hpp (91%)
rename Utilities/BGL/boost/{butility => utility}/result_of.hpp (97%)
rename Utilities/BGL/boost/{butility => utility}/swap.hpp (100%)
rename Utilities/BGL/boost/{butility => utility}/typed_in_place_factory.hpp (90%)
rename Utilities/BGL/boost/{butility => utility}/value_init.hpp (97%)
diff --git a/Utilities/BGL/boost/archive/impl/basic_xml_grammar.hpp b/Utilities/BGL/boost/archive/impl/basic_xml_grammar.hpp
index 056416c290..768009cafb 100644
--- a/Utilities/BGL/boost/archive/impl/basic_xml_grammar.hpp
+++ b/Utilities/BGL/boost/archive/impl/basic_xml_grammar.hpp
@@ -67,7 +67,7 @@
// spirit stuff
#if (defined __BORLANDC__) && (__BORLANDC__ < 0x593) \
|| (defined _MSC_VER) && (_MSC_VER <= 1300)
-#include <boost/spirit/butility/chset.hpp>
+#include <boost/spirit/utility/chset.hpp>
#else
#include <boost/spirit/include/classic_chset.hpp>
#endif
diff --git a/Utilities/BGL/boost/bexception/all.hpp b/Utilities/BGL/boost/bexception/all.hpp
deleted file mode 100644
index 4592623118..0000000000
--- a/Utilities/BGL/boost/bexception/all.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//Copyright (c) 2006-2008 Emil Dotchevski and Reverge Studios, Inc.
-
-//Distributed under the Boost Software License, Version 1.0. (See accompanying
-//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef UUID_316FDA946C0D11DEA9CBAE5255D89593
-#define UUID_316FDA946C0D11DEA9CBAE5255D89593
-#if defined(__GNUC__) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
-#pragma GCC system_header
-#endif
-#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
-#pragma warning(push,1)
-#endif
-
-#include <boost/bexception/diagnostic_information.hpp>
-#include <boost/bexception/error_info.hpp>
-#include <boost/bexception/bexception/.hpp>
-#include <boost/bexception/get_error_info.hpp>
-#include <boost/bexception/info.hpp>
-#include <boost/bexception/info_tuple.hpp>
-#include <boost/bexception/errinfo_api_function.hpp>
-#include <boost/bexception/errinfo_at_line.hpp>
-#include <boost/bexception/errinfo_errno.hpp>
-#include <boost/bexception/errinfo_file_handle.hpp>
-#include <boost/bexception/errinfo_file_name.hpp>
-#include <boost/bexception/errinfo_file_open_mode.hpp>
-#include <boost/bexception/errinfo_type_info_name.hpp>
-#ifndef BOOST_NO_EXCEPTIONS
-#include <boost/bexception/errinfo_nested_exception.hpp>
-#include <boost/bexception/_ptr.hpp>
-#endif
-
-#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
-#pragma warning(pop)
-#endif
-#endif
diff --git a/Utilities/BGL/boost/current_function.hpp b/Utilities/BGL/boost/current_function.hpp
index de50bbd070..aa5756e0a5 100644
--- a/Utilities/BGL/boost/current_function.hpp
+++ b/Utilities/BGL/boost/current_function.hpp
@@ -16,7 +16,7 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
-// http://www.boost.org/libs/butility/current_function.html
+// http://www.boost.org/libs/utility/current_function.html
//
namespace boost
diff --git a/Utilities/BGL/boost/detail/call_traits.hpp b/Utilities/BGL/boost/detail/call_traits.hpp
index 3d4fd6bffe..6ad646ec60 100644
--- a/Utilities/BGL/boost/detail/call_traits.hpp
+++ b/Utilities/BGL/boost/detail/call_traits.hpp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/utility for most recent version including documentation.
// call_traits: defines typedefs for function usage
-// (see libs/butility/call_traits.htm)
+// (see libs/utility/call_traits.htm)
/* Release notes:
23rd July 2000:
diff --git a/Utilities/BGL/boost/detail/compressed_pair.hpp b/Utilities/BGL/boost/detail/compressed_pair.hpp
index 33fbe6c800..3f326456ce 100644
--- a/Utilities/BGL/boost/detail/compressed_pair.hpp
+++ b/Utilities/BGL/boost/detail/compressed_pair.hpp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/utility for most recent version including documentation.
// compressed_pair: pair that "compresses" empty members
-// (see libs/butility/compressed_pair.htm)
+// (see libs/utility/compressed_pair.htm)
//
// JM changes 25 Jan 2004:
// For the case where T1 == T2 and both are empty, then first() and second()
diff --git a/Utilities/BGL/boost/detail/identifier.hpp b/Utilities/BGL/boost/detail/identifier.hpp
index 6300f29fae..688a664f7d 100644
--- a/Utilities/BGL/boost/detail/identifier.hpp
+++ b/Utilities/BGL/boost/detail/identifier.hpp
@@ -10,7 +10,7 @@
#ifndef BOOST_IDENTIFIER_HPP
#define BOOST_IDENTIFIER_HPP
-#include <boost/butility/enable_if.hpp>
+#include <boost/utility/enable_if.hpp>
#include <boost/type_traits/is_base_of.hpp>
#include <iosfwd>
diff --git a/Utilities/BGL/boost/detail/ob_call_traits.hpp b/Utilities/BGL/boost/detail/ob_call_traits.hpp
index 20ef66ec8f..eb4df7a30f 100644
--- a/Utilities/BGL/boost/detail/ob_call_traits.hpp
+++ b/Utilities/BGL/boost/detail/ob_call_traits.hpp
@@ -6,7 +6,7 @@
// See http://www.boost.org/libs/utility for most recent version including documentation.
//
// Crippled version for crippled compilers:
-// see libs/butility/call_traits.htm
+// see libs/utility/call_traits.htm
//
/* Release notes:
diff --git a/Utilities/BGL/boost/detail/ob_compressed_pair.hpp b/Utilities/BGL/boost/detail/ob_compressed_pair.hpp
index 3864ce87ae..727acab6da 100644
--- a/Utilities/BGL/boost/detail/ob_compressed_pair.hpp
+++ b/Utilities/BGL/boost/detail/ob_compressed_pair.hpp
@@ -4,7 +4,7 @@
// http://www.boost.org/LICENSE_1_0.txt).
//
// See http://www.boost.org/libs/utility for most recent version including documentation.
-// see libs/butility/compressed_pair.hpp
+// see libs/utility/compressed_pair.hpp
//
/* Release notes:
20 Jan 2001:
diff --git a/Utilities/BGL/boost/exception/all.hpp b/Utilities/BGL/boost/exception/all.hpp
new file mode 100644
index 0000000000..9ffe42a9d0
--- /dev/null
+++ b/Utilities/BGL/boost/exception/all.hpp
@@ -0,0 +1,36 @@
+//Copyright (c) 2006-2008 Emil Dotchevski and Reverge Studios, Inc.
+
+//Distributed under the Boost Software License, Version 1.0. (See accompanying
+//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef UUID_316FDA946C0D11DEA9CBAE5255D89593
+#define UUID_316FDA946C0D11DEA9CBAE5255D89593
+#if defined(__GNUC__) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma GCC system_header
+#endif
+#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(push,1)
+#endif
+
+#include <boost/exception/diagnostic_information.hpp>
+#include <boost/exception/error_info.hpp>
+#include <boost/exception/exception.hpp>
+#include <boost/exception/get_error_info.hpp>
+#include <boost/exception/info.hpp>
+#include <boost/exception/info_tuple.hpp>
+#include <boost/exception/errinfo_api_function.hpp>
+#include <boost/exception/errinfo_at_line.hpp>
+#include <boost/exception/errinfo_errno.hpp>
+#include <boost/exception/errinfo_file_handle.hpp>
+#include <boost/exception/errinfo_file_name.hpp>
+#include <boost/exception/errinfo_file_open_mode.hpp>
+#include <boost/exception/errinfo_type_info_name.hpp>
+#ifndef BOOST_NO_EXCEPTIONS
+#include <boost/exception/errinfo_nested_exception.hpp>
+#include <boost/exception_ptr.hpp>
+#endif
+
+#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(pop)
+#endif
+#endif
diff --git a/Utilities/BGL/boost/bexception/current_exception_cast.hpp b/Utilities/BGL/boost/exception/current_exception_cast.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/current_exception_cast.hpp
rename to Utilities/BGL/boost/exception/current_exception_cast.hpp
diff --git a/Utilities/BGL/boost/bexception/detail/attribute_noreturn.hpp b/Utilities/BGL/boost/exception/detail/attribute_noreturn.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/detail/attribute_noreturn.hpp
rename to Utilities/BGL/boost/exception/detail/attribute_noreturn.hpp
diff --git a/Utilities/BGL/boost/bexception/detail/error_info_impl.hpp b/Utilities/BGL/boost/exception/detail/error_info_impl.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/detail/error_info_impl.hpp
rename to Utilities/BGL/boost/exception/detail/error_info_impl.hpp
diff --git a/Utilities/BGL/boost/bexception/detail/exception_ptr.hpp b/Utilities/BGL/boost/exception/detail/exception_ptr.hpp
similarity index 98%
rename from Utilities/BGL/boost/bexception/detail/exception_ptr.hpp
rename to Utilities/BGL/boost/exception/detail/exception_ptr.hpp
index 68c697e50f..78db17c065 100644
--- a/Utilities/BGL/boost/bexception/detail/exception_ptr.hpp
+++ b/Utilities/BGL/boost/exception/detail/exception_ptr.hpp
@@ -16,10 +16,10 @@
#ifdef BOOST_NO_EXCEPTIONS
#error This header requires exception handling to be enabled.
#endif
-#include <boost/bexception/bexception/.hpp>
-#include <boost/bexception/info.hpp>
-#include <boost/bexception/diagnostic_information.hpp>
-#include <boost/bexception/detail/type_info.hpp>
+#include <boost/exception/exception.hpp>
+#include <boost/exception/info.hpp>
+#include <boost/exception/diagnostic_information.hpp>
+#include <boost/exception/detail/type_info.hpp>
#include <boost/shared_ptr.hpp>
#include <stdexcept>
#include <new>
diff --git a/Utilities/BGL/boost/bexception/detail/is_output_streamable.hpp b/Utilities/BGL/boost/exception/detail/is_output_streamable.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/detail/is_output_streamable.hpp
rename to Utilities/BGL/boost/exception/detail/is_output_streamable.hpp
diff --git a/Utilities/BGL/boost/bexception/detail/object_hex_dump.hpp b/Utilities/BGL/boost/exception/detail/object_hex_dump.hpp
similarity index 96%
rename from Utilities/BGL/boost/bexception/detail/object_hex_dump.hpp
rename to Utilities/BGL/boost/exception/detail/object_hex_dump.hpp
index c5c539b16e..ccf1bac3f7 100644
--- a/Utilities/BGL/boost/bexception/detail/object_hex_dump.hpp
+++ b/Utilities/BGL/boost/exception/detail/object_hex_dump.hpp
@@ -12,7 +12,7 @@
#pragma warning(push,1)
#endif
-#include <boost/bexception/detail/type_info.hpp>
+#include <boost/exception/detail/type_info.hpp>
#include <iomanip>
#include <ios>
#include <string>
diff --git a/Utilities/BGL/boost/bexception/detail/type_info.hpp b/Utilities/BGL/boost/exception/detail/type_info.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/detail/type_info.hpp
rename to Utilities/BGL/boost/exception/detail/type_info.hpp
diff --git a/Utilities/BGL/boost/bexception/diagnostic_information.hpp b/Utilities/BGL/boost/exception/diagnostic_information.hpp
similarity index 97%
rename from Utilities/BGL/boost/bexception/diagnostic_information.hpp
rename to Utilities/BGL/boost/exception/diagnostic_information.hpp
index cbd0db6668..632a5a3339 100644
--- a/Utilities/BGL/boost/bexception/diagnostic_information.hpp
+++ b/Utilities/BGL/boost/exception/diagnostic_information.hpp
@@ -13,15 +13,15 @@
#endif
#include <boost/config.hpp>
-#include <boost/bexception/get_error_info.hpp>
-#include <boost/butility/enable_if.hpp>
+#include <boost/exception/get_error_info.hpp>
+#include <boost/utility/enable_if.hpp>
#include <boost/config.hpp>
#include <exception>
#include <sstream>
#include <string>
#ifndef BOOST_NO_EXCEPTIONS
-#include <boost/bexception/current_exception_cast.hpp>
+#include <boost/exception/current_exception_cast.hpp>
namespace
boost
{
diff --git a/Utilities/BGL/boost/bexception/enable_current_exception.hpp b/Utilities/BGL/boost/exception/enable_current_exception.hpp
similarity index 83%
rename from Utilities/BGL/boost/bexception/enable_current_exception.hpp
rename to Utilities/BGL/boost/exception/enable_current_exception.hpp
index 458af90b66..988105378c 100644
--- a/Utilities/BGL/boost/bexception/enable_current_exception.hpp
+++ b/Utilities/BGL/boost/exception/enable_current_exception.hpp
@@ -3,4 +3,4 @@
//Distributed under the Boost Software License, Version 1.0. (See accompanying
//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/bexception/bexception/.hpp>
+#include <boost/exception/exception.hpp>
diff --git a/Utilities/BGL/boost/bexception/enable_error_info.hpp b/Utilities/BGL/boost/exception/enable_error_info.hpp
similarity index 83%
rename from Utilities/BGL/boost/bexception/enable_error_info.hpp
rename to Utilities/BGL/boost/exception/enable_error_info.hpp
index 458af90b66..988105378c 100644
--- a/Utilities/BGL/boost/bexception/enable_error_info.hpp
+++ b/Utilities/BGL/boost/exception/enable_error_info.hpp
@@ -3,4 +3,4 @@
//Distributed under the Boost Software License, Version 1.0. (See accompanying
//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/bexception/bexception/.hpp>
+#include <boost/exception/exception.hpp>
diff --git a/Utilities/BGL/boost/bexception/errinfo_api_function.hpp b/Utilities/BGL/boost/exception/errinfo_api_function.hpp
similarity index 93%
rename from Utilities/BGL/boost/bexception/errinfo_api_function.hpp
rename to Utilities/BGL/boost/exception/errinfo_api_function.hpp
index 8d555d4ce7..481c61314e 100644
--- a/Utilities/BGL/boost/bexception/errinfo_api_function.hpp
+++ b/Utilities/BGL/boost/exception/errinfo_api_function.hpp
@@ -6,7 +6,7 @@
#ifndef UUID_DDFBB4546C1211DEA4659E9055D89593
#define UUID_DDFBB4546C1211DEA4659E9055D89593
-#include "boost/bexception/error_info.hpp"
+#include "boost/exception/error_info.hpp"
namespace
boost
diff --git a/Utilities/BGL/boost/bexception/errinfo_at_line.hpp b/Utilities/BGL/boost/exception/errinfo_at_line.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/errinfo_at_line.hpp
rename to Utilities/BGL/boost/exception/errinfo_at_line.hpp
diff --git a/Utilities/BGL/boost/bexception/errinfo_errno.hpp b/Utilities/BGL/boost/exception/errinfo_errno.hpp
similarity index 96%
rename from Utilities/BGL/boost/bexception/errinfo_errno.hpp
rename to Utilities/BGL/boost/exception/errinfo_errno.hpp
index d23e47567f..ea74010c94 100644
--- a/Utilities/BGL/boost/bexception/errinfo_errno.hpp
+++ b/Utilities/BGL/boost/exception/errinfo_errno.hpp
@@ -12,7 +12,7 @@
#pragma warning(push,1)
#endif
-#include "boost/bexception/info.hpp"
+#include "boost/exception/info.hpp"
#include <errno.h>
#include <string.h>
diff --git a/Utilities/BGL/boost/bexception/errinfo_file_handle.hpp b/Utilities/BGL/boost/exception/errinfo_file_handle.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/errinfo_file_handle.hpp
rename to Utilities/BGL/boost/exception/errinfo_file_handle.hpp
diff --git a/Utilities/BGL/boost/bexception/errinfo_file_name.hpp b/Utilities/BGL/boost/exception/errinfo_file_name.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/errinfo_file_name.hpp
rename to Utilities/BGL/boost/exception/errinfo_file_name.hpp
diff --git a/Utilities/BGL/boost/bexception/errinfo_file_open_mode.hpp b/Utilities/BGL/boost/exception/errinfo_file_open_mode.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/errinfo_file_open_mode.hpp
rename to Utilities/BGL/boost/exception/errinfo_file_open_mode.hpp
diff --git a/Utilities/BGL/boost/bexception/errinfo_nested_exception.hpp b/Utilities/BGL/boost/exception/errinfo_nested_exception.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/errinfo_nested_exception.hpp
rename to Utilities/BGL/boost/exception/errinfo_nested_exception.hpp
diff --git a/Utilities/BGL/boost/bexception/errinfo_type_info_name.hpp b/Utilities/BGL/boost/exception/errinfo_type_info_name.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/errinfo_type_info_name.hpp
rename to Utilities/BGL/boost/exception/errinfo_type_info_name.hpp
diff --git a/Utilities/BGL/boost/bexception/error_info.hpp b/Utilities/BGL/boost/exception/error_info.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/error_info.hpp
rename to Utilities/BGL/boost/exception/error_info.hpp
diff --git a/Utilities/BGL/boost/bexception/exception.hpp b/Utilities/BGL/boost/exception/exception.hpp
similarity index 100%
rename from Utilities/BGL/boost/bexception/exception.hpp
rename to Utilities/BGL/boost/exception/exception.hpp
diff --git a/Utilities/BGL/boost/bexception/get_error_info.hpp b/Utilities/BGL/boost/exception/get_error_info.hpp
similarity index 95%
rename from Utilities/BGL/boost/bexception/get_error_info.hpp
rename to Utilities/BGL/boost/exception/get_error_info.hpp
index fb35b92944..046f05aeef 100644
--- a/Utilities/BGL/boost/bexception/get_error_info.hpp
+++ b/Utilities/BGL/boost/exception/get_error_info.hpp
@@ -12,9 +12,9 @@
#pragma warning(push,1)
#endif
-#include <boost/bexception/bexception/.hpp>
-#include <boost/bexception/detail/error_info_impl.hpp>
-#include <boost/bexception/detail/type_info.hpp>
+#include <boost/exception/exception.hpp>
+#include <boost/exception/detail/error_info_impl.hpp>
+#include <boost/exception/detail/type_info.hpp>
#include <boost/shared_ptr.hpp>
namespace
diff --git a/Utilities/BGL/boost/bexception/info.hpp b/Utilities/BGL/boost/exception/info.hpp
similarity index 96%
rename from Utilities/BGL/boost/bexception/info.hpp
rename to Utilities/BGL/boost/exception/info.hpp
index ea5babfdef..cbbc2c0b2f 100644
--- a/Utilities/BGL/boost/bexception/info.hpp
+++ b/Utilities/BGL/boost/exception/info.hpp
@@ -12,9 +12,9 @@
#pragma warning(push,1)
#endif
-#include <boost/bexception/bexception/.hpp>
-#include <boost/bexception/to_string_stub.hpp>
-#include <boost/bexception/detail/error_info_impl.hpp>
+#include <boost/exception/exception.hpp>
+#include <boost/exception/to_string_stub.hpp>
+#include <boost/exception/detail/error_info_impl.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/config.hpp>
#include <map>
diff --git a/Utilities/BGL/boost/bexception/info_tuple.hpp b/Utilities/BGL/boost/exception/info_tuple.hpp
similarity index 98%
rename from Utilities/BGL/boost/bexception/info_tuple.hpp
rename to Utilities/BGL/boost/exception/info_tuple.hpp
index 9becb3e2f6..34afe421b1 100644
--- a/Utilities/BGL/boost/bexception/info_tuple.hpp
+++ b/Utilities/BGL/boost/exception/info_tuple.hpp
@@ -12,7 +12,7 @@
#pragma warning(push,1)
#endif
-#include <boost/bexception/info.hpp>
+#include <boost/exception/info.hpp>
#include <boost/tuple/tuple.hpp>
namespace
diff --git a/Utilities/BGL/boost/bexception/to_string.hpp b/Utilities/BGL/boost/exception/to_string.hpp
similarity index 95%
rename from Utilities/BGL/boost/bexception/to_string.hpp
rename to Utilities/BGL/boost/exception/to_string.hpp
index 68d8f3eae7..59bf83d4c0 100644
--- a/Utilities/BGL/boost/bexception/to_string.hpp
+++ b/Utilities/BGL/boost/exception/to_string.hpp
@@ -12,8 +12,8 @@
#pragma warning(push,1)
#endif
-#include <boost/butility/enable_if.hpp>
-#include <boost/bexception/detail/is_output_streamable.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/exception/detail/is_output_streamable.hpp>
#include <sstream>
namespace
diff --git a/Utilities/BGL/boost/bexception/to_string_stub.hpp b/Utilities/BGL/boost/exception/to_string_stub.hpp
similarity index 96%
rename from Utilities/BGL/boost/bexception/to_string_stub.hpp
rename to Utilities/BGL/boost/exception/to_string_stub.hpp
index 3525498592..e41d369775 100644
--- a/Utilities/BGL/boost/bexception/to_string_stub.hpp
+++ b/Utilities/BGL/boost/exception/to_string_stub.hpp
@@ -12,8 +12,8 @@
#pragma warning(push,1)
#endif
-#include <boost/bexception/to_string.hpp>
-#include <boost/bexception/detail/object_hex_dump.hpp>
+#include <boost/exception/to_string.hpp>
+#include <boost/exception/detail/object_hex_dump.hpp>
#include <boost/assert.hpp>
namespace
diff --git a/Utilities/BGL/boost/function/function_base.hpp b/Utilities/BGL/boost/function/function_base.hpp
index 23eacec180..eb201a80e9 100644
--- a/Utilities/BGL/boost/function/function_base.hpp
+++ b/Utilities/BGL/boost/function/function_base.hpp
@@ -31,7 +31,7 @@
#include <boost/detail/workaround.hpp>
#include <boost/type_traits/alignment_of.hpp>
#ifndef BOOST_NO_SFINAE
-# include "boost/butility/enable_if.hpp"
+# include "boost/utility/enable_if.hpp"
#else
# include "boost/mpl/bool.hpp"
#endif
diff --git a/Utilities/BGL/boost/bfunctional/detail/container_fwd.hpp b/Utilities/BGL/boost/functional/detail/container_fwd.hpp
similarity index 100%
rename from Utilities/BGL/boost/bfunctional/detail/container_fwd.hpp
rename to Utilities/BGL/boost/functional/detail/container_fwd.hpp
diff --git a/Utilities/BGL/boost/bfunctional/hash.hpp b/Utilities/BGL/boost/functional/hash.hpp
similarity index 81%
rename from Utilities/BGL/boost/bfunctional/hash.hpp
rename to Utilities/BGL/boost/functional/hash.hpp
index b529ad4b74..44983f19b2 100644
--- a/Utilities/BGL/boost/bfunctional/hash.hpp
+++ b/Utilities/BGL/boost/functional/hash.hpp
@@ -3,5 +3,5 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/bfunctional/hash/hash.hpp>
+#include <boost/functional/hash/hash.hpp>
diff --git a/Utilities/BGL/boost/bfunctional/hash/detail/float_functions.hpp b/Utilities/BGL/boost/functional/hash/detail/float_functions.hpp
similarity index 100%
rename from Utilities/BGL/boost/bfunctional/hash/detail/float_functions.hpp
rename to Utilities/BGL/boost/functional/hash/detail/float_functions.hpp
diff --git a/Utilities/BGL/boost/bfunctional/hash/detail/hash_float.hpp b/Utilities/BGL/boost/functional/hash/detail/hash_float.hpp
similarity index 87%
rename from Utilities/BGL/boost/bfunctional/hash/detail/hash_float.hpp
rename to Utilities/BGL/boost/functional/hash/detail/hash_float.hpp
index ef07dddb17..ea1bc25f48 100644
--- a/Utilities/BGL/boost/bfunctional/hash/detail/hash_float.hpp
+++ b/Utilities/BGL/boost/functional/hash/detail/hash_float.hpp
@@ -11,8 +11,8 @@
#endif
#include <boost/config.hpp>
-#include <boost/bfunctional/hash/detail/float_functions.hpp>
-#include <boost/bfunctional/hash/detail/limits.hpp>
+#include <boost/functional/hash/detail/float_functions.hpp>
+#include <boost/functional/hash/detail/limits.hpp>
#include <boost/integer/static_log2.hpp>
#include <boost/cstdint.hpp>
#include <boost/assert.hpp>
@@ -22,12 +22,12 @@
// Cygwn
#if defined(__CYGWIN__)
# if defined(__i386__) || defined(_M_IX86)
-# include <boost/bfunctional/hash/detail/hash_float_x86.hpp>
+# include <boost/functional/hash/detail/hash_float_x86.hpp>
# else
-# include <boost/bfunctional/hash/detail/hash_float_generic.hpp>
+# include <boost/functional/hash/detail/hash_float_generic.hpp>
# endif
#else
-# include <boost/bfunctional/hash/detail/hash_float_generic.hpp>
+# include <boost/functional/hash/detail/hash_float_generic.hpp>
#endif
// Can we use fpclassify?
diff --git a/Utilities/BGL/boost/bfunctional/hash/detail/hash_float_generic.hpp b/Utilities/BGL/boost/functional/hash/detail/hash_float_generic.hpp
similarity index 96%
rename from Utilities/BGL/boost/bfunctional/hash/detail/hash_float_generic.hpp
rename to Utilities/BGL/boost/functional/hash/detail/hash_float_generic.hpp
index e5df0e7f77..f9acee9cd1 100644
--- a/Utilities/BGL/boost/bfunctional/hash/detail/hash_float_generic.hpp
+++ b/Utilities/BGL/boost/functional/hash/detail/hash_float_generic.hpp
@@ -8,9 +8,9 @@
#if !defined(BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_GENERIC_HEADER)
#define BOOST_FUNCTIONAL_HASH_DETAIL_HASH_FLOAT_GENERIC_HEADER
-#include <boost/bfunctional/hash/detail/float_functions.hpp>
+#include <boost/functional/hash/detail/float_functions.hpp>
#include <boost/integer/static_log2.hpp>
-#include <boost/bfunctional/hash/detail/limits.hpp>
+#include <boost/functional/hash/detail/limits.hpp>
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
# pragma once
diff --git a/Utilities/BGL/boost/bfunctional/hash/detail/hash_float_x86.hpp b/Utilities/BGL/boost/functional/hash/detail/hash_float_x86.hpp
similarity index 100%
rename from Utilities/BGL/boost/bfunctional/hash/detail/hash_float_x86.hpp
rename to Utilities/BGL/boost/functional/hash/detail/hash_float_x86.hpp
diff --git a/Utilities/BGL/boost/bfunctional/hash/detail/limits.hpp b/Utilities/BGL/boost/functional/hash/detail/limits.hpp
similarity index 100%
rename from Utilities/BGL/boost/bfunctional/hash/detail/limits.hpp
rename to Utilities/BGL/boost/functional/hash/detail/limits.hpp
diff --git a/Utilities/BGL/boost/bfunctional/hash/extensions.hpp b/Utilities/BGL/boost/functional/hash/extensions.hpp
similarity index 99%
rename from Utilities/BGL/boost/bfunctional/hash/extensions.hpp
rename to Utilities/BGL/boost/functional/hash/extensions.hpp
index 0dc12de00d..3c587a3bf5 100644
--- a/Utilities/BGL/boost/bfunctional/hash/extensions.hpp
+++ b/Utilities/BGL/boost/functional/hash/extensions.hpp
@@ -13,7 +13,7 @@
#if !defined(BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP)
#define BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP
-#include <boost/bfunctional/hash/hash.hpp>
+#include <boost/functional/hash/hash.hpp>
#include <boost/detail/container_fwd.hpp>
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
diff --git a/Utilities/BGL/boost/bfunctional/hash/hash.hpp b/Utilities/BGL/boost/functional/hash/hash.hpp
similarity index 98%
rename from Utilities/BGL/boost/bfunctional/hash/hash.hpp
rename to Utilities/BGL/boost/functional/hash/hash.hpp
index 4def90889a..1f33b9ea9d 100644
--- a/Utilities/BGL/boost/bfunctional/hash/hash.hpp
+++ b/Utilities/BGL/boost/functional/hash/hash.hpp
@@ -10,9 +10,9 @@
#if !defined(BOOST_FUNCTIONAL_HASH_HASH_HPP)
#define BOOST_FUNCTIONAL_HASH_HASH_HPP
-#include <boost/bfunctional/hash/hash_fwd.hpp>
+#include <boost/functional/hash/hash_fwd.hpp>
#include <functional>
-#include <boost/bfunctional/hash/detail/hash_float.hpp>
+#include <boost/functional/hash/detail/hash_float.hpp>
#include <string>
#include <boost/limits.hpp>
@@ -491,5 +491,5 @@ namespace boost
#if !defined(BOOST_HASH_NO_EXTENSIONS) \
&& !defined(BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP)
-#include <boost/bfunctional/hash/extensions.hpp>
+#include <boost/functional/hash/extensions.hpp>
#endif
diff --git a/Utilities/BGL/boost/bfunctional/hash/hash_fwd.hpp b/Utilities/BGL/boost/functional/hash/hash_fwd.hpp
similarity index 100%
rename from Utilities/BGL/boost/bfunctional/hash/hash_fwd.hpp
rename to Utilities/BGL/boost/functional/hash/hash_fwd.hpp
diff --git a/Utilities/BGL/boost/bfunctional/hash_fwd.hpp b/Utilities/BGL/boost/functional/hash_fwd.hpp
similarity index 80%
rename from Utilities/BGL/boost/bfunctional/hash_fwd.hpp
rename to Utilities/BGL/boost/functional/hash_fwd.hpp
index 87b4e94638..b640988618 100644
--- a/Utilities/BGL/boost/bfunctional/hash_fwd.hpp
+++ b/Utilities/BGL/boost/functional/hash_fwd.hpp
@@ -3,5 +3,5 @@
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/bfunctional/hash/hash_fwd.hpp>
+#include <boost/functional/hash/hash_fwd.hpp>
diff --git a/Utilities/BGL/boost/graph/compressed_sparse_row_graph.hpp b/Utilities/BGL/boost/graph/compressed_sparse_row_graph.hpp
index ddc7e5cdd4..7b62b3b266 100644
--- a/Utilities/BGL/boost/graph/compressed_sparse_row_graph.hpp
+++ b/Utilities/BGL/boost/graph/compressed_sparse_row_graph.hpp
@@ -39,7 +39,7 @@
#include <boost/mpl/if.hpp>
#include <boost/graph/graph_selectors.hpp>
#include <boost/static_assert.hpp>
-#include <boost/bfunctional/hash.hpp>
+#include <boost/functional/hash.hpp>
#include <boost/utility.hpp>
#ifdef BOOST_GRAPH_NO_BUNDLED_PROPERTIES
diff --git a/Utilities/BGL/boost/graph/detail/compressed_sparse_row_struct.hpp b/Utilities/BGL/boost/graph/detail/compressed_sparse_row_struct.hpp
index e4d8c66cce..6b4e3913c9 100644
--- a/Utilities/BGL/boost/graph/detail/compressed_sparse_row_struct.hpp
+++ b/Utilities/BGL/boost/graph/detail/compressed_sparse_row_struct.hpp
@@ -43,7 +43,7 @@
#include <boost/mpl/if.hpp>
#include <boost/graph/graph_selectors.hpp>
#include <boost/static_assert.hpp>
-#include <boost/bfunctional/hash.hpp>
+#include <boost/functional/hash.hpp>
#include <boost/utility.hpp>
namespace boost {
diff --git a/Utilities/BGL/boost/graph/distributed/mpi_process_group.hpp b/Utilities/BGL/boost/graph/distributed/mpi_process_group.hpp
index f1a13cacde..e0ee579029 100644
--- a/Utilities/BGL/boost/graph/distributed/mpi_process_group.hpp
+++ b/Utilities/BGL/boost/graph/distributed/mpi_process_group.hpp
@@ -29,7 +29,7 @@
#include <boost/function/function0.hpp>
#include <boost/mpi.hpp>
#include <boost/graph/parallel/process_group.hpp>
-#include <boost/butility/enable_if.hpp>
+#include <boost/utility/enable_if.hpp>
namespace boost { namespace graph { namespace distributed {
diff --git a/Utilities/BGL/boost/graph/distributed/named_graph.hpp b/Utilities/BGL/boost/graph/distributed/named_graph.hpp
index c3d5e29164..83b00613b6 100644
--- a/Utilities/BGL/boost/graph/distributed/named_graph.hpp
+++ b/Utilities/BGL/boost/graph/distributed/named_graph.hpp
@@ -15,7 +15,7 @@
#endif
#include <boost/graph/named_graph.hpp>
-#include <boost/bfunctional/hash.hpp>
+#include <boost/functional/hash.hpp>
#include <boost/variant.hpp>
#include <boost/graph/parallel/simple_trigger.hpp>
#include <boost/graph/parallel/process_group.hpp>
diff --git a/Utilities/BGL/boost/graph/lookup_edge.hpp b/Utilities/BGL/boost/graph/lookup_edge.hpp
index 7e91c8abca..f8ea89e22a 100644
--- a/Utilities/BGL/boost/graph/lookup_edge.hpp
+++ b/Utilities/BGL/boost/graph/lookup_edge.hpp
@@ -12,7 +12,7 @@
#include <utility>
#include <boost/config.hpp>
-#include <boost/butility/enable_if.hpp>
+#include <boost/utility/enable_if.hpp>
#include <boost/graph/graph_traits.hpp>
// lookup_edge: a function that acts like edge() but falls back to out_edges()
diff --git a/Utilities/BGL/boost/graph/overloading.hpp b/Utilities/BGL/boost/graph/overloading.hpp
index ea7c4bb204..a952e22fa8 100644
--- a/Utilities/BGL/boost/graph/overloading.hpp
+++ b/Utilities/BGL/boost/graph/overloading.hpp
@@ -15,7 +15,7 @@
#define BOOST_GRAPH_OVERLOADING_HPP
#include <boost/type_traits/is_base_and_derived.hpp>
-#include <boost/butility/enable_if.hpp>
+#include <boost/utility/enable_if.hpp>
namespace boost { namespace graph { namespace detail {
diff --git a/Utilities/BGL/boost/mpl/for_each.hpp b/Utilities/BGL/boost/mpl/for_each.hpp
index bc602d5458..89abc85d5e 100644
--- a/Utilities/BGL/boost/mpl/for_each.hpp
+++ b/Utilities/BGL/boost/mpl/for_each.hpp
@@ -25,7 +25,7 @@
#include <boost/mpl/aux_/unwrap.hpp>
#include <boost/type_traits/is_same.hpp>
-#include <boost/butility/value_init.hpp>
+#include <boost/utility/value_init.hpp>
namespace boost { namespace mpl {
diff --git a/Utilities/BGL/boost/multi_index/composite_key.hpp b/Utilities/BGL/boost/multi_index/composite_key.hpp
index 54cca1f677..cedc75e04f 100644
--- a/Utilities/BGL/boost/multi_index/composite_key.hpp
+++ b/Utilities/BGL/boost/multi_index/composite_key.hpp
@@ -14,7 +14,7 @@
#endif
#include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
-#include <boost/bfunctional/hash_fwd.hpp>
+#include <boost/functional/hash_fwd.hpp>
#include <boost/multi_index/detail/access_specifier.hpp>
#include <boost/multi_index/detail/prevent_eti.hpp>
#include <boost/mpl/eval_if.hpp>
@@ -30,7 +30,7 @@
#include <boost/static_assert.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/type_traits/is_same.hpp>
-#include <boost/butility/enable_if.hpp>
+#include <boost/utility/enable_if.hpp>
#include <functional>
#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
diff --git a/Utilities/BGL/boost/multi_index/detail/hash_index_args.hpp b/Utilities/BGL/boost/multi_index/detail/hash_index_args.hpp
index 9ba47d2205..4972f9bbe1 100644
--- a/Utilities/BGL/boost/multi_index/detail/hash_index_args.hpp
+++ b/Utilities/BGL/boost/multi_index/detail/hash_index_args.hpp
@@ -14,7 +14,7 @@
#endif
#include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
-#include <boost/bfunctional/hash.hpp>
+#include <boost/functional/hash.hpp>
#include <boost/mpl/aux_/na.hpp>
#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/identity.hpp>
diff --git a/Utilities/BGL/boost/multi_index/global_fun.hpp b/Utilities/BGL/boost/multi_index/global_fun.hpp
index d454fa4147..8520e4d0c7 100644
--- a/Utilities/BGL/boost/multi_index/global_fun.hpp
+++ b/Utilities/BGL/boost/multi_index/global_fun.hpp
@@ -19,7 +19,7 @@
#include <boost/type_traits/is_reference.hpp>
#include <boost/type_traits/remove_const.hpp>
#include <boost/type_traits/remove_reference.hpp>
-#include <boost/butility/enable_if.hpp>
+#include <boost/utility/enable_if.hpp>
#if !defined(BOOST_NO_SFINAE)
#include <boost/type_traits/is_convertible.hpp>
diff --git a/Utilities/BGL/boost/multi_index/identity.hpp b/Utilities/BGL/boost/multi_index/identity.hpp
index 6eea023878..b402ad70d0 100644
--- a/Utilities/BGL/boost/multi_index/identity.hpp
+++ b/Utilities/BGL/boost/multi_index/identity.hpp
@@ -18,7 +18,7 @@
#include <boost/multi_index/identity_fwd.hpp>
#include <boost/type_traits/is_const.hpp>
#include <boost/type_traits/remove_const.hpp>
-#include <boost/butility/enable_if.hpp>
+#include <boost/utility/enable_if.hpp>
#if !defined(BOOST_NO_SFINAE)
#include <boost/type_traits/is_convertible.hpp>
diff --git a/Utilities/BGL/boost/multi_index/mem_fun.hpp b/Utilities/BGL/boost/multi_index/mem_fun.hpp
index 6ce98d4468..bb18c10973 100644
--- a/Utilities/BGL/boost/multi_index/mem_fun.hpp
+++ b/Utilities/BGL/boost/multi_index/mem_fun.hpp
@@ -16,7 +16,7 @@
#include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
#include <boost/mpl/if.hpp>
#include <boost/type_traits/remove_reference.hpp>
-#include <boost/butility/enable_if.hpp>
+#include <boost/utility/enable_if.hpp>
#if !defined(BOOST_NO_SFINAE)
#include <boost/type_traits/is_convertible.hpp>
diff --git a/Utilities/BGL/boost/multi_index/member.hpp b/Utilities/BGL/boost/multi_index/member.hpp
index 127c06501f..848e9b23b6 100644
--- a/Utilities/BGL/boost/multi_index/member.hpp
+++ b/Utilities/BGL/boost/multi_index/member.hpp
@@ -16,7 +16,7 @@
#include <boost/config.hpp> /* keep it first to prevent nasty warns in MSVC */
#include <boost/mpl/if.hpp>
#include <boost/type_traits/is_const.hpp>
-#include <boost/butility/enable_if.hpp>
+#include <boost/utility/enable_if.hpp>
#include <cstddef>
#if !defined(BOOST_NO_SFINAE)
diff --git a/Utilities/BGL/boost/multi_index_container.hpp b/Utilities/BGL/boost/multi_index_container.hpp
index 8324ab26ec..7b4815fbca 100644
--- a/Utilities/BGL/boost/multi_index_container.hpp
+++ b/Utilities/BGL/boost/multi_index_container.hpp
@@ -40,7 +40,7 @@
#include <boost/multi_index/detail/scope_guard.hpp>
#include <boost/static_assert.hpp>
#include <boost/type_traits/is_same.hpp>
-#include <boost/butility/base_from_member.hpp>
+#include <boost/utility/base_from_member.hpp>
#if !defined(BOOST_MULTI_INDEX_DISABLE_SERIALIZATION)
#include <boost/multi_index/detail/archive_constructed.hpp>
diff --git a/Utilities/BGL/boost/operators.hpp b/Utilities/BGL/boost/operators.hpp
index fdee786a18..4b47ba40c1 100644
--- a/Utilities/BGL/boost/operators.hpp
+++ b/Utilities/BGL/boost/operators.hpp
@@ -5,7 +5,7 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-// See http://www.boost.org/libs/butility/operators.htm for documentation.
+// See http://www.boost.org/libs/utility/operators.htm for documentation.
// Revision History
// 07 Aug 08 Added "euclidean" spelling. (Daniel Frey)
diff --git a/Utilities/BGL/boost/optional/optional.hpp b/Utilities/BGL/boost/optional/optional.hpp
index 44aeab380b..42277ba61e 100644
--- a/Utilities/BGL/boost/optional/optional.hpp
+++ b/Utilities/BGL/boost/optional/optional.hpp
@@ -27,7 +27,7 @@
#include "boost/mpl/not.hpp"
#include "boost/detail/reference_content.hpp"
#include "boost/none.hpp"
-#include "boost/butility/compare_pointees.hpp"
+#include "boost/utility/compare_pointees.hpp"
#include "boost/optional/optional_fwd.hpp"
diff --git a/Utilities/BGL/boost/optional/optional_io.hpp b/Utilities/BGL/boost/optional/optional_io.hpp
index 4bc528b6e4..ef1ecaf3a0 100644
--- a/Utilities/BGL/boost/optional/optional_io.hpp
+++ b/Utilities/BGL/boost/optional/optional_io.hpp
@@ -27,7 +27,7 @@
#include "boost/optional/optional.hpp"
-#include "boost/butility/value_init.hpp"
+#include "boost/utility/value_init.hpp"
namespace boost
{
diff --git a/Utilities/BGL/boost/parameter/aux_/result_of0.hpp b/Utilities/BGL/boost/parameter/aux_/result_of0.hpp
index a21774a07d..e0096148b4 100644
--- a/Utilities/BGL/boost/parameter/aux_/result_of0.hpp
+++ b/Utilities/BGL/boost/parameter/aux_/result_of0.hpp
@@ -4,14 +4,14 @@
#ifndef BOOST_PARAMETER_AUX_RESULT_OF0_DWA2005511_HPP
# define BOOST_PARAMETER_AUX_RESULT_OF0_DWA2005511_HPP
-# include <boost/butility/result_of.hpp>
+# include <boost/utility/result_of.hpp>
// A metafunction returning the result of invoking a nullary function
// object of the given type.
#ifndef BOOST_NO_RESULT_OF
-# include <boost/butility/result_of.hpp>
+# include <boost/utility/result_of.hpp>
namespace boost { namespace parameter { namespace aux {
template <class F>
struct result_of0 : result_of<F()>
diff --git a/Utilities/BGL/boost/parameter/name.hpp b/Utilities/BGL/boost/parameter/name.hpp
index 8f0c4b22bb..8850f05855 100644
--- a/Utilities/BGL/boost/parameter/name.hpp
+++ b/Utilities/BGL/boost/parameter/name.hpp
@@ -19,7 +19,7 @@
&& !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
&& !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
-# include <boost/butility/enable_if.hpp>
+# include <boost/utility/enable_if.hpp>
# include <boost/mpl/lambda.hpp>
namespace boost { namespace parameter { namespace aux {
diff --git a/Utilities/BGL/boost/python/detail/enable_if.hpp b/Utilities/BGL/boost/python/detail/enable_if.hpp
index e31fc2e131..46a1d532b3 100644
--- a/Utilities/BGL/boost/python/detail/enable_if.hpp
+++ b/Utilities/BGL/boost/python/detail/enable_if.hpp
@@ -41,7 +41,7 @@ struct disable_if_ret
}}} // namespace boost::python::detail
# elif !defined(BOOST_NO_SFINAE)
-# include <boost/butility/enable_if.hpp>
+# include <boost/utility/enable_if.hpp>
namespace boost { namespace python { namespace detail {
diff --git a/Utilities/BGL/boost/python/object/value_holder.hpp b/Utilities/BGL/boost/python/object/value_holder.hpp
index 06a2a68a72..f4d452cab1 100644
--- a/Utilities/BGL/boost/python/object/value_holder.hpp
+++ b/Utilities/BGL/boost/python/object/value_holder.hpp
@@ -29,7 +29,7 @@
# include <boost/preprocessor/repetition/enum_params.hpp>
# include <boost/preprocessor/repetition/enum_binary_params.hpp>
-# include <boost/butility/addressof.hpp>
+# include <boost/utility/addressof.hpp>
namespace boost { namespace python { namespace objects {
diff --git a/Utilities/BGL/boost/ref.hpp b/Utilities/BGL/boost/ref.hpp
index ab9295ae89..6058d69831 100644
--- a/Utilities/BGL/boost/ref.hpp
+++ b/Utilities/BGL/boost/ref.hpp
@@ -8,7 +8,7 @@
#endif
#include <boost/config.hpp>
-#include <boost/butility/addressof.hpp>
+#include <boost/utility/addressof.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/detail/workaround.hpp>
diff --git a/Utilities/BGL/boost/throw_exception.hpp b/Utilities/BGL/boost/throw_exception.hpp
index 1aedb42032..656b8de31e 100644
--- a/Utilities/BGL/boost/throw_exception.hpp
+++ b/Utilities/BGL/boost/throw_exception.hpp
@@ -17,10 +17,10 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
-// http://www.boost.org/libs/butility/throw_exception.html
+// http://www.boost.org/libs/utility/throw_exception.html
//
-#include <boost/bexception/detail/attribute_noreturn.hpp>
+#include <boost/exception/detail/attribute_noreturn.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/config.hpp>
#include <exception>
@@ -34,7 +34,7 @@
#endif
#if !defined( BOOST_EXCEPTION_DISABLE )
-# include <boost/bexception/exception.hpp>
+# include <boost/exception/exception.hpp>
# include <boost/current_function.hpp>
# define BOOST_THROW_EXCEPTION(x) ::boost::throw_exception(::boost::enable_error_info(x) <<\
::boost::throw_function(BOOST_CURRENT_FUNCTION) <<\
diff --git a/Utilities/BGL/boost/unordered/detail/move.hpp b/Utilities/BGL/boost/unordered/detail/move.hpp
index d6157ee7e3..16fd921208 100644
--- a/Utilities/BGL/boost/unordered/detail/move.hpp
+++ b/Utilities/BGL/boost/unordered/detail/move.hpp
@@ -19,7 +19,7 @@
#include <boost/type_traits/is_convertible.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/type_traits/is_class.hpp>
-#include <boost/butility/enable_if.hpp>
+#include <boost/utility/enable_if.hpp>
#include <boost/detail/workaround.hpp>
/*************************************************************************************************/
diff --git a/Utilities/BGL/boost/unordered/unordered_map.hpp b/Utilities/BGL/boost/unordered/unordered_map.hpp
index 01066cc086..93e197893a 100644
--- a/Utilities/BGL/boost/unordered/unordered_map.hpp
+++ b/Utilities/BGL/boost/unordered/unordered_map.hpp
@@ -14,7 +14,7 @@
#endif
#include <boost/unordered/unordered_map_fwd.hpp>
-#include <boost/bfunctional/hash.hpp>
+#include <boost/functional/hash.hpp>
#include <boost/unordered/detail/allocator_helpers.hpp>
#include <boost/unordered/detail/equivalent.hpp>
#include <boost/unordered/detail/unique.hpp>
diff --git a/Utilities/BGL/boost/unordered/unordered_map_fwd.hpp b/Utilities/BGL/boost/unordered/unordered_map_fwd.hpp
index 22e6fee7bc..5e9bb07645 100644
--- a/Utilities/BGL/boost/unordered/unordered_map_fwd.hpp
+++ b/Utilities/BGL/boost/unordered/unordered_map_fwd.hpp
@@ -13,7 +13,7 @@
#include <boost/config.hpp>
#include <memory>
#include <functional>
-#include <boost/bfunctional/hash_fwd.hpp>
+#include <boost/functional/hash_fwd.hpp>
namespace boost
{
diff --git a/Utilities/BGL/boost/unordered/unordered_set.hpp b/Utilities/BGL/boost/unordered/unordered_set.hpp
index 373088a883..87c1011b6d 100644
--- a/Utilities/BGL/boost/unordered/unordered_set.hpp
+++ b/Utilities/BGL/boost/unordered/unordered_set.hpp
@@ -14,7 +14,7 @@
#endif
#include <boost/unordered/unordered_set_fwd.hpp>
-#include <boost/bfunctional/hash.hpp>
+#include <boost/functional/hash.hpp>
#include <boost/unordered/detail/allocator_helpers.hpp>
#include <boost/unordered/detail/equivalent.hpp>
#include <boost/unordered/detail/unique.hpp>
diff --git a/Utilities/BGL/boost/unordered/unordered_set_fwd.hpp b/Utilities/BGL/boost/unordered/unordered_set_fwd.hpp
index f05c706856..8000eb1420 100644
--- a/Utilities/BGL/boost/unordered/unordered_set_fwd.hpp
+++ b/Utilities/BGL/boost/unordered/unordered_set_fwd.hpp
@@ -13,7 +13,7 @@
#include <boost/config.hpp>
#include <memory>
#include <functional>
-#include <boost/bfunctional/hash_fwd.hpp>
+#include <boost/functional/hash_fwd.hpp>
namespace boost
{
diff --git a/Utilities/BGL/boost/butility/addressof.hpp b/Utilities/BGL/boost/utility/addressof.hpp
similarity index 100%
rename from Utilities/BGL/boost/butility/addressof.hpp
rename to Utilities/BGL/boost/utility/addressof.hpp
diff --git a/Utilities/BGL/boost/butility/base_from_member.hpp b/Utilities/BGL/boost/utility/base_from_member.hpp
similarity index 97%
rename from Utilities/BGL/boost/butility/base_from_member.hpp
rename to Utilities/BGL/boost/utility/base_from_member.hpp
index 893133e6b5..04aabb59e2 100644
--- a/Utilities/BGL/boost/butility/base_from_member.hpp
+++ b/Utilities/BGL/boost/utility/base_from_member.hpp
@@ -5,7 +5,7 @@
// accompanying file LICENSE_1_0.txt or a copy at
// <http://www.boost.org/LICENSE_1_0.txt>.)
-// See <http://www.boost.org/libs/butility/> for the library's home page.
+// See <http://www.boost.org/libs/utility/> for the library's home page.
#ifndef BOOST_UTILITY_BASE_FROM_MEMBER_HPP
#define BOOST_UTILITY_BASE_FROM_MEMBER_HPP
diff --git a/Utilities/BGL/boost/butility/binary.hpp b/Utilities/BGL/boost/utility/binary.hpp
similarity index 100%
rename from Utilities/BGL/boost/butility/binary.hpp
rename to Utilities/BGL/boost/utility/binary.hpp
diff --git a/Utilities/BGL/boost/butility/compare_pointees.hpp b/Utilities/BGL/boost/utility/compare_pointees.hpp
similarity index 100%
rename from Utilities/BGL/boost/butility/compare_pointees.hpp
rename to Utilities/BGL/boost/utility/compare_pointees.hpp
diff --git a/Utilities/BGL/boost/butility/detail/in_place_factory_prefix.hpp b/Utilities/BGL/boost/utility/detail/in_place_factory_prefix.hpp
similarity index 100%
rename from Utilities/BGL/boost/butility/detail/in_place_factory_prefix.hpp
rename to Utilities/BGL/boost/utility/detail/in_place_factory_prefix.hpp
diff --git a/Utilities/BGL/boost/butility/detail/in_place_factory_suffix.hpp b/Utilities/BGL/boost/utility/detail/in_place_factory_suffix.hpp
similarity index 100%
rename from Utilities/BGL/boost/butility/detail/in_place_factory_suffix.hpp
rename to Utilities/BGL/boost/utility/detail/in_place_factory_suffix.hpp
diff --git a/Utilities/BGL/boost/butility/detail/result_of_iterate.hpp b/Utilities/BGL/boost/utility/detail/result_of_iterate.hpp
similarity index 100%
rename from Utilities/BGL/boost/butility/detail/result_of_iterate.hpp
rename to Utilities/BGL/boost/utility/detail/result_of_iterate.hpp
diff --git a/Utilities/BGL/boost/butility/enable_if.hpp b/Utilities/BGL/boost/utility/enable_if.hpp
similarity index 100%
rename from Utilities/BGL/boost/butility/enable_if.hpp
rename to Utilities/BGL/boost/utility/enable_if.hpp
diff --git a/Utilities/BGL/boost/butility/in_place_factory.hpp b/Utilities/BGL/boost/utility/in_place_factory.hpp
similarity index 91%
rename from Utilities/BGL/boost/butility/in_place_factory.hpp
rename to Utilities/BGL/boost/utility/in_place_factory.hpp
index 1d39273335..16eaacf2ad 100644
--- a/Utilities/BGL/boost/butility/in_place_factory.hpp
+++ b/Utilities/BGL/boost/utility/in_place_factory.hpp
@@ -13,19 +13,19 @@
#ifndef BOOST_UTILITY_INPLACE_FACTORY_04APR2007_HPP
#ifndef BOOST_PP_IS_ITERATING
-#include <boost/butility/detail/in_place_factory_prefix.hpp>
+#include <boost/utility/detail/in_place_factory_prefix.hpp>
namespace boost {
class in_place_factory_base {} ;
#define BOOST_PP_ITERATION_LIMITS (0, BOOST_MAX_INPLACE_FACTORY_ARITY)
-#define BOOST_PP_FILENAME_1 <boost/butility/in_place_factory.hpp>
+#define BOOST_PP_FILENAME_1 <boost/utility/in_place_factory.hpp>
#include BOOST_PP_ITERATE()
} // namespace boost
-#include <boost/butility/detail/in_place_factory_suffix.hpp>
+#include <boost/utility/detail/in_place_factory_suffix.hpp>
#define BOOST_UTILITY_INPLACE_FACTORY_04APR2007_HPP
#else
diff --git a/Utilities/BGL/boost/butility/result_of.hpp b/Utilities/BGL/boost/utility/result_of.hpp
similarity index 97%
rename from Utilities/BGL/boost/butility/result_of.hpp
rename to Utilities/BGL/boost/utility/result_of.hpp
index d0560232f9..e35e0980bb 100644
--- a/Utilities/BGL/boost/butility/result_of.hpp
+++ b/Utilities/BGL/boost/utility/result_of.hpp
@@ -76,7 +76,7 @@ struct result_of_impl<F, FArgs, false>
} // end namespace detail
-#define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_RESULT_OF_NUM_ARGS,<boost/butility/detail/result_of_iterate.hpp>))
+#define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_RESULT_OF_NUM_ARGS,<boost/utility/detail/result_of_iterate.hpp>))
#include BOOST_PP_ITERATE()
#else
diff --git a/Utilities/BGL/boost/butility/swap.hpp b/Utilities/BGL/boost/utility/swap.hpp
similarity index 100%
rename from Utilities/BGL/boost/butility/swap.hpp
rename to Utilities/BGL/boost/utility/swap.hpp
diff --git a/Utilities/BGL/boost/butility/typed_in_place_factory.hpp b/Utilities/BGL/boost/utility/typed_in_place_factory.hpp
similarity index 90%
rename from Utilities/BGL/boost/butility/typed_in_place_factory.hpp
rename to Utilities/BGL/boost/utility/typed_in_place_factory.hpp
index c95b2679f4..347b7f459a 100644
--- a/Utilities/BGL/boost/butility/typed_in_place_factory.hpp
+++ b/Utilities/BGL/boost/utility/typed_in_place_factory.hpp
@@ -13,19 +13,19 @@
#ifndef BOOST_UTILITY_TYPED_INPLACE_FACTORY_04APR2007_HPP
#ifndef BOOST_PP_IS_ITERATING
-#include <boost/butility/detail/in_place_factory_prefix.hpp>
+#include <boost/utility/detail/in_place_factory_prefix.hpp>
namespace boost {
class typed_in_place_factory_base {} ;
#define BOOST_PP_ITERATION_LIMITS (0, BOOST_MAX_INPLACE_FACTORY_ARITY)
-#define BOOST_PP_FILENAME_1 <boost/butility/typed_in_place_factory.hpp>
+#define BOOST_PP_FILENAME_1 <boost/utility/typed_in_place_factory.hpp>
#include BOOST_PP_ITERATE()
} // namespace boost
-#include <boost/butility/detail/in_place_factory_suffix.hpp>
+#include <boost/utility/detail/in_place_factory_suffix.hpp>
#define BOOST_UTILITY_TYPED_INPLACE_FACTORY_04APR2007_HPP
#else
diff --git a/Utilities/BGL/boost/butility/value_init.hpp b/Utilities/BGL/boost/utility/value_init.hpp
similarity index 97%
rename from Utilities/BGL/boost/butility/value_init.hpp
rename to Utilities/BGL/boost/utility/value_init.hpp
index 38a4637730..5aefac928d 100644
--- a/Utilities/BGL/boost/butility/value_init.hpp
+++ b/Utilities/BGL/boost/utility/value_init.hpp
@@ -17,7 +17,7 @@
// fact that various compilers haven't fully implemented value-initialization.
// The constructor of boost::value_initialized<T> works around these compiler
// issues, by clearing the bytes of T, before constructing the T object it
-// contains. More details on these issues are at libs/butility/value_init.htm
+// contains. More details on these issues are at libs/utility/value_init.htm
#include <boost/aligned_storage.hpp>
#include <boost/detail/workaround.hpp>
--
GitLab