Mercurial > hg > vamp-build-and-test
diff DEPENDENCIES/generic/include/boost/interprocess/indexes/iset_index.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
author | Chris Cannam |
---|---|
date | Mon, 07 Sep 2015 11:12:49 +0100 |
parents | 2665513ce2d3 |
children |
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/interprocess/indexes/iset_index.hpp Fri Sep 04 12:01:02 2015 +0100 +++ b/DEPENDENCIES/generic/include/boost/interprocess/indexes/iset_index.hpp Mon Sep 07 11:12:49 2015 +0100 @@ -11,16 +11,24 @@ #ifndef BOOST_INTERPROCESS_ISET_INDEX_HPP #define BOOST_INTERPROCESS_ISET_INDEX_HPP +#ifndef BOOST_CONFIG_HPP +# include <boost/config.hpp> +#endif +# +#if defined(BOOST_HAS_PRAGMA_ONCE) +# pragma once +#endif + #include <boost/interprocess/detail/config_begin.hpp> #include <boost/interprocess/detail/workaround.hpp> -#include <string> -#include <functional> -#include <utility> +#include <boost/intrusive/detail/minimal_pair_header.hpp> #include <boost/interprocess/detail/utilities.hpp> +#include <boost/intrusive/detail/minimal_pair_header.hpp> //std::pair +#include <boost/intrusive/detail/minimal_less_equal_header.hpp> //std::less +#include <boost/container/detail/minimal_char_traits_header.hpp> //std::char_traits #include <boost/intrusive/set.hpp> - //!\file //!Describes index adaptor of boost::intrusive::set container, to use it //!as name/shared memory index @@ -28,7 +36,7 @@ namespace boost { namespace interprocess { -/// @cond +#if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED) //!Helper class to define typedefs from IndexTraits template <class MapConfig> @@ -52,7 +60,7 @@ , bi::base_hook<derivation_hook> >::type index_t; }; -/// @endcond +#endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED //!Index type based in boost::intrusive::set. //!Just derives from boost::intrusive::set @@ -62,13 +70,13 @@ //Derive class from map specialization : public iset_index_aux<MapConfig>::index_t { - /// @cond + #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED) typedef iset_index_aux<MapConfig> index_aux; typedef typename index_aux::index_t index_type; typedef typename MapConfig:: intrusive_compare_key_type intrusive_compare_key_type; typedef typename MapConfig::char_type char_type; - /// @endcond + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED public: typedef typename index_type::iterator iterator; @@ -76,7 +84,7 @@ typedef typename index_type::insert_commit_data insert_commit_data; typedef typename index_type::value_type value_type; - /// @cond + #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED) private: struct intrusive_key_value_less @@ -100,7 +108,7 @@ } }; - /// @endcond + #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED public: @@ -130,7 +138,7 @@ { return index_type::insert_check(key, intrusive_key_value_less(), commit_data); } }; -/// @cond +#if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED) //!Trait class to detect if an index is an intrusive //!index. @@ -140,7 +148,7 @@ { static const bool value = true; }; -/// @endcond +#endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED } //namespace interprocess { } //namespace boost