From 431a046f619dad1324ae7d0000421db88e7be06b Mon Sep 17 00:00:00 2001
From: Otmane Lahlou <otmane.lahlou@c-s.fr>
Date: Mon, 28 Jun 2010 11:45:38 +0200
Subject: [PATCH] COMP : To fix compilation errors on OTB-Wrapping on
windows(mixing #include<functional> with directory boost/functional),
renaming boost/functional to boost/bfunctional
---
.../detail/container_fwd.hpp | 0
.../BGL/boost/{functional => bfunctional}/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
.../{functional => bfunctional}/hash/detail/limits.hpp | 0
.../{functional => bfunctional}/hash/extensions.hpp | 2 +-
.../boost/{functional => bfunctional}/hash/hash.hpp | 6 +++---
.../{functional => bfunctional}/hash/hash_fwd.hpp | 0
.../BGL/boost/{functional => bfunctional}/hash_fwd.hpp | 2 +-
.../BGL/boost/graph/compressed_sparse_row_graph.hpp | 2 +-
.../graph/detail/compressed_sparse_row_struct.hpp | 2 +-
Utilities/BGL/boost/graph/distributed/named_graph.hpp | 2 +-
Utilities/BGL/boost/multi_index/composite_key.hpp | 2 +-
.../BGL/boost/multi_index/detail/hash_index_args.hpp | 2 +-
Utilities/BGL/boost/unordered/unordered_map.hpp | 2 +-
Utilities/BGL/boost/unordered/unordered_map_fwd.hpp | 2 +-
Utilities/BGL/boost/unordered/unordered_set.hpp | 2 +-
Utilities/BGL/boost/unordered/unordered_set_fwd.hpp | 2 +-
20 files changed, 22 insertions(+), 22 deletions(-)
rename Utilities/BGL/boost/{functional => bfunctional}/detail/container_fwd.hpp (100%)
rename Utilities/BGL/boost/{functional => bfunctional}/hash.hpp (81%)
rename Utilities/BGL/boost/{functional => bfunctional}/hash/detail/float_functions.hpp (100%)
rename Utilities/BGL/boost/{functional => bfunctional}/hash/detail/hash_float.hpp (87%)
rename Utilities/BGL/boost/{functional => bfunctional}/hash/detail/hash_float_generic.hpp (96%)
rename Utilities/BGL/boost/{functional => bfunctional}/hash/detail/hash_float_x86.hpp (100%)
rename Utilities/BGL/boost/{functional => bfunctional}/hash/detail/limits.hpp (100%)
rename Utilities/BGL/boost/{functional => bfunctional}/hash/extensions.hpp (99%)
rename Utilities/BGL/boost/{functional => bfunctional}/hash/hash.hpp (98%)
rename Utilities/BGL/boost/{functional => bfunctional}/hash/hash_fwd.hpp (100%)
rename Utilities/BGL/boost/{functional => bfunctional}/hash_fwd.hpp (80%)
diff --git a/Utilities/BGL/boost/functional/detail/container_fwd.hpp b/Utilities/BGL/boost/bfunctional/detail/container_fwd.hpp
similarity index 100%
rename from Utilities/BGL/boost/functional/detail/container_fwd.hpp
rename to Utilities/BGL/boost/bfunctional/detail/container_fwd.hpp
diff --git a/Utilities/BGL/boost/functional/hash.hpp b/Utilities/BGL/boost/bfunctional/hash.hpp
similarity index 81%
rename from Utilities/BGL/boost/functional/hash.hpp
rename to Utilities/BGL/boost/bfunctional/hash.hpp
index 44983f19b2..b529ad4b74 100644
--- a/Utilities/BGL/boost/functional/hash.hpp
+++ b/Utilities/BGL/boost/bfunctional/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/functional/hash/hash.hpp>
+#include <boost/bfunctional/hash/hash.hpp>
diff --git a/Utilities/BGL/boost/functional/hash/detail/float_functions.hpp b/Utilities/BGL/boost/bfunctional/hash/detail/float_functions.hpp
similarity index 100%
rename from Utilities/BGL/boost/functional/hash/detail/float_functions.hpp
rename to Utilities/BGL/boost/bfunctional/hash/detail/float_functions.hpp
diff --git a/Utilities/BGL/boost/functional/hash/detail/hash_float.hpp b/Utilities/BGL/boost/bfunctional/hash/detail/hash_float.hpp
similarity index 87%
rename from Utilities/BGL/boost/functional/hash/detail/hash_float.hpp
rename to Utilities/BGL/boost/bfunctional/hash/detail/hash_float.hpp
index ea1bc25f48..ef07dddb17 100644
--- a/Utilities/BGL/boost/functional/hash/detail/hash_float.hpp
+++ b/Utilities/BGL/boost/bfunctional/hash/detail/hash_float.hpp
@@ -11,8 +11,8 @@
#endif
#include <boost/config.hpp>
-#include <boost/functional/hash/detail/float_functions.hpp>
-#include <boost/functional/hash/detail/limits.hpp>
+#include <boost/bfunctional/hash/detail/float_functions.hpp>
+#include <boost/bfunctional/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/functional/hash/detail/hash_float_x86.hpp>
+# include <boost/bfunctional/hash/detail/hash_float_x86.hpp>
# else
-# include <boost/functional/hash/detail/hash_float_generic.hpp>
+# include <boost/bfunctional/hash/detail/hash_float_generic.hpp>
# endif
#else
-# include <boost/functional/hash/detail/hash_float_generic.hpp>
+# include <boost/bfunctional/hash/detail/hash_float_generic.hpp>
#endif
// Can we use fpclassify?
diff --git a/Utilities/BGL/boost/functional/hash/detail/hash_float_generic.hpp b/Utilities/BGL/boost/bfunctional/hash/detail/hash_float_generic.hpp
similarity index 96%
rename from Utilities/BGL/boost/functional/hash/detail/hash_float_generic.hpp
rename to Utilities/BGL/boost/bfunctional/hash/detail/hash_float_generic.hpp
index f9acee9cd1..e5df0e7f77 100644
--- a/Utilities/BGL/boost/functional/hash/detail/hash_float_generic.hpp
+++ b/Utilities/BGL/boost/bfunctional/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/functional/hash/detail/float_functions.hpp>
+#include <boost/bfunctional/hash/detail/float_functions.hpp>
#include <boost/integer/static_log2.hpp>
-#include <boost/functional/hash/detail/limits.hpp>
+#include <boost/bfunctional/hash/detail/limits.hpp>
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
# pragma once
diff --git a/Utilities/BGL/boost/functional/hash/detail/hash_float_x86.hpp b/Utilities/BGL/boost/bfunctional/hash/detail/hash_float_x86.hpp
similarity index 100%
rename from Utilities/BGL/boost/functional/hash/detail/hash_float_x86.hpp
rename to Utilities/BGL/boost/bfunctional/hash/detail/hash_float_x86.hpp
diff --git a/Utilities/BGL/boost/functional/hash/detail/limits.hpp b/Utilities/BGL/boost/bfunctional/hash/detail/limits.hpp
similarity index 100%
rename from Utilities/BGL/boost/functional/hash/detail/limits.hpp
rename to Utilities/BGL/boost/bfunctional/hash/detail/limits.hpp
diff --git a/Utilities/BGL/boost/functional/hash/extensions.hpp b/Utilities/BGL/boost/bfunctional/hash/extensions.hpp
similarity index 99%
rename from Utilities/BGL/boost/functional/hash/extensions.hpp
rename to Utilities/BGL/boost/bfunctional/hash/extensions.hpp
index 3c587a3bf5..0dc12de00d 100644
--- a/Utilities/BGL/boost/functional/hash/extensions.hpp
+++ b/Utilities/BGL/boost/bfunctional/hash/extensions.hpp
@@ -13,7 +13,7 @@
#if !defined(BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP)
#define BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP
-#include <boost/functional/hash/hash.hpp>
+#include <boost/bfunctional/hash/hash.hpp>
#include <boost/detail/container_fwd.hpp>
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
diff --git a/Utilities/BGL/boost/functional/hash/hash.hpp b/Utilities/BGL/boost/bfunctional/hash/hash.hpp
similarity index 98%
rename from Utilities/BGL/boost/functional/hash/hash.hpp
rename to Utilities/BGL/boost/bfunctional/hash/hash.hpp
index 1f33b9ea9d..4def90889a 100644
--- a/Utilities/BGL/boost/functional/hash/hash.hpp
+++ b/Utilities/BGL/boost/bfunctional/hash/hash.hpp
@@ -10,9 +10,9 @@
#if !defined(BOOST_FUNCTIONAL_HASH_HASH_HPP)
#define BOOST_FUNCTIONAL_HASH_HASH_HPP
-#include <boost/functional/hash/hash_fwd.hpp>
+#include <boost/bfunctional/hash/hash_fwd.hpp>
#include <functional>
-#include <boost/functional/hash/detail/hash_float.hpp>
+#include <boost/bfunctional/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/functional/hash/extensions.hpp>
+#include <boost/bfunctional/hash/extensions.hpp>
#endif
diff --git a/Utilities/BGL/boost/functional/hash/hash_fwd.hpp b/Utilities/BGL/boost/bfunctional/hash/hash_fwd.hpp
similarity index 100%
rename from Utilities/BGL/boost/functional/hash/hash_fwd.hpp
rename to Utilities/BGL/boost/bfunctional/hash/hash_fwd.hpp
diff --git a/Utilities/BGL/boost/functional/hash_fwd.hpp b/Utilities/BGL/boost/bfunctional/hash_fwd.hpp
similarity index 80%
rename from Utilities/BGL/boost/functional/hash_fwd.hpp
rename to Utilities/BGL/boost/bfunctional/hash_fwd.hpp
index b640988618..87b4e94638 100644
--- a/Utilities/BGL/boost/functional/hash_fwd.hpp
+++ b/Utilities/BGL/boost/bfunctional/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/functional/hash/hash_fwd.hpp>
+#include <boost/bfunctional/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 7b62b3b266..ddc7e5cdd4 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/functional/hash.hpp>
+#include <boost/bfunctional/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 6b4e3913c9..e4d8c66cce 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/functional/hash.hpp>
+#include <boost/bfunctional/hash.hpp>
#include <boost/utility.hpp>
namespace boost {
diff --git a/Utilities/BGL/boost/graph/distributed/named_graph.hpp b/Utilities/BGL/boost/graph/distributed/named_graph.hpp
index 83b00613b6..c3d5e29164 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/functional/hash.hpp>
+#include <boost/bfunctional/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/multi_index/composite_key.hpp b/Utilities/BGL/boost/multi_index/composite_key.hpp
index c4b06f24fe..54cca1f677 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/functional/hash_fwd.hpp>
+#include <boost/bfunctional/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>
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 4972f9bbe1..9ba47d2205 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/functional/hash.hpp>
+#include <boost/bfunctional/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/unordered/unordered_map.hpp b/Utilities/BGL/boost/unordered/unordered_map.hpp
index 93e197893a..01066cc086 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/functional/hash.hpp>
+#include <boost/bfunctional/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 5e9bb07645..22e6fee7bc 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/functional/hash_fwd.hpp>
+#include <boost/bfunctional/hash_fwd.hpp>
namespace boost
{
diff --git a/Utilities/BGL/boost/unordered/unordered_set.hpp b/Utilities/BGL/boost/unordered/unordered_set.hpp
index 87c1011b6d..373088a883 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/functional/hash.hpp>
+#include <boost/bfunctional/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 8000eb1420..f05c706856 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/functional/hash_fwd.hpp>
+#include <boost/bfunctional/hash_fwd.hpp>
namespace boost
{
--
GitLab