diff options
| author | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
| commit | 08c1e93fa36a49f49325a07fe91ff92c964c2b6c (patch) | |
| tree | 7a7053ceb8874b28ec4b868d4c49b500008a102e /boost/algorithm/searching | |
| parent | bb4dd8289b351fae6b55e303f189127a394a1edd (diff) | |
| download | boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.gz boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.bz2 boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.zip | |
Imported Upstream version 1.57.0upstream/1.57.0
Diffstat (limited to 'boost/algorithm/searching')
| -rw-r--r-- | boost/algorithm/searching/boyer_moore.hpp | 4 | ||||
| -rw-r--r-- | boost/algorithm/searching/boyer_moore_horspool.hpp | 5 | ||||
| -rw-r--r-- | boost/algorithm/searching/detail/bm_traits.hpp | 8 | ||||
| -rw-r--r-- | boost/algorithm/searching/knuth_morris_pratt.hpp | 5 |
4 files changed, 20 insertions, 2 deletions
diff --git a/boost/algorithm/searching/boyer_moore.hpp b/boost/algorithm/searching/boyer_moore.hpp index 958f0b8d0c..c5fe9fa255 100644 --- a/boost/algorithm/searching/boyer_moore.hpp +++ b/boost/algorithm/searching/boyer_moore.hpp @@ -33,8 +33,8 @@ References: http://www.cs.utexas.edu/users/moore/best-ideas/string-searching/ http://www.cs.utexas.edu/~moore/publications/fstrpos.pdf -Explanations: boostinspect:noascii (test tool complains) - http://en.wikipedia.org/wiki/Boyer–Moore_string_search_algorithm +Explanations: + http://en.wikipedia.org/wiki/Boyer%E2%80%93Moore_string_search_algorithm http://www.movsd.com/bm.htm http://www.cs.ucdavis.edu/~gusfield/cs224f09/bnotes.pdf diff --git a/boost/algorithm/searching/boyer_moore_horspool.hpp b/boost/algorithm/searching/boyer_moore_horspool.hpp index 5e59cf3220..758ded206b 100644 --- a/boost/algorithm/searching/boyer_moore_horspool.hpp +++ b/boost/algorithm/searching/boyer_moore_horspool.hpp @@ -14,6 +14,11 @@ #include <boost/assert.hpp> #include <boost/static_assert.hpp> + +#include <boost/range/begin.hpp> +#include <boost/range/end.hpp> + +#include <boost/utility/enable_if.hpp> #include <boost/type_traits/is_same.hpp> #include <boost/algorithm/searching/detail/bm_traits.hpp> diff --git a/boost/algorithm/searching/detail/bm_traits.hpp b/boost/algorithm/searching/detail/bm_traits.hpp index ea150c3021..9c255404ce 100644 --- a/boost/algorithm/searching/detail/bm_traits.hpp +++ b/boost/algorithm/searching/detail/bm_traits.hpp @@ -20,7 +20,11 @@ #include <boost/type_traits/remove_const.hpp> #include <boost/array.hpp> +#ifdef BOOST_NO_CXX11_HDR_UNORDERED_MAP #include <boost/tr1/tr1/unordered_map> +#else +#include <unordered_map> +#endif #include <boost/algorithm/searching/detail/debugging.hpp> @@ -35,7 +39,11 @@ namespace boost { namespace algorithm { namespace detail { template<typename key_type, typename value_type> class skip_table<key_type, value_type, false> { private: +#ifdef BOOST_NO_CXX11_HDR_UNORDERED_MAP typedef std::tr1::unordered_map<key_type, value_type> skip_map; +#else + typedef std::unordered_map<key_type, value_type> skip_map; +#endif const value_type k_default_value; skip_map skip_; diff --git a/boost/algorithm/searching/knuth_morris_pratt.hpp b/boost/algorithm/searching/knuth_morris_pratt.hpp index cc83185c51..aaeeb51ccb 100644 --- a/boost/algorithm/searching/knuth_morris_pratt.hpp +++ b/boost/algorithm/searching/knuth_morris_pratt.hpp @@ -15,6 +15,11 @@ #include <boost/assert.hpp> #include <boost/static_assert.hpp> + +#include <boost/range/begin.hpp> +#include <boost/range/end.hpp> + +#include <boost/utility/enable_if.hpp> #include <boost/type_traits/is_same.hpp> #include <boost/algorithm/searching/detail/debugging.hpp> |